From be9bc4ff1b2299e27569fc091508ae53f0aab39f Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 14 Nov 2001 14:47:53 +0000 Subject: Replace "${GTAR} cf - . | (cd ... ; ${GTAR} xf - )" pipelines with a single instance of ${PAX}. --- www/cocoon/Makefile | 6 +++--- www/jakarta-servletapi/Makefile | 4 ++-- www/jssi/Makefile | 5 ++--- www/spfc/Makefile | 5 ++--- 4 files changed, 9 insertions(+), 11 deletions(-) (limited to 'www') diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 7a97ed09649..d6eb1a802b8 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/22 15:15:23 jwise Exp $ +# $NetBSD: Makefile,v 1.13 2001/11/14 14:47:56 agc Exp $ DISTNAME= Cocoon-1.8.2 PKGNAME= cocoon-1.8.2 @@ -54,12 +54,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/turbine-pool.jar ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/lib/sax-bugfix.jar ${PREFIX}/lib/java ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/cocoon - cd ${WRKSRC}/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/cocoon ; ${GTAR} pvxf - ) + cd ${WRKSRC}/docs && ${PAX} -rwpe . ${PREFIX}/share/doc/java/cocoon ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/cocoon ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/cocoon/WEB-INF ${INSTALL_DATA} ${FILESDIR}/web.xml ${PREFIX}/share/examples/java/cocoon/WEB-INF ${INSTALL_DATA} ${WRKSRC}/conf/cocoon.properties ${PREFIX}/share/examples/java/cocoon/WEB-INF - cd ${WRKSRC}/samples ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/cocoon ; ${GTAR} pvxf - ) + cd ${WRKSRC}/samples && ${PAX} -rwpe . ${PREFIX}/share/examples/java/cocoon ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/java/cocoon .include "../../mk/bsd.pkg.mk" diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile index bf6079c9f27..299c68a28c0 100644 --- a/www/jakarta-servletapi/Makefile +++ b/www/jakarta-servletapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/08/11 22:05:22 jwise Exp $ +# $NetBSD: Makefile,v 1.5 2001/11/14 14:47:57 agc Exp $ DISTNAME= jakarta-servletapi-3.2.3-src PKGNAME= jakarta-servletapi-3.2.3 @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jakarta-servletapi ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/jakarta-servletapi ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/java/jakarta-servletapi - cd ${WRKDIR}/dist/servletapi/docs ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/java/jakarta-servletapi ; ${GTAR} pvxf - ) + cd ${WRKDIR}/dist/servletapi/docs && ${PAX} -rwpe . ${PREFIX}/share/doc/java/jakarta-servletapi .include "../../mk/bsd.pkg.mk" MAKE_PROGRAM= ${LOCALBASE}/bin/ant diff --git a/www/jssi/Makefile b/www/jssi/Makefile index b8a154a0d3a..83740bf2cd1 100644 --- a/www/jssi/Makefile +++ b/www/jssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/22 15:26:10 jwise Exp $ +# $NetBSD: Makefile,v 1.9 2001/11/14 14:47:57 agc Exp $ DISTNAME= ApacheJSSI-1.1.2 PKGNAME= jssi-1.1.2 @@ -26,8 +26,7 @@ post-build: do-install: ${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi - (cd ${WRKSRC}/../../docs ; ${GTAR} pcf - .) | \ - (cd ${PREFIX}/share/doc/java/jssi ; ${GTAR} pxvf -) + cd ${WRKSRC}/../../docs && ${PAX} -rwpe . ${PREFIX}/share/doc/java/jssi ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/jssi .include "../../mk/bsd.pkg.mk" diff --git a/www/spfc/Makefile b/www/spfc/Makefile index 97961a82f88..a056a2aa7ae 100644 --- a/www/spfc/Makefile +++ b/www/spfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:24 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2001/11/14 14:47:57 agc Exp $ DISTNAME= spfc-0.2.0 CATEGORIES= www @@ -22,8 +22,7 @@ WRKSRC= ${WRKDIR}/spfc-0.2.0/src/ do-install: ${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/java/spfc - (cd ${WRKSRC}/../docs ; ${GTAR} pcf - .) | \ - (cd ${PREFIX}/share/doc/java/spfc ; ${GTAR} pxvf -) + cd ${WRKSRC}/../docs && ${PAX} -rwpe . ${PREFIX}/share/doc/java/spfc ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/java/spfc .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3