Second round of explicit pax dependencies. As reminded by tnn@,

many packages used to use ${PAX}. Use the common way of directly calling
pax, it is created as tool after all.

7 files changed, 29 insertions, 15 deletions

diff --git a/math/gp-autpgrp/Makefile b/math/gp-autpgrp/Makefile
index 3e561682c62..ddd59166c78 100644
--- a/math/gp-autpgrp/Makefile
+++ b/math/gp-autpgrp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	autpgrp-1.1
@@ -19,9 +19,11 @@ WRKSRC=		${WRKDIR}/autpgrp
 NO_BUILD=	YES
 GAP_PKG_NAME=	autpgrp
 
+USE_TOOLS+=	pax
+
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${GAP_PKG_ROOT}
-	cd ${WRKDIR} && ${PAX} -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
+	cd ${WRKDIR} && pax -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
 
 .include "../../math/gap/gap.package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gp-factint/Makefile b/math/gp-factint/Makefile
index 6f00361ea3e..cbdd35b86f4 100644
--- a/math/gp-factint/Makefile
+++ b/math/gp-factint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	factint-1.3
@@ -19,9 +19,11 @@ WRKSRC=		${WRKDIR}/factint
 NO_BUILD=	YES
 GAP_PKG_NAME=	factint
 
+USE_TOOLS+=	pax
+
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${GAP_PKG_ROOT}
-	cd ${WRKDIR} && ${PAX} -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
+	cd ${WRKDIR} && pax -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
 
 .include "../../math/gap/gap.package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gp-fplsa/Makefile b/math/gp-fplsa/Makefile
index a8a961d9cb8..e7f1bfa9773 100644
--- a/math/gp-fplsa/Makefile
+++ b/math/gp-fplsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	fplsa
@@ -19,13 +19,15 @@ WRKSRC=		${WRKDIR}/fplsa
 GAP_PKG_NAME=	fplsa
 BUILD_TARGET=	default
 
+USE_TOOLS+=	pax
+
 do-configure:
 	cd ${WRKSRC} && ${SH} configure ${GAP_DIRECTORY}
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${GAP_PKG_DIRECTORY}
 	@for I in README.fplsa bin doc gap init.g lib; do		\
-		cd ${WRKSRC} && ${PAX} -rw $$I ${DESTDIR}${GAP_PKG_DIRECTORY};\
+		cd ${WRKSRC} && pax -rw $$I ${DESTDIR}${GAP_PKG_DIRECTORY};\
 	done
 
 .include "../../math/gap/gap.package.mk"
diff --git a/math/gp-grpconst/Makefile b/math/gp-grpconst/Makefile
index eaf8f63f992..a67e425ed63 100644
--- a/math/gp-grpconst/Makefile
+++ b/math/gp-grpconst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	grpconst
@@ -19,12 +19,14 @@ WRKSRC=		${WRKDIR}/grpconst
 NO_BUILD=	YES
 GAP_PKG_NAME=	grpconst
 
+USE_TOOLS+=	pax
+
 post-extract:
 	${RM} -f ${WRKSRC}/doc/.cvsignore
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${GAP_PKG_ROOT}
-	cd ${WRKDIR} && ${PAX} -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
+	cd ${WRKDIR} && pax -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
 
 .include "../../math/gap/gap.package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gp-lag/Makefile b/math/gp-lag/Makefile
index ae5e7015d64..efdd200446d 100644
--- a/math/gp-lag/Makefile
+++ b/math/gp-lag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	lag-2.1
@@ -19,9 +19,11 @@ WRKSRC=		${WRKDIR}/lag
 NO_BUILD=	YES
 GAP_PKG_NAME=	lag
 
+USE_TOOLS+=	pax
+
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${GAP_PKG_ROOT}
-	cd ${WRKDIR} && ${PAX} -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
+	cd ${WRKDIR} && pax -rw ${GAP_PKG_NAME} ${DESTDIR}${GAP_PKG_ROOT}
 
 .include "../../math/gap/gap.package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Scientific-doc/Makefile b/math/py-Scientific-doc/Makefile
index 1b8e36e4671..e3503df6661 100644
--- a/math/py-Scientific-doc/Makefile
+++ b/math/py-Scientific-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:22 joerg Exp $
 
 DISTNAME=	ScientificPython-2.4.5
 PKGNAME=	py-${DISTNAME:S/Python/-doc/}
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=	yes
 
+USE_TOOLS+=	pax
+
 EGDIR=		${PREFIX}/share/examples/py-Scientific
 DOCDIR=		${PREFIX}/share/doc/py-Scientific
 HTMLDIR=	${PREFIX}/share/doc/html/py-Scientific
@@ -25,8 +27,8 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} README LICENSE 			\
 		Doc/PDF/manual.pdf ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
-	cd ${WRKSRC}/Doc/HTML && ${PAX} -rw -pp -pm . ${DESTDIR}${HTMLDIR}
+	cd ${WRKSRC}/Doc/HTML && pax -rw -pp -pm . ${DESTDIR}${HTMLDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-	cd ${WRKSRC}/Examples && ${PAX} -rw -pp -pm . ${DESTDIR}${EGDIR}
+	cd ${WRKSRC}/Examples && pax -rw -pp -pm . ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index 630af0d431c..cd913155ea4 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/03/04 18:12:59 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:22 joerg Exp $
 #
 
 DISTNAME=	xgap4r16
@@ -18,6 +18,8 @@ WRKSRC=		${WRKDIR}/${GAP_PKG_NAME}
 GNU_CONFIGURE=	YES
 BUILD_TARGET=	default
 
+USE_TOOLS+=	pax
+
 CONFIGURE_ENV+=	GAP_DIRECTORY=${GAP_DIRECTORY:Q}
 
 GAP_PKG_NAME=	xgap
@@ -37,7 +39,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/init.g ${DESTDIR}${GAP_PKG_DIRECTORY}
 	for I in doc examples htm lib; do				\
 		cd ${WRKSRC} &&						\
-		${PAX} -rw $$I ${DESTDIR}${GAP_PKG_DIRECTORY};		\
+		pax -rw $$I ${DESTDIR}${GAP_PKG_DIRECTORY};		\
 	done
 
 .include "../../math/gap/gap.package.mk"