Populate a new ports-mgmt category. List of moved ports:

  devel/portcheckout -> ports-mgmt/portcheckout
  devel/portlint -> ports-mgmt/portlint
  devel/portmk -> ports-mgmt/portmk
  devel/porttools -> ports-mgmt/porttools
  misc/instant-tinderbox -> ports-mgmt/instant-tinderbox
  misc/porteasy -> ports-mgmt/porteasy
  misc/portell -> ports-mgmt/portell
  misc/portless -> ports-mgmt/portless
  misc/tinderbox -> ports-mgmt/tinderbox
  security/jailaudit -> ports-mgmt/jailaudit
  security/portaudit -> ports-mgmt/portaudit
  security/portaudit-db -> ports-mgmt/portaudit-db
  security/vulnerability-test-port -> ports-mgmt/vulnerability-test-port

Bring this up to the current ports/Mk file.

Catch this up with the master copy in ports/Mk.

Remove files which are lagging ports/Mk.

Rip out 4.x cruft.

Rip out 4.X cruft.

Update to the latest version being tested on i386-6-exp on pointyhat.

Bring this up to the patches in ports/102300 and ports/102514, which are
currently being tested on the cluster.

Update to ports/Mk/bsd.port.mk 1.541.

Re-add definition forgotten in last checkin.

Catch up with ports/Mk/bsd.port.subdir.mk r1.65.

Catch up to ports/Mk/bsd.port.mk r1.540.

Bring this up to date with ports/Mk/bsd.port.mk 1.538.  Note that ports/98565
was forgotten on the test run yet again.

Bring this up to what is currently being tested on the cluster, including
ports/98105, ports/98565 (both forgotten last time), and ports/99370, a
bugfix for USE_LDCONFIG with on-default prefix.

Mr. Forehead, meet Mr. Brick Wall.  Mr. Brick Wall, meet Mr. Forehead.

Revert the previous deletion; it was a victim of a script.

ports/Mk/bsd.*.mk caught up with these files as of the commit on 2006/07/05
02:18:08, so delete them until they are needed again.

Bring this up to ports/Mk/bsd.port.mk 1.537 (incorporates 1.536).

Forgotten by:           linimon

Fix typo that pointyhat chokes on.  This works on 4.10.  Go figure.

Update this to the next patchset about to be tested.

Reintroduce these files with the latest patchset, which among other things
incorporates ports/92445, "change all bogus uses of BROKEN to IGNORE"

Common code to support Python wxWidget-based ports.

Common code to support the Python SCONS port installation framework.

Reflect its currrent state of bsd.port.mk after the last 2 checkins:

 - 97406 (ghostscript refactoring) was removed from the -exp run due to errors
 - 95841 (remove legacy code) was backed out after commit, due to its still
   being needed for kdelibs3 among others

The committed versions in ports/Mk have caught up with these.

We actually agreed to test the fc4 Linux port, not fc3.  The run has been
restarted.

Update these to what is currently being tested on the cluster.

I suppose that one of these years I'll remember to quit committing local
changes to this file.  At least they're harmless.

Bring this up to ports/Mk/bsd.port.mk 1.533.

Track Mk/bsd.port.mk r1.530.

Perform the hand-merge.

Backout previous commit because all changes here should be merged by
hand and honestly, I have neither time nor energy for this game.

Submitted by:   linimon

Merge changes for the next experimental build.

Bring these up to the level that was committed to the master files on
2006/02/11 - 2006/02/23.

Originally forgotten by:        linimon

Incorporate 1.63 from the master.

Incorporate 1.523 from the master.

Update to the latest patches running on the cluster.

Reflect a bug found in the latest patchset.

Incorporate the emergency fix from ports/92128.

Update these two to the next set of 5-exp patches.

Bring this up to date with respect to the master copy.

Remove files committed to /usr/ports/Mk in the latest patchset and/or ones
which now lag their counterparts.

Bring these up to date with what is currently being tested on the cluster.

Correct slight mis-merge.  Should not affect anything.

Once again, remove local change that crept in.

Do not quote IGNORE.  Fix formatting.

Really bring these up to date with the latest patch being tested on the
cluster.  The previous commit message was bogus.

Update to ports/Mk/bsd.php.mk version 1.21.  Previous comment was bogus.

Remove the multiple copies of these files that crept in here.  I hate
patch(1).

Catch up with ports/Mk/bsd.apache.mk 1.6.  Previous checkin comment was
bogus.

Bring portmk/devel up to the status of the next patchset to be tested.

These now lag their ports/Mk counterparts and are thus OBE.

Conditionalize the inclusion of local copies of bsd.*.mk.  They will only
be included if they exist in devel/portmk/Mk; otherwise, the fallback file
from ports/Mk will be used.  This will allow us to remove local copies of
files once their changes are merged back into ports/Mk, so that not every
single change in ports/Mk needs to have a tracking commit made back into
devel/portmk/Mk.  In theory this should allow us to integrate changes a
little more quickly.

