Update to current reality:

* Add missing USE_TOOLS.
* Update MASTER_SITES.
* Fix (most) pkglint warnings.

7 files changed, 55 insertions, 43 deletions

diff --git a/crosspkgtools/crosspkg-netbsd1-acorn26/Makefile b/crosspkgtools/crosspkg-netbsd1-acorn26/Makefile
index 032c7d37c23..32726b4eeb7 100644
--- a/crosspkgtools/crosspkg-netbsd1-acorn26/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-acorn26/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-acorn26-1.6.2
 CATEGORIES=	crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/acorn26/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/acorn26/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,6 +25,7 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
diff --git a/crosspkgtools/crosspkg-netbsd1-acorn32/Makefile b/crosspkgtools/crosspkg-netbsd1-acorn32/Makefile
index 5994cbf4550..80d74595dc4 100644
--- a/crosspkgtools/crosspkg-netbsd1-acorn32/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-acorn32/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/07/27 01:58:14 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-acorn32-1.6.2
 CATEGORIES=	crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/acorn32/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/acorn32/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,15 +25,16 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
 # Dynamically generate the PLIST from the installed files.
 CROSSFS_PLIST_FILES_CMD= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-acorn32 \! -type d -print ) \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-acorn32 \! -type d -print ) \
 	| ${SORT} -u
 CROSSFS_PLIST_DIRS_CMD= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-acorn32 -type d -print ) \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-acorn32 -type d -print ) \
 	| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"			\
 		 -e "s,\$$, 2>/dev/null || ${TRUE},"			\
 	| ${SORT} -ur
diff --git a/crosspkgtools/crosspkg-netbsd1-cats/Makefile b/crosspkgtools/crosspkg-netbsd1-cats/Makefile
index 070fcedfd08..a0ee2e7c076 100644
--- a/crosspkgtools/crosspkg-netbsd1-cats/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-cats/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-cats-1.6.2
 CATEGORIES=     crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/cats/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/cats/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,19 +25,21 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
 # Dynamically generate the PLIST from the installed files.
-CROSSFS_PLIST_FILES= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-cats \! -type d -print ) \
+CROSSFS_PLIST_FILES_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-cats \! -type d -print ) \
 	| ${SORT} -u
-CROSSFS_PLIST_DIRS= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-cats -type d -print ) 	\
+CROSSFS_PLIST_DIRS_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-cats -type d -print ) 	\
 	| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"			\
-		 -e "s,$$, 2>/dev/null || ${TRUE},"			\
+		 -e "s,\$$, 2>/dev/null || ${TRUE},"			\
 	| ${SORT} -ur
-GENERATE_PLIST+=	${CROSSFS_PLIST_FILES}; ${CROSSFS_PLIST_DIRS};
+GENERATE_PLIST+=	${CROSSFS_PLIST_FILES_CMD};
+GENERATE_PLIST+=	${CROSSFS_PLIST_DIRS_CMD};
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/crossfs/netbsd1-cats
diff --git a/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile b/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile
index b070f8d073f..bd5aec72931 100644
--- a/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-evbarm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-evbarm-1.6.2
 CATEGORIES=     crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/evbarm/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/evbarm/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-INTEGRATOR.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,19 +25,21 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
 # Dynamically generate the PLIST from the installed files.
-CROSSFS_PLIST_FILES= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-evbarm \! -type d -print ) \
+CROSSFS_PLIST_FILES_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-evbarm \! -type d -print ) \
 	| ${SORT} -u
-CROSSFS_PLIST_DIRS= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-evbarm -type d -print ) \
+CROSSFS_PLIST_DIRS_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-evbarm -type d -print ) \
 	| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"			\
-		 -e "s,$$, 2>/dev/null || ${TRUE},"			\
+		 -e "s,\$$, 2>/dev/null || ${TRUE},"			\
 	| ${SORT} -ur
-GENERATE_PLIST+=	${CROSSFS_PLIST_FILES}; ${CROSSFS_PLIST_DIRS};
+GENERATE_PLIST+=	${CROSSFS_PLIST_FILES_CMD};
+GENERATE_PLIST+=	${CROSSFS_PLIST_DIRS_CMD};
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/crossfs/netbsd1-evbarm
diff --git a/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile b/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile
index 3470c2c2a9f..a51a05016e1 100644
--- a/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-hpcarm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-hpcarm-1.6.2
 CATEGORIES=     crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/hpcarm/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/hpcarm/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-JORNADA720.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,19 +25,21 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
 # Dynamically generate the PLIST from the installed files.
