diff options
-rw-r--r-- | lang/sun-jre15/Makefile | 33 | ||||
-rw-r--r-- | lang/sun-jre15/PLIST | 50 | ||||
-rw-r--r-- | lang/sun-jre15/distinfo | 4 | ||||
-rw-r--r-- | lang/sun-jre15/sfiles.mk | 22 |
4 files changed, 73 insertions, 36 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 7e196a465f8..d4e787ba3b7 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2004/10/06 01:42:34 tv Exp $ +# $NetBSD: Makefile,v 1.5 2004/10/06 16:44:52 tv Exp $ + +# Note: Regen distinfo with SUN_JRE15_USE_JCE=YES DISTNAME= jre-1_5_0-linux-i586 PKGNAME= sun-jre15-5.0 @@ -24,26 +26,31 @@ SUPPORT_FILES= # empty .for FILE in ${SFILES} SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} .endfor +HEADER_EXTRA_TMPL=${WRKDIR}/HEADER.tmpl .include "../../mk/bsd.prefs.mk" -#BUILD_DEFS+= SUN_JRE15_USE_JCE # does not exist (yet?) -#PLIST_SRC= ${WRKDIR}/PLIST +BUILD_DEFS+= SUN_JRE15_USE_JCE +PLIST_SRC= ${WRKDIR}/PLIST -#.if !empty(SUN_JRE15_USE_JCE:M[Yy][Ee][Ss]) -#DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip -#.endif +.if !empty(SUN_JRE15_USE_JCE:M[Yy][Ee][Ss]) +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip +.endif do-configure: cd ${WRKSRC}/lib; for file in ${SFILES}; do \ ${MV} -f $$file $$file.default; \ done -#.if !empty(SUN_JRE15_USE_JCE:M[Yy][Ee][Ss]) -# cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security -# ${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} -#.else -# ${SED} '/@SUN_JRE15_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC} -#.endif + @${ECHO} 'SUPPORT_FILES="${SUPPORT_FILES}"' >${HEADER_EXTRA_TMPL} +.if !empty(SUN_JRE15_USE_JCE:M[Yy][Ee][Ss]) + cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security + ${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} +.else + ${SED} '/@SUN_JRE15_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC} +.endif + +post-build: + # # re-create sfiles.mk from properties and config files @@ -54,7 +61,7 @@ makesfiles: ${ECHO} >> sfiles.mk '# Created with "make makesfiles"' ${ECHO} >> sfiles.mk '# Do not edit this file manually!' ${ECHO} >> sfiles.mk '#' - cd ${WRKSRC}/lib && ${FIND} * \ + cd ${WRKSRC}/lib && ${FIND} * -name fontconfig.\* -o \ -name \*.properties -o -name \*.properties.\?\? -o \ -name \*.cfg -o -name \*.security | \ ${SED} 's/^/SFILES+= /' >>../../../sfiles.mk diff --git a/lang/sun-jre15/PLIST b/lang/sun-jre15/PLIST index b1b66e2bb71..823d027796c 100644 --- a/lang/sun-jre15/PLIST +++ b/lang/sun-jre15/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2004/10/06 01:42:35 tv Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/10/06 16:44:52 tv Exp $ bin/sun15-java bin/sun15-javaws bin/sun15-keytool @@ -8,6 +8,7 @@ bin/sun15-rmid bin/sun15-rmiregistry bin/sun15-servertool bin/sun15-tnameserv +java/sun-1.5/.pkgsrc java/sun-1.5/.systemPrefs/.system.lock java/sun-1.5/.systemPrefs/.systemRootModFile java/sun-1.5/CHANGES @@ -33,6 +34,8 @@ java/sun-1.5/bin/servertool java/sun-1.5/bin/tnameserv java/sun-1.5/bin/unpack200 java/sun-1.5/javaws/javaws +java/sun-1.5/lib/.pkgsrc +java/sun-1.5/lib/applet/.pkgsrc java/sun-1.5/lib/audio/soundbank.gm java/sun-1.5/lib/charsets.jar java/sun-1.5/lib/classlist @@ -48,26 +51,26 @@ java/sun-1.5/lib/ext/localedata.jar java/sun-1.5/lib/ext/sunjce_provider.jar java/sun-1.5/lib/ext/sunpkcs11.jar java/sun-1.5/lib/flavormap.properties.default -java/sun-1.5/lib/fontconfig.RedHat.2.1.bfc -java/sun-1.5/lib/fontconfig.RedHat.2.1.properties.src -java/sun-1.5/lib/fontconfig.RedHat.3.bfc -java/sun-1.5/lib/fontconfig.RedHat.3.properties.src -java/sun-1.5/lib/fontconfig.RedHat.8.0.bfc -java/sun-1.5/lib/fontconfig.RedHat.8.0.properties.src -java/sun-1.5/lib/fontconfig.RedHat.bfc -java/sun-1.5/lib/fontconfig.RedHat.properties.src -java/sun-1.5/lib/fontconfig.SuSE.bfc -java/sun-1.5/lib/fontconfig.SuSE.properties.src -java/sun-1.5/lib/fontconfig.Sun.2003.bfc -java/sun-1.5/lib/fontconfig.Sun.2003.properties.src -java/sun-1.5/lib/fontconfig.Sun.bfc -java/sun-1.5/lib/fontconfig.Sun.properties.src -java/sun-1.5/lib/fontconfig.Turbo.8.0.bfc -java/sun-1.5/lib/fontconfig.Turbo.8.0.properties.src -java/sun-1.5/lib/fontconfig.Turbo.bfc -java/sun-1.5/lib/fontconfig.Turbo.properties.src -java/sun-1.5/lib/fontconfig.bfc -java/sun-1.5/lib/fontconfig.properties.src +java/sun-1.5/lib/fontconfig.RedHat.2.1.bfc.default +java/sun-1.5/lib/fontconfig.RedHat.2.1.properties.src.default +java/sun-1.5/lib/fontconfig.RedHat.3.bfc.default +java/sun-1.5/lib/fontconfig.RedHat.3.properties.src.default +java/sun-1.5/lib/fontconfig.RedHat.8.0.bfc.default +java/sun-1.5/lib/fontconfig.RedHat.8.0.properties.src.default +java/sun-1.5/lib/fontconfig.RedHat.bfc.default +java/sun-1.5/lib/fontconfig.RedHat.properties.src.default +java/sun-1.5/lib/fontconfig.SuSE.bfc.default +java/sun-1.5/lib/fontconfig.SuSE.properties.src.default +java/sun-1.5/lib/fontconfig.Sun.2003.bfc.default +java/sun-1.5/lib/fontconfig.Sun.2003.properties.src.default +java/sun-1.5/lib/fontconfig.Sun.bfc.default +java/sun-1.5/lib/fontconfig.Sun.properties.src.default +java/sun-1.5/lib/fontconfig.Turbo.8.0.bfc.default +java/sun-1.5/lib/fontconfig.Turbo.8.0.properties.src.default +java/sun-1.5/lib/fontconfig.Turbo.bfc.default +java/sun-1.5/lib/fontconfig.Turbo.properties.src.default +java/sun-1.5/lib/fontconfig.bfc.default +java/sun-1.5/lib/fontconfig.properties.src.default java/sun-1.5/lib/fonts/LucidaBrightDemiBold.ttf java/sun-1.5/lib/fonts/LucidaBrightDemiItalic.ttf java/sun-1.5/lib/fonts/LucidaBrightItalic.ttf @@ -124,6 +127,8 @@ java/sun-1.5/lib/${MACHINE_ARCH}/server/libjvm.so java/sun-1.5/lib/${MACHINE_ARCH}/xawt/libmawt.so java/sun-1.5/lib/im/indicim.jar java/sun-1.5/lib/im/thaiim.jar +java/sun-1.5/lib/images/.pkgsrc +java/sun-1.5/lib/images/cursors/.pkgsrc java/sun-1.5/lib/images/cursors/cursors.properties.default java/sun-1.5/lib/images/cursors/invalid32x32.gif java/sun-1.5/lib/images/cursors/motif_CopyDrop32x32.gif @@ -181,6 +186,9 @@ java/sun-1.5/lib/plugin.jar java/sun-1.5/lib/psfont.properties.ja.default java/sun-1.5/lib/psfontj2d.properties.default java/sun-1.5/lib/rt.jar +java/sun-1.5/lib/security/.pkgsrc +@SUN_JRE15_USE_JCE@java/sun-1.5/lib/security/COPYRIGHT.html +@SUN_JRE15_USE_JCE@java/sun-1.5/lib/security/README.txt java/sun-1.5/lib/security/US_export_policy.jar java/sun-1.5/lib/security/cacerts java/sun-1.5/lib/security/java.policy diff --git a/lang/sun-jre15/distinfo b/lang/sun-jre15/distinfo index 53738175e51..eea8b55c14a 100644 --- a/lang/sun-jre15/distinfo +++ b/lang/sun-jre15/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/09/30 22:11:52 rh Exp $ +$NetBSD: distinfo,v 1.2 2004/10/06 16:44:52 tv Exp $ SHA1 (jre-1_5_0-linux-i586.bin) = 2c6eeaef513581f1ed77b48a0d861068f03b5e47 Size (jre-1_5_0-linux-i586.bin) = 16511293 bytes +SHA1 (jce_policy-1_5_0.zip) = f0e887b91b4499142285633e65c5710c3a133a16 +Size (jce_policy-1_5_0.zip) = 8826 bytes diff --git a/lang/sun-jre15/sfiles.mk b/lang/sun-jre15/sfiles.mk index cc7b3cd39b0..c42480bd9d0 100644 --- a/lang/sun-jre15/sfiles.mk +++ b/lang/sun-jre15/sfiles.mk @@ -1,10 +1,30 @@ -# $NetBSD: sfiles.mk,v 1.2 2004/10/06 01:42:35 tv Exp $ +# $NetBSD: sfiles.mk,v 1.3 2004/10/06 16:44:52 tv Exp $ # # Created with "make makesfiles" # Do not edit this file manually! # SFILES+= content-types.properties SFILES+= flavormap.properties +SFILES+= fontconfig.RedHat.2.1.bfc +SFILES+= fontconfig.RedHat.2.1.properties.src +SFILES+= fontconfig.RedHat.3.bfc +SFILES+= fontconfig.RedHat.3.properties.src +SFILES+= fontconfig.RedHat.8.0.bfc +SFILES+= fontconfig.RedHat.8.0.properties.src +SFILES+= fontconfig.RedHat.bfc +SFILES+= fontconfig.RedHat.properties.src +SFILES+= fontconfig.SuSE.bfc +SFILES+= fontconfig.SuSE.properties.src +SFILES+= fontconfig.Sun.2003.bfc +SFILES+= fontconfig.Sun.2003.properties.src +SFILES+= fontconfig.Sun.bfc +SFILES+= fontconfig.Sun.properties.src +SFILES+= fontconfig.Turbo.8.0.bfc +SFILES+= fontconfig.Turbo.8.0.properties.src +SFILES+= fontconfig.Turbo.bfc +SFILES+= fontconfig.Turbo.properties.src +SFILES+= fontconfig.bfc +SFILES+= fontconfig.properties.src SFILES+= i386/jvm.cfg SFILES+= images/cursors/cursors.properties SFILES+= javaws/messages.properties |