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, 26 insertions, 18 deletions

diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index 294db362926..166399cacb0 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_ENV+=	VERSION=${PKGVERSION:Q}
-USE_TOOLS+=	gmake gtar
+USE_TOOLS+=	gmake gtar pax
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
@@ -23,7 +23,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 do-extract:
 		cd ${WRKDIR} ; \
 		${PREFIX}/bin/rpm2cpio.pl ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		| ${PAX} -r ; \
+		| pax -r ; \
 		${GTAR} zxf ${DISTNAME}.tar.gz
 
 do-install:
diff --git a/fonts/dejavu-ttf/Makefile b/fonts/dejavu-ttf/Makefile
index 31cb3469f1e..654ec562fce 100644
--- a/fonts/dejavu-ttf/Makefile
+++ b/fonts/dejavu-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=	dejavu-ttf-2.21
@@ -16,12 +16,14 @@ USE_X11BASE=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+USE_TOOLS+=	pax
+
 FONTS_DIRS.ttf+=	${PREFIX}/lib/X11/fonts/TTF
 
 INSTALLATION_DIRS=	lib/X11/fonts/TTF share/doc/dejavu-ttf
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pm *.ttf \
+	cd ${WRKSRC} && pax -rw -pm *.ttf \
 		${DESTDIR}${PREFIX}/lib/X11/fonts/TTF/
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS LICENSE NEWS README \
 		${DESTDIR}${PREFIX}/share/doc/dejavu-ttf
diff --git a/fonts/freefont-ttf/Makefile b/fonts/freefont-ttf/Makefile
index b5ebed52d0a..4bf8e5ade9d 100644
--- a/fonts/freefont-ttf/Makefile
+++ b/fonts/freefont-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=		freefont-ttf
@@ -18,6 +18,7 @@ WRKSRC=			${WRKDIR}
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 USE_LANGUAGES=		# empty
+USE_TOOLS+=		pax
 INSTALLATION_DIRS=	share/fonts/freefont share/doc/freefont
 
 do-install:
@@ -28,6 +29,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/CREDITS \
 		${DESTDIR}${PREFIX}/share/doc/freefont/
 	cd ${WRKSRC}/sfd && \
-		${PAX} -rw Free*.ttf ${DESTDIR}${PREFIX}/share/fonts/freefont/
+		pax -rw Free*.ttf ${DESTDIR}${PREFIX}/share/fonts/freefont/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/mplayer-fonts/Makefile b/fonts/mplayer-fonts/Makefile
index 7e39c6a9a99..9f73b4532aa 100644
--- a/fonts/mplayer-fonts/Makefile
+++ b/fonts/mplayer-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/12/02 11:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:18 joerg Exp $
 
 DISTNAME=	mplayer-fonts-20030714
 PKGREVISION=	1
@@ -27,13 +27,15 @@ DIST_SUBDIR=	${DISTNAME}
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
+USE_TOOLS+=	pax
+
 INSTALLATION_DIRS= share/mplayer/fonts
 
 do-install:
 	for D in font-arial-cp1250 font-arial-iso-8859-1 \
 		font-arial-iso-8859-2 font-arial-iso-8859-7; do \
 		(cd ${WRKDIR}/$$D && \
-			${PAX} -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/fonts); \
+			pax -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/fonts); \
 	done
 	${LN} -s ${PREFIX}/share/mplayer/fonts/font-arial-18-iso-8859-1 \
 		${DESTDIR}${PREFIX}/share/mplayer/font
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 7d8c68f7a5e..6b4949e7580 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/02/16 13:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/05/26 02:13:18 joerg Exp $
 
 DISTNAME=	t1lib-5.1.2
 CATEGORIES=	fonts devel graphics
@@ -11,7 +11,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pax
 GNU_CONFIGURE=		yes
 
 BUILD_TARGET=	without_doc
@@ -39,14 +39,14 @@ pre-build:
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DATADIR}
 	cd ${WRKSRC};							\
-	${PAX} -rw Fonts ${DESTDIR}${DATADIR};					\
+	pax -rw Fonts ${DESTDIR}${DATADIR};					\
 	${CHMOD} go+r ${DESTDIR}${DATADIR}/Fonts/enc/IsoLatin2.enc;		\
-	${PAX} -rw -s "/doc/${PKGBASE}/" doc ${DESTDIR}${PREFIX}/share/doc
+	pax -rw -s "/doc/${PKGBASE}/" doc ${DESTDIR}${PREFIX}/share/doc
 
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/t1lib.config.sample ${DESTDIR}${EGDIR}
 	cd ${WRKSRC}/examples;						\
-	${PAX} -rw FontDataBase t1example1.c t1lib.config ${DESTDIR}${EGDIR}
+	pax -rw FontDataBase t1example1.c t1lib.config ${DESTDIR}${EGDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/tex-unttf/Makefile b/fonts/tex-unttf/Makefile
index de68f10de82..560ae7f0609 100644
--- a/fonts/tex-unttf/Makefile
+++ b/fonts/tex-unttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=	fonts-unttf-20070507
@@ -18,6 +18,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/fonts-unttf
 USE_DIRS+=	texmf-1.0
+USE_TOOLS+=	pax
 NO_CONFIGURE=	yes
 
 TEX_FONTMAPS=		unttf-pdftex-dhucs.map
@@ -34,7 +35,7 @@ do-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/
-	cd ${WRKSRC}/fonts; ${PAX} -rw . ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/
+	cd ${WRKSRC}/fonts; pax -rw . ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/fonts/
 	${INSTALL_DATA_DIR} ${DESTDIR}${TEXTTFDIR}/unbt
 	${LN} -sf ${SYSTTFDIR}/UnBatang.ttf ${DESTDIR}${TEXTTFDIR}/unbt/
 	${LN} -sf ${SYSTTFDIR}/UnBatangBold.ttf ${DESTDIR}${TEXTTFDIR}/unbt/
diff --git a/fonts/vera-ttf/Makefile b/fonts/vera-ttf/Makefile
index ee44bfc0156..f21cee2583b 100644
--- a/fonts/vera-ttf/Makefile
+++ b/fonts/vera-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/03/24 22:40:22 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:18 joerg Exp $
 #
 
 DISTNAME=	ttf-bitstream-vera-1.10
@@ -18,12 +18,14 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
+USE_TOOLS+=	pax
+
 INSTALLATION_DIRS=	lib/X11/fonts/TTF \
 			share/doc/vera-ttf share/examples/vera-ttf
 FONTS_DIRS.ttf=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw -pm *.ttf ${DESTDIR}${FONTS_DIRS.ttf}
+	cd ${WRKSRC} && pax -rw -pm *.ttf ${DESTDIR}${FONTS_DIRS.ttf}
 	${INSTALL_DATA} ${WRKSRC}/local.conf ${DESTDIR}${PREFIX}/share/examples/vera-ttf
 	cd ${WRKSRC} && ${INSTALL_DATA} *.TXT ${DESTDIR}${PREFIX}/share/doc/vera-ttf