From 3d8ef5a52d6570c7a88c64337bb6c476b78c810c Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 26 May 2008 02:13:14 +0000 Subject: 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. --- print/LPRng-doc/Makefile | 8 +++++--- print/ghostscript6/Makefile | 6 +++--- print/ja-vflib-lib/Makefile | 6 ++++-- print/rtf2latex2e/Makefile | 6 ++++-- print/tex-chemarrow/Makefile | 6 ++++-- print/tex-dhucs/Makefile | 6 +++--- print/tex-prosper/Makefile | 10 ++++++---- 7 files changed, 29 insertions(+), 19 deletions(-) (limited to 'print') diff --git a/print/LPRng-doc/Makefile b/print/LPRng-doc/Makefile index c4de3b86902..d41bfa8eaf2 100644 --- a/print/LPRng-doc/Makefile +++ b/print/LPRng-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/09/04 08:47:17 martti Exp $ +# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:23 joerg Exp $ DISTNAME= LPRng_DOC-3.6.13 PKGNAME= LPRng-doc-3.6.13 @@ -14,11 +14,13 @@ EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes +USE_TOOLS+= pax + do-install: ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/LPRng cd ${WRKDIR:Q} && \ - ${PAX} -O -zrf ${DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX:Q} + pax -O -zrf ${DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX:Q} cd ${WRKSRC:Q} && \ - ${PAX} -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX:Q}/share/doc/LPRng + pax -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX:Q}/share/doc/LPRng .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile index 1f8eb11f3ff..4b3fcf3a77f 100644 --- a/print/ghostscript6/Makefile +++ b/print/ghostscript6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/03/10 12:34:10 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:23 joerg Exp $ DISTNAME= ghostscript-${GS_VERS} PKGREVISION= 11 @@ -23,7 +23,7 @@ CONFLICTS+= hpijs-[0-9]* WRKSRC= ${WRKDIR}/gs${GS_VERS} USE_LANGUAGES= c c++ -USE_TOOLS+= gmake lex +USE_TOOLS+= gmake lex pax GNU_CONFIGURE= yes REQD_DIRS+= share/ghostscript @@ -188,7 +188,7 @@ GS_CONF_PREREQ= # empty .PHONY: contrib-drivers contrib-drivers: - cd ${WRKSRC}/src; ${PAX} -rf ${WRKDIR}/${HPDJ_DRV}/hpdj.tar + cd ${WRKSRC}/src; pax -rf ${WRKDIR}/${HPDJ_DRV}/hpdj.tar ${MV} ${WRKSRC}/src/gs-hpdj.1 ${WRKSRC}/man cd ${WRKDIR}; ${CP} gdevdmpr.c gdevdmpr.mak ${WRKSRC}/src cd ${WRKDIR}; ${CP} dviprlib.* ${WRKSRC}/src diff --git a/print/ja-vflib-lib/Makefile b/print/ja-vflib-lib/Makefile index 676ddbfb25a..b8841ee83c0 100644 --- a/print/ja-vflib-lib/Makefile +++ b/print/ja-vflib-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/02/24 21:07:51 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2008/05/26 02:13:23 joerg Exp $ .include "Makefile.common" @@ -11,6 +11,8 @@ CONFIGURE_ARGS+= --without-x BUILD_TARGET= build-src INSTALL_TARGET= install-src +USE_TOOLS+= pax + post-build: .for FILE in vfontcap vfontcap.bdf cd ${WRKSRC}; \ @@ -26,7 +28,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} cd ${WRKSRC} && ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \ ${PREFIX}/share/VFlib/${VFLIB_VERSION} - cd ${WRKSRC} && ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION} + cd ${WRKSRC} && pax -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION} ${FIND} ${PREFIX}/share/VFlib/${VFLIB_VERSION} -type d -print \ -exec ${CHMOD} ${PKGDIRMODE} {} \; ${FIND} ${PREFIX}/share/VFlib/${VFLIB_VERSION} -type f -print \ diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile index 40bd263e25b..d7229182de3 100644 --- a/print/rtf2latex2e/Makefile +++ b/print/rtf2latex2e/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/02/03 02:49:19 reed Exp $ +# $NetBSD: Makefile,v 1.3 2008/05/26 02:13:23 joerg Exp $ # # fix install so it uses ${prefix} @@ -20,6 +20,8 @@ CONFIGURE_DIRS= Unix GNU_CONFIGURE= yes MAKE_ENV+= INSTALL_DIR=${PREFIX}/share/rtf2latex2e +USE_TOOLS+= pax + INSTALLATION_DIRS+= bin share/doc/rtf2latex2e share/rtf2latex2e do-install: @@ -27,7 +29,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/rtf2latex2e/ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rtf2latex2e/ ${INSTALL_DATA} ${WRKSRC}/doc/rtf2LaTeX2eDoc.html ${PREFIX}/share/doc/rtf2latex2e/ - cd ${WRKSRC} && ${PAX} -rw pref ${PREFIX}/share/rtf2latex2e + cd ${WRKSRC} && pax -rw pref ${PREFIX}/share/rtf2latex2e # install other docs and examples too? diff --git a/print/tex-chemarrow/Makefile b/print/tex-chemarrow/Makefile index 934beea9fdb..c0e0928a08b 100644 --- a/print/tex-chemarrow/Makefile +++ b/print/tex-chemarrow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/04/07 02:41:13 minskim Exp $ +# $NetBSD: Makefile,v 1.8 2008/05/26 02:13:23 joerg Exp $ # DISTNAME= chemarrow @@ -16,6 +16,8 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_DIRS+= texmf-1.0 +USE_TOOLS+= pax + .include "../../print/teTeX/module.mk" post-extract: @@ -32,7 +34,7 @@ do-install: ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/chemarrow ${INSTALL_DATA} ${WRKSRC}/chemarrow.sty \ ${PKG_LOCALTEXMFPREFIX}/tex/latex/chemarrow - cd ${WRKSRC}/type1/arrow\ PC && ${PAX} -rw . \ + cd ${WRKSRC}/type1/arrow\ PC && pax -rw . \ ${PREFIX}/share/fonts/chemarrow/ .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-dhucs/Makefile b/print/tex-dhucs/Makefile index 6f8b7ff8a1f..c116edc00dc 100644 --- a/print/tex-dhucs/Makefile +++ b/print/tex-dhucs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/06/06 23:50:14 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:23 joerg Exp $ DISTNAME= dhucs-3.2.2-20070507 PKGNAME= tex-${DISTNAME:C/-[0-9]+$//} @@ -19,7 +19,7 @@ SITES.fonts-unttf-20070507.tar.gz= \ WRKSRC= ${WRKDIR}/dhucs NO_BUILD= yes USE_DIRS+= texmf-1.0 -USE_TOOLS+= bzcat perl:run +USE_TOOLS+= bzcat pax perl:run REPLACE_PERL+= script/makeindex-dhucs.pl @@ -33,7 +33,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/makeindex/dhucs.ist \ ${PKG_LOCALTEXMFPREFIX}/makeindex/ ${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/latex/dhucs - cd ${WRKSRC}/tex-latex-dhucs && ${PAX} -rwppm . \ + cd ${WRKSRC}/tex-latex-dhucs && pax -rwppm . \ ${PKG_LOCALTEXMFPREFIX}/tex/latex/dhucs/ find ${PKG_LOCALTEXMFPREFIX}/tex/latex/dhucs \ -type d -exec chmod ${PKGDIRMODE} {} \; diff --git a/print/tex-prosper/Makefile b/print/tex-prosper/Makefile index 1448753b89a..5c5dd57bae5 100644 --- a/print/tex-prosper/Makefile +++ b/print/tex-prosper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/04/07 03:30:36 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:23 joerg Exp $ # DISTNAME= prosper-1.00.4 @@ -17,6 +17,8 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_DIRS+= texmf-1.0 +USE_TOOLS+= pax + TEXMF= ${PKG_LOCALTEXMFPREFIX} PROSPERDIR= ${TEXMF}/tex/latex/prosper @@ -36,10 +38,10 @@ do-install: ${INSTALL_DATA_DIR} ${PROSPERDIR} ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA_DIR} ${EGDIR} - cd ${WRKSRC} && ${PAX} -rw -pp -pm *.sty *.cls img contrib designer \ + cd ${WRKSRC} && pax -rw -pp -pm *.sty *.cls img contrib designer \ ${PROSPERDIR} - cd ${WRKSRC}/doc && ${PAX} -rw -pp -pm . ${DOCDIR} - cd ${WRKSRC}/examples && ${PAX} -rw -pp -pm . ${EGDIR} + cd ${WRKSRC}/doc && pax -rw -pp -pm . ${DOCDIR} + cd ${WRKSRC}/examples && pax -rw -pp -pm . ${EGDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR} .endfor -- cgit v1.2.3