8 files changed, 169 insertions, 0 deletions
diff --git a/devel/portmk/files/ChangeLog b/devel/portmk/files/ChangeLog
new file mode 100644
index 000000000000..8a21f166e0ef
--- /dev/null
+++ b/devel/portmk/files/ChangeLog
@@ -0,0 +1,3 @@
+- 2004-07-05: Initial release
+
+Rewrite of the distfile fetching code, minor makefile cleanup.
diff --git a/devel/portmk/files/Features b/devel/portmk/files/Features
new file mode 100644
index 000000000000..dafd46c0188f
--- /dev/null
+++ b/devel/portmk/files/Features
@@ -0,0 +1,66 @@
+In case you need to fall back to the old routines, just build the port with `omake'.
+
+
+* completely rewritten do-fetch/checksum/makesum/fetch-list targets:
+
+- sort MASTER_SITES by distance or latency
+
+To fetch from the nearest mirrors first, install port net/p5-Geo-IP and put
+
+MASTER_SORT_GEOIP=yes
+CC_HOME=eu
+
+in /etc/portmk.conf. The first time fetching may stall for about ten seconds, since all sites must be looked up first. Subsequent fetches should be *much* faster.
+
+
+To fetch from the side with the smallest measured latency, install perl and port net/fping and add
+
+MASTER_SORT_FPING=yes
+
+to /etc/portmk.conf
+
+- refetch from multiple mirrors in case of a checksum mismatch (up to FETCH_REGET times)
+
+Instead of trying the same mirror (which might have a corrupt distfile) twice.
+
+- randomize MASTER_SITES by default (disable with KEEP_MASTER_SITE_ORDER)
+
+- new targets `missing-size' and `missing-recursive-size':  calculate size of missing distribution files
+
+
+Type
+  make missing-recursive-size
+to check how many files you have to fetch to build the current port. To check how many files a port with subports needs overall, including files already on your local disk, do
+
+  make DISTDIR=/nonexistent missing-recursive-size
+
+- new target checkdistsites, a brute-force distfile survery for home use,
+  use with NO_CHECKSUM to just verify the sizes without downloading the files
+
+NO_CHECKSUM currently works only with fetch, not wget or curl. Try
+
+  make NO_CHECKSUM=yes checkdistsites
+
+to verify whether your distfiles are fetchable from every site.
+
+- support for integrating distinfo into the ports Makefile via `migratesum' (experimental,
+  multiple integrated distinfo files could be distinguised by DISTINFO_LABEL)
+
+
+- support for SHA1 and RMD160 checksums
+
+- support for MASTER_SITES that don't end with a slash
+
+- support to substitute %FILE% in MASTER_SITES with the distfiles name
+
+
+Useful for sites that have ...?file=xxx&download=true or cvsweb style download sites
+
+- fetch with curl or wget with FETCH_USE_CURL and FETCH_USE_WGET (requires installed curl or wget)
+
+
+For people behind firewalls that need the extended capabilities. Be aware that some extra features (like size checking) are currently not availible with those download clients.
+
+- eliminated the master-site-{all,ALL,default,DEFAULT,*} targets, since they are of little use
+
+In case someone needs them, I can add them back again.
diff --git a/devel/portmk/files/KnownIssues b/devel/portmk/files/KnownIssues
new file mode 100644
index 000000000000..20a4ba47a474
--- /dev/null
+++ b/devel/portmk/files/KnownIssues
@@ -0,0 +1,3 @@
+* List of ports that fail to fetch/build with portmk, but build with a `stck' bsd.port.mk:
+
+* `make NO_CHECKSUM=yes checkdistsites' failes when FETCH_USE_WGET or FETCH_USE_CURL is set
diff --git a/devel/portmk/files/ReadMe b/devel/portmk/files/ReadMe
new file mode 100644
index 000000000000..f9ae28a81b61
--- /dev/null
+++ b/devel/portmk/files/ReadMe
@@ -0,0 +1,45 @@
+This is port devel/portmk, an alternate bsd.port.mk.
+
+Targets of this project are:
+
+- Modularization on bsd.port.mk, to make refactoring possible.
+
+- Better awareness of upcoming features for ports developers,
+  including giving them the ability to review changes and give
+  feedback early.
+
+- Faster turnaround times for development patches.
+
+- Widespread testing of new features.
+
+- Faster adoption of advanced features without endangering the
+  stability of the ports tree.
+
+This has been created as a follow-up to a proposal I sent to
+portmgr@ May 13th.
+
+Although it is desired that the whole ports tree builds with
+portmk, it is inevitable to break some ports. This may be due
+to bugs in portmk, where not every change is bento-tested before
+committed, or ports depending on undocumented features they
+shouldn't rely upon.
+
+How can you help?
+
+- Build your ports with portmk, falling back to omake only when
+  necessary. Submit entries to KnownIssues in case of problems.
+
+- Run a tinderbox with portmk 
+
+- Submit patches improving the code
+
+- Give feedback whether you like the new features, and what do
+  you think could be improved.
+
+Other available documentation:
+
+- Features: a list of features in portmk that are not in bsd.port.mk
+
+- ChangeLog: History of mayor feature additions / removals
+
+- KnownIssues: ports known to malfunction with portmk
diff --git a/devel/portmk/files/make.conf b/devel/portmk/files/make.conf
new file mode 100644
index 000000000000..6e336784c0cd
--- /dev/null
+++ b/devel/portmk/files/make.conf
@@ -0,0 +1,3 @@
+
+BSDPORTMK?=		${PORTSDIR}/devel/portmk/Mk/bsd.port.mk
+BSDPORTSUBDIRMK?=	${PORTSDIR}/devel/portmk/Mk/bsd.port.subdir.mk
diff --git a/devel/portmk/files/omake.sh b/devel/portmk/files/omake.sh
new file mode 100644
index 000000000000..237b40985e62
--- /dev/null
+++ b/devel/portmk/files/omake.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -ef
+export OLD_PORTMK=true
+/usr/bin/make "$@"
diff --git a/devel/portmk/files/portmk4.patch b/devel/portmk/files/portmk4.patch
new file mode 100644
index 000000000000..1da7dbaf7276
--- /dev/null
+++ b/devel/portmk/files/portmk4.patch
@@ -0,0 +1,23 @@
+Prereq: 1.303.2.2
+Index: bsd.port.mk
+--- bsd.port.mk	19 Apr 2002 07:43:50 -0000
++++ bsd.port.mk	2 Jul 2004 20:47:18 -0000
+@@ -2,5 +2,6 @@
+ 
+ PORTSDIR?=	/usr/ports
++BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
+ 
+ .include <bsd.own.mk>
+-.include "${PORTSDIR}/Mk/bsd.port.mk"
++.include "${BSDPORTMK}"
+Prereq: 1.28.2.2
+Index: bsd.port.subdir.mk
+--- bsd.port.subdir.mk	19 Apr 2002 07:43:50 -0000
++++ bsd.port.subdir.mk	2 Jul 2004 20:47:18 -0000
+@@ -2,4 +2,5 @@
+ 
+ PORTSDIR?=	/usr/ports
++BSDPORTSUBDIRMK?=	${PORTSDIR}/Mk/bsd.port.subdir.mk
+ 
+-.include "${PORTSDIR}/Mk/bsd.port.subdir.mk"
++.include "${BSDPORTSUBDIRMK}"
diff --git a/devel/portmk/files/portmk5.patch b/devel/portmk/files/portmk5.patch
new file mode 100644
index 000000000000..33c8655a2091
--- /dev/null
+++ b/devel/portmk/files/portmk5.patch
@@ -0,0 +1,23 @@
+Prereq: 1.306
+Index: bsd.port.mk
+--- bsd.port.mk	19 Apr 2002 07:43:50 -0000
++++ bsd.port.mk	2 Jul 2004 20:47:18 -0000
+@@ -2,5 +2,6 @@
+ 
+ PORTSDIR?=	/usr/ports
++BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
+ 
+ .include <bsd.own.mk>
+-.include "${PORTSDIR}/Mk/bsd.port.mk"
++.include "${BSDPORTMK}"
+Prereq: 1.30
+Index: bsd.port.subdir.mk
+--- bsd.port.subdir.mk	19 Apr 2002 07:43:50 -0000
++++ bsd.port.subdir.mk	2 Jul 2004 20:47:18 -0000
+@@ -2,4 +2,5 @@
+ 
+ PORTSDIR?=	/usr/ports
++BSDPORTSUBDIRMK?=	${PORTSDIR}/Mk/bsd.port.subdir.mk
+ 
+-.include "${PORTSDIR}/Mk/bsd.port.subdir.mk"
++.include "${BSDPORTSUBDIRMK}"