summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorgrant <grant>2003-04-10 01:28:03 +0000
committergrant <grant>2003-04-10 01:28:03 +0000
commit3658cb69164d87994099b24340f06a30f37dd521 (patch)
treec67db081e20351feb52d2ca5fbde4b2c17aa2887 /www
parent217d57c2dcbe8490f0672ad2d0cd57c35a195d16 (diff)
downloadpkgsrc-3658cb69164d87994099b24340f06a30f37dd521.tar.gz
make ${PAX} usage consistent:
- group 'zrw' and 'p' args, -s last - use the && operator consistently - strip unneeded parens - some whitespace cleanup
Diffstat (limited to 'www')
-rw-r--r--www/ap-layout/Makefile4
-rw-r--r--www/ap-python/Makefile14
-rw-r--r--www/cocoon/Makefile6
-rw-r--r--www/hiawatha/Makefile4
-rw-r--r--www/jakarta-servletapi/Makefile4
-rw-r--r--www/jssi/Makefile4
-rw-r--r--www/py-zpublisher/Makefile16
-rw-r--r--www/spfc/Makefile4
-rw-r--r--www/zope-confera/Makefile6
-rw-r--r--www/zope/Makefile16
-rw-r--r--www/zope25-zopebook/Makefile4
-rw-r--r--www/zope25/Makefile12
12 files changed, 47 insertions, 47 deletions
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index 4a1bba95148..dcfe0d7737a 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/02/17 21:01:08 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:28 grant Exp $
#
DISTNAME= mod_layout-3.2
@@ -21,7 +21,7 @@ post-install:
${INSTALL_DATA_DIR} ${LAYOUT_DIR}
${INSTALL_DATA} ${WRKSRC}/faq.html ${LAYOUT_DIR}
${INSTALL_DATA_DIR} ${LAYOUT_DIR}/directives
- cd ${WRKSRC}/directives; ${PAX} -rw . ${LAYOUT_DIR}/directives
+ cd ${WRKSRC}/directives && ${PAX} -rw . ${LAYOUT_DIR}/directives
.include "../../www/apache/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index 7ea87cc0e01..07cab05595d 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/25 12:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/10 01:28:28 grant Exp $
#
DISTNAME= mod_python-2.7.6
@@ -21,15 +21,15 @@ PYTHON_VERSIONS_ACCEPTED= 20
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python
- ( cd ${WRKSRC}; ${PAX} -r -w -s /doc-html/ap-mod_python/ \
- -p e doc-html ${PREFIX}/share/doc/html )
+ cd ${WRKSRC} && ${PAX} -rw -s /doc-html/ap-mod_python/ \
+ -pe doc-html ${PREFIX}/share/doc/html
${ECHO} lib/httpd/mod_python.so >${PLIST_SRC}
- (cd ${PREFIX}; ${FIND} ${PYSITELIB}/mod_python \
+ cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \
share/doc/html/ap-mod_python \
- -type f -print >>${PLIST_SRC} )
- ( cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/mod_python \
+ -type f -print >>${PLIST_SRC}
+ cd ${PREFIX} && ${FIND} -d ${PYSITELIB}/mod_python \
share/doc/html/ap-mod_python \
- -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} )
+ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
.include "../../lang/python/extension.mk"
.include "../../www/apache/buildlink2.mk"
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 6e264b84423..b627b83cea5 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/03/29 12:42:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/04/10 01:28:28 grant Exp $
DISTNAME= Cocoon-1.8.2
PKGNAME= cocoon-1.8.2
@@ -53,11 +53,11 @@ 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 && ${PAX} -rwpp . ${PREFIX}/share/doc/java/cocoon
+ cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${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 && ${PAX} -rwpp . ${PREFIX}/share/examples/java/cocoon
+ cd ${WRKSRC}/samples && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/cocoon
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 7044d93662f..3ad5684571f 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:29 grant Exp $
#
DISTNAME= hiawatha
@@ -44,7 +44,7 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${PREFIX}/etc \
; fi
${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${PREFIX}/share/examples/hiawatha
- (cd ${WRKSRC} && ${PAX} -s '/^WEBROOT/pault.com/' -rw WEBROOT ${PREFIX}/share/examples/hiawatha)
+ cd ${WRKSRC} && ${PAX} -rw WEBROOT -s '/^WEBROOT/pault.com/' ${PREFIX}/share/examples/hiawatha
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hiawatha/WEBROOT
${INSTALL_DATA} ${FILESDIR}/index.xml ${PREFIX}/share/examples/hiawatha/WEBROOT
${INSTALL_DATA} ${FILESDIR}/index.xsl ${PREFIX}/share/examples/hiawatha/WEBROOT
diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 85c1ccbd34e..9fff9418ac8 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:29 grant Exp $
DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
@@ -35,7 +35,7 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/${DOCDIR}
- cd ${WRKDIR}/dist/servletapi/docs && ${PAX} -rwpp . ${PREFIX}/${DOCDIR}
+ cd ${WRKDIR}/dist/servletapi/docs && ${PAX} -rw -pp . ${PREFIX}/${DOCDIR}
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index e020e304d39..f1c52548093 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:29 grant Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
@@ -25,7 +25,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 && ${PAX} -rwpp . ${PREFIX}/share/doc/java/jssi
+ cd ${WRKSRC}/../../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/jssi
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
index 93d2e5e4468..bad53bf35ed 100644
--- a/www/py-zpublisher/Makefile
+++ b/www/py-zpublisher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/10 01:28:30 grant Exp $
#
DISTNAME= Zope-2.2.2-src
@@ -18,18 +18,18 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
EXTRACT_ELEMENTS= ${DISTNAME}/lib/python/ZPublisher
do-build:
- (cd ${WRKSRC}/..; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
- (cd ${WRKSRC}/..; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
+ cd ${WRKSRC}/.. && ${PY_PROG} ${PY_LIBDIR}/compileall.py .
+ cd ${WRKSRC}/.. && ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .
do-install:
${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
- (cd ${WRKSRC}; ${PAX} -r -w -v -p e ZPublisher ${PY_SITEPKG})
+ cd ${WRKSRC} && ${PAX} -rw -pe ZPublisher ${PY_SITEPKG}
${CHMOD} 755 ${PY_SITEPKG}/ZPublisher/Test.py
- (cd ${PREFIX}; ${FIND} ${PY_SITEPATH}/ZPublisher \
- -type f -print >>${PLIST_SRC})
- (cd ${PREFIX}; ${FIND} -d ${PY_SITEPATH}/ZPublisher \
- -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+ cd ${PREFIX} && ${FIND} ${PY_SITEPATH}/ZPublisher \
+ -type f -print >>${PLIST_SRC}
+ cd ${PREFIX} && ${FIND} -d ${PY_SITEPATH}/ZPublisher \
+ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
${LN} -sf ../${PY_SITEPATH}/ZPublisher/Test.py ${PREFIX}/bin/bobo
.include "../../lang/python20/Makefile.inc"
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index b092807932a..d71d8f00cea 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:30 grant Exp $
DISTNAME= spfc-0.2.0
WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
@@ -21,7 +21,7 @@ MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
do-install:
${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java
${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/java/spfc
- cd ${WRKSRC}/../docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/spfc
+ cd ${WRKSRC}/../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/spfc
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope-confera/Makefile b/www/zope-confera/Makefile
index d1ac1b4353e..f7b90785d19 100644
--- a/www/zope-confera/Makefile
+++ b/www/zope-confera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:30 grant Exp $
#
DISTNAME= Confera-1.2.0-nonbin
@@ -23,9 +23,9 @@ PRODPATH= lib/python/Products/Confera
do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
- (cd ${WRKDIR}; ${PAX} -r -w lib ${ZOPEDIR})
+ cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR}
${CHMOD} -R a+rX ${ZOPEDIR}/${PRODPATH}
- (cd ${PREFIX}; ${FIND} lib/zope/${PRODPATH} -type f -print >>${PLIST_SRC})
+ cd ${PREFIX} && ${FIND} lib/zope/${PRODPATH} -type f -print >>${PLIST_SRC}
${ECHO} "@dirrm lib/zope/${PRODPATH}" >> ${PLIST_SRC}
.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope/Makefile b/www/zope/Makefile
index cef3635c7e9..7ef52324f44 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/09/21 23:47:00 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/10 01:28:31 grant Exp $
#
DISTNAME= Zope-2.2.2-src
@@ -25,21 +25,21 @@ PYTHON_VERSIONS_ACCEPTED= 20 # XXX for now
do-configure:
${SED} -e "s,@PREFIX@,${PREFIX}," \
<${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile
- (cd ${WRKSRC}/lib; ${RM} -rf Components/zlib \
+ cd ${WRKSRC}/lib && ${RM} -rf Components/zlib \
Components/ExtensionClass python/DocumentTemplate \
- python/StructuredText)
- (cd ${WRKSRC}; make configure)
+ python/StructuredText
+ cd ${WRKSRC} && make configure
do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
${INSTALL_DATA_DIR} ${ZOPEDIR}
- (cd ${WRKSRC}; ${PAX} -r -w -s'/.*\.[cho]$$//' . ${ZOPEDIR})
+ cd ${WRKSRC} && ${PAX} -rw -s'/.*\.[cho]$$//' . ${ZOPEDIR}
${PYTHONBIN} \
${PREFIX}/lib/python2.0/compileall.py ${ZOPEDIR}
${CHMOD} -R a+rX ${ZOPEDIR}
- (cd ${PREFIX}; ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC})
- (cd ${PREFIX}; ${FIND} -d lib/zope -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+ cd ${PREFIX} && ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC}
+ cd ${PREFIX} && ${FIND} -d lib/zope -type d -print | \
+ ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
${SED} -e "s,/usr/pkg,${PREFIX}," \
<${FILESDIR}/zope-install.py >${PREFIX}/sbin/zope-install
${SED} -e "s,/usr/pkg,${PREFIX}," \
diff --git a/www/zope25-zopebook/Makefile b/www/zope25-zopebook/Makefile
index 0639f57749f..5ca615a82f7 100644
--- a/www/zope25-zopebook/Makefile
+++ b/www/zope25-zopebook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/12/10 18:07:38 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/10 01:28:31 grant Exp $
#
DISTNAME= ZopeBook
@@ -18,6 +18,6 @@ ZBDIR= ${PREFIX}/share/doc/html/ZopeBook-2.5
do-install:
${INSTALL_DATA_DIR} ${ZBDIR}
- (cd ${WRKSRC}; ${PAX} -rw . ${ZBDIR})
+ cd ${WRKSRC} && ${PAX} -rw . ${ZBDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope25/Makefile b/www/zope25/Makefile
index f2ee5471c63..1fd85bce4a9 100644
--- a/www/zope25/Makefile
+++ b/www/zope25/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/24 22:11:05 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:31 grant Exp $
#
DISTNAME= Zope-2.5.1-src
@@ -39,14 +39,14 @@ do-build:
#
do-install:
${INSTALL_DATA_DIR} ${ZOPEDIR}
- (cd ${WRKSRC}; ${FIND} ${ZOPEPY} -type f -and \! \( -name "*.[cho]" \
+ cd ${WRKSRC} && ${FIND} ${ZOPEPY} -type f -and \! \( -name "*.[cho]" \
-or -name "sedscript" -or -name "Makefile*" \
-or -name "Setup*" -or -name ".cvsignore" \) \
- -print | ${PAX} -r -w ${ZOPEDIR})
+ -print | ${PAX} -rw ${ZOPEDIR}
#install hotfix
- (cd ${WRKDIR}; ${PAX} -r -w lib ${ZOPEDIR})
- (cd ${ZOPEDIR}; ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py)
- (cd ${WRKSRC}; ${PAX} -r -w ${ZOPEDATA} ${ZOPEDIR})
+ cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR}
+ cd ${ZOPEDIR} && ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py
+ cd ${WRKSRC} && ${PAX} -rw ${ZOPEDATA} ${ZOPEDIR}
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"