diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2010-02-02 23:12:53 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2010-02-02 23:12:53 +0000 |
| commit | d9ec4c677e49f1ef45206d6572a6aa26a9148420 (patch) | |
| tree | c1077331b027e54502dd64d6bc3b5d405d473f6c /lang | |
| parent | ef9713a2bd46f86ff537a960c415c1ca4affa382 (diff) | |
| download | pkgsrc-d9ec4c677e49f1ef45206d6572a6aa26a9148420.tar.gz | |
- fix ant master site
- add /usr/pkg/lib/jni and /usr/pkg/lib to java.library.path
- bump pkgrevision
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/openjdk7/Makefile | 6 | ||||
| -rw-r--r-- | lang/openjdk7/icedtea-extras.mk | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 3c62d0eb428..19746961d00 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:11 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/02 23:12:53 jmcneill Exp $ DISTNAME= openjdk-7-ea-src-b78-17_dec_2009 PKGNAME= openjdk7-1.7.0.78.20100102 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 @@ -65,6 +65,8 @@ MAKE_ENV+= SKIP_COMPARE_IMAGES=true MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes MAKE_ENV+= SKIP_DEBUG_BUILD=yes +MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\"" + BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/} PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/} PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS} diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk index 6d9f38b0cd8..4dce92d5a59 100644 --- a/lang/openjdk7/icedtea-extras.mk +++ b/lang/openjdk7/icedtea-extras.mk @@ -1,4 +1,4 @@ -# $NetBSD: icedtea-extras.mk,v 1.5 2010/01/15 19:18:42 tnn Exp $ +# $NetBSD: icedtea-extras.mk,v 1.6 2010/02/02 23:12:53 jmcneill Exp $ # Needed to extract icedtea EXTRACT_USING= bsdtar @@ -26,7 +26,7 @@ EXTRACT_ONLY+= ${RHINO_TGZ} # fixme: Should depend on devel/apache-ant? ANT= apache-ant-1.7.1 ANT_TGZ= ${ANT}-bin.zip -SITES.${ANT_TGZ}= ${MASTER_SITE_APACHE:=ant/binaries/} +SITES.${ANT_TGZ}= http://archive.apache.org/dist/ant/binaries/ DISTFILES+= ${ANT_TGZ} EXTRACT_ONLY+= ${ANT_TGZ} ANT_BIN= ${WRKDIR}/${ANT}/bin |