Add SUN_JRE14_USE_JCE which pulls in Sun's Unlimited Strength

Java Cryptography Extension. Implemented as a variable rather than
as an additional package as it needs to replace JRE jar files.

5 files changed, 32 insertions, 7 deletions

diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 764e367db93..0bfed793a7f 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2004/07/02 14:40:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.19 2004/07/06 11:32:49 abs Exp $
+
+# Note: Regen distinfo with SUN_JRE14_USE_JCE=YES
 
 DISTNAME=	j2re-1_4_2_05-linux-i586
 PKGNAME=	sun-jre14-2.5
@@ -30,9 +32,24 @@ SUPPORT_FILES=	# empty
 SUPPORT_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=		SUN_JRE14_USE_JCE
+PLIST_SRC=      	${WRKDIR}/PLIST
+
+.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
+.endif
+
 do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
+.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+	cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
+	${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
+.else
+	${SED} '/@SUN_JRE14_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
+.endif
 
 .include "../../lang/sun-jre14/Makefile.common"
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 6418dc93aae..80276d3afa2 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2004/07/02 14:40:21 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/07/06 11:32:49 abs Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -8,8 +8,6 @@ HOMEPAGE=	http://java.sun.com/
 DOWNLOAD=	http://java.sun.com/j2se/1.4.2/download.html
 ARCHIVE=	http://java.sun.com/products/archive/index.html
 
-EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
-
 LICENSE=	jdk13-license
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
 NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index 70ae217572f..59fa0cffa35 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/07/02 14:40:21 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/07/06 11:32:49 abs Exp $
 bin/sun14-java
 java/sun-1.4/.systemPrefs/.system.lock
 java/sun-1.4/.systemPrefs/.systemRootModFile
@@ -176,6 +176,8 @@ java/sun-1.4/lib/plugin.jar
 java/sun-1.4/lib/psfont.properties.ja.default
 java/sun-1.4/lib/psfontj2d.properties.default
 java/sun-1.4/lib/rt.jar
+@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/COPYRIGHT.html
+@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/README.txt
 java/sun-1.4/lib/security/US_export_policy.jar
 java/sun-1.4/lib/security/cacerts
 java/sun-1.4/lib/security/java.policy
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index f78a66ae80e..74d45aa0f57 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.11 2004/07/02 14:40:21 jschauma Exp $
+$NetBSD: distinfo,v 1.12 2004/07/06 11:32:49 abs Exp $
 
 SHA1 (j2re-1_4_2_05-linux-i586.bin) = 326a50523fbedb449596f2c502c2572d9b88114c
 Size (j2re-1_4_2_05-linux-i586.bin) = 14381383 bytes
+SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee
+Size (jce_policy-1_4_2.zip) = 12195 bytes
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index baafbd65256..f3378ebee32 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.254 2004/06/26 06:03:41 grant Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.255 2004/07/06 11:32:49 abs Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1910,6 +1910,12 @@ SILC_CLIENT_WITH_PERL?=	YES
 #          --enable-ipf-transparent
 #          --enable-snmp
 
+SUN_JRE14_USE_JCE?= NO
+# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength
+# Jurisdiction Policy Files in the sun-jre14 package
+# Possible: YES or NO.
+# Default: NO
+
 SSH_RSHPATH?= ${RSH}
 # Used in ssh to specify standard rsh path
 # Possible: path to rsh binary