-CROSSFS_PLIST_FILES= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-hpcarm \! -type d -print ) \
+CROSSFS_PLIST_FILES_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-hpcarm \! -type d -print ) \
 	| ${SORT} -u
-CROSSFS_PLIST_DIRS= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-hpcarm -type d -print ) \
+CROSSFS_PLIST_DIRS_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-hpcarm -type d -print ) \
 	| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"			\
-		 -e "s,$$, 2>/dev/null || ${TRUE},"			\
+		 -e "s,\$$, 2>/dev/null || ${TRUE},"			\
 	| ${SORT} -ur
-GENERATE_PLIST+=	${CROSSFS_PLIST_FILES}; ${CROSSFS_PLIST_DIRS};
+GENERATE_PLIST+=	${CROSSFS_PLIST_FILES_CMD};
+GENERATE_PLIST+=	${CROSSFS_PLIST_DIRS_CMD};
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/crossfs/netbsd1-hpcarm
diff --git a/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile b/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile
index b562408f61a..0735eb367fa 100644
--- a/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-netwinder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-netwinder-1.6.2
 CATEGORIES=     crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/netwinder/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/netwinder/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,19 +25,21 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
 # Dynamically generate the PLIST from the installed files.
 CROSSFS_PLIST_FILES_CMD= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-netwinder \! -type d -print ) \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-netwinder \! -type d -print ) \
 	| ${SORT} -u
 CROSSFS_PLIST_DIRS_CMD= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-netwinder -type d -print ) \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-netwinder -type d -print ) \
 	| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"			\
 		 -e "s,\$$, 2>/dev/null || ${TRUE},"			\
 	| ${SORT} -ur
-GENERATE_PLIST+=	${CROSSFS_PLIST_FILES_CMD}; ${CROSSFS_PLIST_DIRS_CMD};
+GENERATE_PLIST+=	${CROSSFS_PLIST_FILES_CMD};
+GENERATE_PLIST+=	${CROSSFS_PLIST_DIRS_CMD};
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/crossfs/netbsd1-netwinder
diff --git a/crosspkgtools/crosspkg-netbsd1-shark/Makefile b/crosspkgtools/crosspkg-netbsd1-shark/Makefile
index 9f8975818ba..8ae1f9c9ea2 100644
--- a/crosspkgtools/crosspkg-netbsd1-shark/Makefile
+++ b/crosspkgtools/crosspkg-netbsd1-shark/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/07/06 21:14:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/24 18:28:38 kristerw Exp $
 
 DISTNAME=	crosspkg-netbsd1-shark-1.6.2
 CATEGORIES=     crosspkgtools
-MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.6.2/shark/binary/sets/
+MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD-archive/NetBSD-1.6.2/shark/binary/sets/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	base.tgz comp.tgz etc.tgz games.tgz kern-GENERIC.tgz man.tgz \
 		misc.tgz text.tgz xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz \
@@ -25,19 +25,21 @@ SITES.xsrc.tgz=		${SRC_SITES}
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	YES
+USE_TOOLS+=	tar
 
 NO_PACKAGE=	needs work to function properly as a binary package
 
 # Dynamically generate the PLIST from the installed files.
-CROSSFS_PLIST_FILES= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-shark \! -type d -print ) \
+CROSSFS_PLIST_FILES_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-shark \! -type d -print ) \
 	| ${SORT} -u
-CROSSFS_PLIST_DIRS= \
-	(cd ${PREFIX};  ${FIND} crossfs/netbsd1-shark -type d -print ) 	\
+CROSSFS_PLIST_DIRS_CMD= \
+	(cd ${PREFIX} && ${FIND} crossfs/netbsd1-shark -type d -print ) \
 	| ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"			\
-		 -e "s,$$, 2>/dev/null || ${TRUE},"			\
+		 -e "s,\$$, 2>/dev/null || ${TRUE},"			\
 	| ${SORT} -ur
-GENERATE_PLIST+=	${CROSSFS_PLIST_FILES}; ${CROSSFS_PLIST_DIRS};
+GENERATE_PLIST+=	${CROSSFS_PLIST_FILES_CMD};
+GENERATE_PLIST+=	${CROSSFS_PLIST_DIRS_CMD};
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/crossfs/netbsd1-shark