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-jre15 | |
| 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-jre15')
| -rw-r--r-- | lang/sun-jre15/Makefile | 6 | ||||
| -rw-r--r-- | lang/sun-jre15/Makefile.common | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 6ac63037699..dd9e6fb738b 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2008/04/12 22:43:03 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2008/05/26 02:13:21 joerg Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -8,6 +8,8 @@ MASTER_SITES= # empty SHORT_NAME= JRE +USE_TOOLS+= pax + WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:C/-linux-.*//} JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \ servertool tnameserv @@ -86,7 +88,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-jre15/Makefile.common b/lang/sun-jre15/Makefile.common index 57b0d54579e..32189cb0b68 100644 --- a/lang/sun-jre15/Makefile.common +++ b/lang/sun-jre15/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2008/01/21 01:50:22 tnn Exp $ +# $NetBSD: Makefile.common,v 1.24 2008/05/26 02:13:21 joerg Exp $ CATEGORIES= lang java COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} @@ -59,6 +59,8 @@ FETCH_MESSAGE+= "" FETCH_MESSAGE+= " Click 'Download ${DOWNLOAD_NAME}', read and accept the" FETCH_MESSAGE+= " license, then choose 'Linux self-extracting file'." +USE_TOOLS+= pax + post-fetch: @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ ${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \ @@ -66,6 +68,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" |