diff options
| author | jlam <jlam> | 2006-01-21 18:57:40 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-01-21 18:57:40 +0000 |
| commit | 68e275d406913f1ae5e37c37ce004880df826458 (patch) | |
| tree | 505836e71024eea9e19676a0f20b017dda96b7a3 /www/apache-tomcat55 | |
| parent | 04641e80e417f21412d018141babfd7f258ccc2e (diff) | |
| download | pkgsrc-68e275d406913f1ae5e37c37ce004880df826458.tar.gz | |
Update package Makefile now that bsd.pkg.extract.mk is using the
"extract" script for extraction. Many cases where a custom EXTRACT_CMD
simply copied the distfile into the work directory are no longer
needed. The extract script also hides differences between pax and
tar behind a common command-line interface, so we no longer need code
that's conditional on whether EXTRACT_USING is tar or pax.
Diffstat (limited to 'www/apache-tomcat55')
| -rw-r--r-- | www/apache-tomcat55/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile index 7365a35b56c..0e5d75a7e03 100644 --- a/www/apache-tomcat55/Makefile +++ b/www/apache-tomcat55/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $ +# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $ DISTNAME= apache-tomcat-${TOMCAT_VERSION} CATEGORIES= www java @@ -21,11 +21,12 @@ CATALINA_DIR= Catalina/localhost EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat EGDIR2= ${EGDIR}/${CATALINA_DIR} -USE_TOOLS+= gunzip tar +.include "../../mk/bsd.prefs.mk" -# Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4) -# If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228 -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar +# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228) +.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*) +EXTRACT_USING= gtar +.endif PKG_SYSCONFDIR.apache-tomcat= ${TOMCAT_LIB}/conf MAKE_DIRS= ${PKG_SYSCONFDIR.apache-tomcat}/${CATALINA_DIR} |