diff options
| author | hans <hans@pkgsrc.org> | 2012-02-16 22:14:12 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-02-16 22:14:12 +0000 |
| commit | c0110e92819d05af45941509b3ad1ff3016806d7 (patch) | |
| tree | 2ba24e6e5326713a292185183a98a974633a68b9 /lang/openjdk7 | |
| parent | 76229a91214e71ff2d8d2f8d7aba9eb70fa423b7 (diff) | |
| download | pkgsrc-c0110e92819d05af45941509b3ad1ff3016806d7.tar.gz | |
Remove build dependency on unzip and use it as tool instead.
Diffstat (limited to 'lang/openjdk7')
| -rw-r--r-- | lang/openjdk7/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 14a5930c640..389057d9951 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/02/06 12:40:46 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2012/02/16 22:14:12 hans Exp $ DISTNAME= openjdk-7-fcs-src-b147-27_jun_2011 PKGNAME= openjdk7-1.7.0.147.20110811 @@ -30,10 +30,9 @@ JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ policytool rmid rmiregistry servertool tnameserv -BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip} -MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip -MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv +MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip} +MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf #DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf @@ -41,7 +40,7 @@ DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf NO_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake pax zip:run +USE_TOOLS+= gmake pax unzip:run zip:run UNLIMIT_RESOURCES= datasize stacksize WRKSRC= ${WRKDIR}/openjdk @@ -164,6 +163,10 @@ do-install: MAKE_ENV+= PTHREAD_STACKSIZE=1024 .endif +.if ${OPSYS} == "NetBSD" +TOOLS_PLATFORM.unzip= +.endif + .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" BUILDLINK_DEPMETHOD.cups?= build |