support options jce

4 files changed, 40 insertions, 4 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 749a0923e15..d0aa478e018 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/12/07 22:23:23 abs Exp $
 
 DISTNAME=	openjdk-7-ea-src-b92-06_may_2010
 PKGNAME=	openjdk7-1.7.0.92.20100521
@@ -75,6 +75,8 @@ PLIST_SUBST+=	LOWER_OPSYS=${LOWER_OPSYS}
 .include "bootstrap.mk"
 .include "icedtea-extras.mk"
 
+.include "options.mk"
+
 SUBST_CLASSES+=			add-rpaths
 SUBST_STAGE.add-rpaths=		pre-build
 SUBST_MESSAGE.add-rpaths=	adding X11 run path flags to Makefiles
@@ -94,7 +96,7 @@ SUBST_FILES.fontpaths+=		jdk/src/solaris/native/sun/awt/fontpath.c
 SUBST_SED.fontpaths=		-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.fontpaths+=		-e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
 
-PLIST_VARS+=	i386
+PLIST_VARS+=	i386 jce
 .if ${MACHINE_ARCH} == "i386"
 PLIST.i386=	yes
 .endif
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index ad423f4bda2..7e53a46e592 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/05/22 17:09:55 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/12/07 22:23:23 abs Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -424,6 +424,8 @@ java/openjdk7/jre/lib/psfont.properties.ja
 java/openjdk7/jre/lib/psfontj2d.properties
 java/openjdk7/jre/lib/resources.jar
 java/openjdk7/jre/lib/rt.jar
+${PLIST.jce}java/openjdk7/jre/lib/security/COPYRIGHT.html
+${PLIST.jce}java/openjdk7/jre/lib/security/README.txt
 java/openjdk7/jre/lib/security/US_export_policy.jar
 java/openjdk7/jre/lib/security/cacerts
 java/openjdk7/jre/lib/security/java.policy
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 224d8fb080d..a31888ed7ae 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2010/05/23 13:00:03 tnn Exp $
+$NetBSD: distinfo,v 1.11 2010/12/07 22:23:23 abs Exp $
 
 SHA1 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 280e3a66c737c928facdeeb2533215e084513088
 RMD160 (openjdk7/8dc6e1ff8ccf.tar.bz2) = 50d96c6c81deff07016649498e6efd7f950108cf
@@ -27,6 +27,9 @@ Size (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = 24168404 by
 SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
+SHA1 (openjdk7/jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
+RMD160 (openjdk7/jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
+Size (openjdk7/jce_policy-6.zip) = 9101 bytes
 SHA1 (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = 91b181ffa4b1f4a36500bccce07e4a4569f5340d
 RMD160 (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = fb6c1c1215025bc5157148817acaea647b771771
 Size (openjdk7/jdk-7-bsd-port-92.20100521.diff.bz2) = 561059 bytes
diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk
new file mode 100644
index 00000000000..2357872de6b
--- /dev/null
+++ b/lang/openjdk7/options.mk
@@ -0,0 +1,29 @@
+# $NetBSD: options.mk,v 1.1 2010/12/07 22:23:23 abs Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.openjdk7
+PKG_SUPPORTED_OPTIONS=		sun-jre-jce
+PKG_SUGGESTED_OPTIONS=		#
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Java(TM) Cryptography Extension (JCE)
+###
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
+JCE_DISTFILE=jce_policy-6.zip
+DISTFILES+=	${JCE_DISTFILE}
+EXTRACT_ONLY+=	${JCE_DISTFILE}
+PLIST.jce=	yes
+USE_TOOLS+=	pax
+#
+FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited"
+FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 6 '${JCE_DISTFILE}' from:"
+FETCH_MESSAGE+= "	http://java.sun.com/javase/downloads/"
+FETCH_MESSAGE+= " and place it in:"
+FETCH_MESSAGE+= "       ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}"
+FETCH_MESSAGE+= ""
+FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
+#
+post-install:
+	cd ${WRKDIR}/jce ; pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
+.endif