summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/openjdk7/Makefile7
-rw-r--r--lang/openjdk7/PLIST3
-rw-r--r--lang/openjdk7/icedtea-extras.mk4
3 files changed, 9 insertions, 5 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 0340e1f1445..f8e971b789f 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/11/08 17:57:46 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2009/12/15 15:16:15 tnn Exp $
DISTNAME= openjdk-7-ea-src-b75-30_oct_2009
PKGNAME= openjdk7-1.7.0.75.20091106
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.bz2
@@ -140,6 +140,9 @@ do-install:
${DESTDIR}${JAVA_HOME}/.
${INSTALL_DATA} ${WRKDIR}/cacerts.out \
${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
+ rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h
+ ln -s ${LOWER_OPSYS}/jni_md.h \
+ ${DESTDIR}${JAVA_HOME}/include/jni_md.h
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index b88ec676834..0a8c47d7893 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/11/07 14:48:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/12/15 15:16:15 tnn Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -315,6 +315,7 @@ java/openjdk7/include/classfile_constants.h
java/openjdk7/include/jawt.h
java/openjdk7/include/jdwpTransport.h
java/openjdk7/include/jni.h
+java/openjdk7/include/jni_md.h
java/openjdk7/include/jvmti.h
java/openjdk7/include/${LOWER_OPSYS}/jawt_md.h
java/openjdk7/include/${LOWER_OPSYS}/jni_md.h
diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk
index fb10d026d35..7d46c0fc9bc 100644
--- a/lang/openjdk7/icedtea-extras.mk
+++ b/lang/openjdk7/icedtea-extras.mk
@@ -1,7 +1,7 @@
-# $NetBSD: icedtea-extras.mk,v 1.3 2009/11/07 14:48:49 tnn Exp $
+# $NetBSD: icedtea-extras.mk,v 1.4 2009/12/15 15:16:15 tnn Exp $
# Needed to extract icedtea
-EXTRACT_USING= gtar
+EXTRACT_USING= bsdtar
DIST_SUBDIR= openjdk7