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.

6 files changed, 23 insertions, 13 deletions

diff --git a/geography/postgresql81-postgis/Makefile b/geography/postgresql81-postgis/Makefile
index 44cf473bfc6..6cd5e0b89ad 100644
--- a/geography/postgresql81-postgis/Makefile
+++ b/geography/postgresql81-postgis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/02/16 01:29:00 gdt Exp $
+# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:20 joerg Exp $
 
 DISTNAME=		postgis-${VERSION}
 VERSION=		1.3.2
@@ -19,7 +19,7 @@ CONFLICTS=		postgis-[0-9]*
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake lex perl
+USE_TOOLS+=		gmake lex pax perl
 USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	--enable-rpath
@@ -47,7 +47,7 @@ do-install:
 	${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/*.xml ${DOCDIR}
 	${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/*.txt ${DOCDIR}
 	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc/html && ${PAX} -rw -pp *.html *.css ${HTMLDIR}
+	cd ${WRKSRC}/doc/html && pax -rw -pp *.html *.css ${HTMLDIR}
 	${INSTALL_MAN} ${BUILD_DIRS:Q}/doc/man/*.1 ${PREFIX}/${PKGMANDIR}/man1
 
 DEPENDS+=	postgresql81-server>=8.1:../../databases/postgresql81-server
diff --git a/geography/xrmap-factbook_html/Makefile b/geography/xrmap-factbook_html/Makefile
index c250e8005e0..22e138ee211 100644
--- a/geography/xrmap-factbook_html/Makefile
+++ b/geography/xrmap-factbook_html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=		factbook_html_2002
@@ -14,6 +14,8 @@ COMMENT=		CIA factbook for xrmap (HTML)
 
 DEPENDS+=		xrmap-base>=2.29:../../geography/xrmap-base
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
@@ -21,6 +23,6 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	share/rmap
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pe factbook ${DESTDIR}${PREFIX}/share/rmap
+	cd ${WRKSRC} && pax -rw -pe factbook ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/xrmap-factbook_text/Makefile b/geography/xrmap-factbook_text/Makefile
index d8ed84537df..0f0f9e34ab4 100644
--- a/geography/xrmap-factbook_text/Makefile
+++ b/geography/xrmap-factbook_text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/05/07 19:32:54 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=		factbook_text_2006
@@ -15,11 +15,13 @@ DEPENDS+=		xrmap-base>=2.29:../../geography/xrmap-base
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	pax
+
 WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 INSTALLATION_DIRS=	share/rmap
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pe factbook ${DESTDIR}${PREFIX}/share/rmap
+	cd ${WRKSRC} && pax -rw -pe factbook ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/xrmap-flags/Makefile b/geography/xrmap-flags/Makefile
index aaf90e7ba00..d604aaaab21 100644
--- a/geography/xrmap-flags/Makefile
+++ b/geography/xrmap-flags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=		flags-1.1
@@ -14,6 +14,8 @@ COMMENT=		National flags for xrmap
 
 DEPENDS+=		xrmap-base>=2.29:../../geography/xrmap-base
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
@@ -21,6 +23,6 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	share/rmap
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pe flags ${DESTDIR}${PREFIX}/share/rmap
+	cd ${WRKSRC} && pax -rw -pe flags ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/xrmap-hymns/Makefile b/geography/xrmap-hymns/Makefile
index 24518cac1bb..52db300baae 100644
--- a/geography/xrmap-hymns/Makefile
+++ b/geography/xrmap-hymns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=		hymns-1.2
@@ -14,6 +14,8 @@ COMMENT=		National anthems (MIDI) for xrmap
 
 DEPENDS+=		xrmap-base>=2.29:../../geography/xrmap-base
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
@@ -21,6 +23,6 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	share/rmap
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pe hymns ${DESTDIR}${PREFIX}/share/rmap
+	cd ${WRKSRC} && pax -rw -pe hymns ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/xrmap-pdfmaps/Makefile b/geography/xrmap-pdfmaps/Makefile
index 86bb2646547..6f363c46c51 100644
--- a/geography/xrmap-pdfmaps/Makefile
+++ b/geography/xrmap-pdfmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:20 joerg Exp $
 #
 
 DISTNAME=		pdfmaps-1.1
@@ -13,6 +13,8 @@ COMMENT=		PDF maps for xrmap
 
 DEPENDS+=		xrmap-base>=2.29:../../geography/xrmap-base
 
+USE_TOOLS+=	pax
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
@@ -20,6 +22,6 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	share/rmap
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pe pdfmaps ${DESTDIR}${PREFIX}/share/rmap
+	cd ${WRKSRC} && pax -rw -pe pdfmaps ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"