diff options
| author | jlam <jlam@pkgsrc.org> | 2006-01-21 18:57:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-01-21 18:57:40 +0000 |
| commit | 758d912e338f2060213377f59a7f58ced9eeab24 (patch) | |
| tree | 505836e71024eea9e19676a0f20b017dda96b7a3 /www/jakarta-tomcat5 | |
| parent | d9e6b299d6df27e4615b1691c89bc1c67cf4e5f1 (diff) | |
| download | pkgsrc-758d912e338f2060213377f59a7f58ced9eeab24.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/jakarta-tomcat5')
| -rw-r--r-- | www/jakarta-tomcat5/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index f9d5e730b12..dc5cf040e55 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:23 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/21 18:57:42 jlam Exp $ PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -23,11 +23,12 @@ CATALINA_DIR= Catalina/localhost EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-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.jakarta-tomcat5= ${TOMCAT_LIB}/conf MAKE_DIRS= ${PKG_SYSCONFDIR.jakarta-tomcat5}/${CATALINA_DIR} |