diff options
| author | joerg <joerg> | 2008-05-26 02:13:14 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-05-26 02:13:14 +0000 |
| commit | 2374ca422f2eb8b46ed600c7bb21740b2865d899 (patch) | |
| tree | b711f279533efa082bd9211a7161438542a8810d /lang/sun-jre6 | |
| parent | ef56178a4a7ad8f02178aa72c5c4a4567ade918b (diff) | |
| download | pkgsrc-2374ca422f2eb8b46ed600c7bb21740b2865d899.tar.gz | |
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.
Diffstat (limited to 'lang/sun-jre6')
| -rw-r--r-- | lang/sun-jre6/Makefile | 6 | ||||
| -rw-r--r-- | lang/sun-jre6/Makefile.common | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile index da886590a06..f1e6a5f84b0 100644 --- a/lang/sun-jre6/Makefile +++ b/lang/sun-jre6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/04/12 22:43:03 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:21 joerg Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version @@ -10,6 +10,8 @@ MASTER_SITES= # empty DOWNLOAD_NAME= Java Runtime Environment (JRE) 6u5 SHORT_NAME= JRE +USE_TOOLS+= pax + WRKSRC= ${WRKDIR}/jre1.6.0_05 JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \ servertool tnameserv @@ -85,7 +87,7 @@ do-configure: pre-install: .if !empty(PKG_OPTIONS:Msun-jre-jce) - cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security + cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security .endif # diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common index 735e8f0c232..47fad949263 100644 --- a/lang/sun-jre6/Makefile.common +++ b/lang/sun-jre6/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2008/03/04 16:38:13 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2008/05/26 02:13:21 joerg Exp $ CATEGORIES= lang java COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} @@ -19,6 +19,8 @@ EMUL_PLATFORMS= linux-i386 PKG_DESTDIR_SUPPORT= user-destdir +USE_TOOLS+= pax + .include "../../mk/bsd.prefs.mk" EMUL_MODULES.linux= compat locale x11 @@ -70,6 +72,6 @@ post-fetch: do-install: ${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME} - cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME} + cd ${WRKSRC} && pax -rwp ma . ${DESTDIR}${JAVA_HOME} .include "../../mk/java-env.mk" |