OK, now that I've given you the example of how this file was developed,
remove the example :-)

A sandbox for local modifications to bsd.port.mk.  This little bit of
framework is designed so that such things as FreshPorts, portsmon, and
the distfile survey can more easily maintain local changes without having
to re-merge them into their copies of bsd.port.mk all the time.

Add a comment about a line that is from ports/86106 (USE_GMAKE change).
This is a reminder that this change is not yet tested sufficiently to
go into the main bsd.port.mk.

Diff reduction to ports/Mk.  This was apparently some late change to the
patch in ports/79123.

Add patch from ports/78596 for diff reduction.

Unbreak INDEX building for those of us using devel/portmk.  This is not
all the changes from Mk/bsd.apache.mk that need to be merged.

Pointy hat to:  clement

Fix mis-merge from latest round of changes.  Fixes 'make describe' in misc/.

- Sync with 1.68

Add 2 more patches for exp build:
ports/83514 - fix typo in bsd.port.mk: s/RC_ORDER/USE_RCORDER/g
ports/88466 - small update to bsd.port.mk for postgresql (support of 8.1)

exp build also contains ports/78596. It's worthless to backport it to
devel/portmk

- Add "make patch-o-matic" target. It applies to a fresh ports tree patches
  required to build ports correctly with devel/portmk. Currently only USE_GMAKE
  changes [1] are applied. It will be heavily used in the future to support
  new knobs in b.p.m (like USE_APACHE, USE_TCL, new OPTIONS, etc.)
  Currently patches are added by hand. I hope I can add soon an automated way
  to submit patches.

[1] Submitted by:       jylefort

- Sync bsd.java.mk with rev 1.67

Reported by:    kris

- Add a workaround to new checksum target to keep backward compatibility.
  If checksum should be equal to IGNORE and it doesn't have an entry in distinfo
  check if it has already been "registered". In other words, if they're no
  SHA256 checksum (which is the case IRL), fallback to MD5 checksum results.

- Remove -02 [1] related patch
  It's b0rked for compilers which don't support -fno-strict-aliasing

[1] ports/73797 : Be causious compiling with -O2 (use -fno-strict-aliasing)

- Don't switch to www/apache20 to minimize changes to not break INDEX
- Introduce APACHE_COMPAT variable keep weak dependencies on APACHE_PORT
  working

make INDEX is still broken

Sync with bsd.port.mk: bump MySQL 5.0 shared lib version.

- Sync portmk with next exp-build patchset.
- Remove temporarily all eik's work. We'll try to find a decent way to deal
  with major changes. Of course we'll reuse his good ideas

List of changes (PR - synopsis)
85695 - Add bsd.database.mk.
85669 - bsd.ports.subdir.mk: Ports not escape plus signal in make search
85488 - [PATCH] New "makepatch: " target to help ports authors
86106 - ${CC} should be added to ${MAKE_ENV} when ${USE_GMAKE} is set
84489 - Depreciated MACHINE_ARCH being used in bsd.port.mk
83835 - Remove OpenLDAP ver. 21
83718 - Add bsd.tcl.mk for convinience for tcl/tk ports
83716 - Fix cosmetic bug in security-check target
83710 - Add INDEX-7
82753 - patch to add functionality to ports macro bsd.port.subdir.mk
82138 - [patch] timewaster: remove old versions from bsd.port.mk
81206 - new category proposal: net-im
79509 - add .desktop file facilities to bsd.port.mk
79123 - [patch] bsd.port.mk - add SHA256 support to "make checksum"
74866 - Update Mk/bsd.port.mk to support python packages with OPTIONS
73797 - Be causious compiling with -O2 (use -fno-strict-aliasing)
85490 - [PATCH] If WANT_LINT is set, port building can break
XXXXX - Add bsd.apache.mk

- Grab

With portmgr hat on, reset eik's ports since he has been inactive for
several months (not responding to email).

Discussed among:        portmgr team

Catch up with latest bsd.port.mk changes

- fix reinstall target
- fix bug in distfile:group handling
- fix bug in DISTDIR handling
- add code to better handle refetching of rerolled distfiles
- .PHONY -> .EXEC

sync with latest b.p.m

create /var/db/options when it doesn't exist

- synchronize with recent changes in bsd.port.mk

- work in progress: optionsng, cleanroom installation

check for a working tr(1).

typo in 'make master-sites-all'

FWIIW, enable the use of
  make DISABLE_SIZE=yes checkdistsites
to check for corrupted files on sites that don't support SIZE
(the files are unfetchable from these sites anyway)

add targets master-sites-all, master-sites, patch-sites-all, patch-sites
which print a sorted list of the respective sites (used e.g. by FreshPorts)

fix a warning when GeoIP can't find the country for a site

eliminate some verbatim uses of mktemp and sort

PR:             62298

Add devel/portmk, a place where bsd.port.mk development can happen.