diff options
| -rw-r--r-- | lang/sun-jdk15/Makefile | 11 | ||||
| -rw-r--r-- | lang/sun-jdk15/distinfo | 8 | ||||
| -rw-r--r-- | lang/sun-jre15/Makefile | 11 | ||||
| -rw-r--r-- | lang/sun-jre15/PLIST | 21 | ||||
| -rw-r--r-- | lang/sun-jre15/distinfo | 8 | ||||
| -rw-r--r-- | lang/sun-jre15/sfiles.mk | 4 |
6 files changed, 37 insertions, 26 deletions
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile index 80ddd697df4..78b8470edf9 100644 --- a/lang/sun-jdk15/Makefile +++ b/lang/sun-jdk15/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.9 2005/08/20 19:16:23 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/10/11 17:56:24 tv Exp $ -DISTNAME= jdk-1_5_0_04-linux-i586 -PKGNAME= sun-jdk15-5.0.4 -PKGREVISION= 1 +DISTNAME= jdk-1_5_0_05-linux-i586 +PKGNAME= sun-jdk15-5.0.5 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.5.0 SHORT= SDK -DEPENDS= sun-jre15-5.0.4*:../../lang/sun-jre15 +DEPENDS= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15 -WRKSRC= ${WRKDIR}/jdk1.5.0_04 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//} JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ javac javadoc javah javap jdb rmic serialver diff --git a/lang/sun-jdk15/distinfo b/lang/sun-jdk15/distinfo index db2f9ebee61..8ef0126a86e 100644 --- a/lang/sun-jdk15/distinfo +++ b/lang/sun-jdk15/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2005/07/21 18:23:16 tv Exp $ +$NetBSD: distinfo,v 1.6 2005/10/11 17:56:24 tv Exp $ -SHA1 (jdk-1_5_0_04-linux-i586.bin) = f10dd88a34a31aa740d8ee316de43e2084ffdffe -RMD160 (jdk-1_5_0_04-linux-i586.bin) = 538faebc14190d84f643a039f51b80ad2543f029 -Size (jdk-1_5_0_04-linux-i586.bin) = 48774165 bytes +SHA1 (jdk-1_5_0_05-linux-i586.bin) = 8774151076374b5e11a558778fbae107ea7bd48c +RMD160 (jdk-1_5_0_05-linux-i586.bin) = 8a0ec52b253cd5f39764ba5fc34d7078fdeddf4a +Size (jdk-1_5_0_05-linux-i586.bin) = 48836045 bytes diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 032294c3321..08039cef89d 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.20 2005/10/03 21:36:58 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/10/11 17:56:24 tv Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce -DISTNAME= jre-1_5_0_04-linux-i586 -PKGNAME= sun-jre15-5.0.4 -PKGREVISION= 1 +DISTNAME= jre-1_5_0_05-linux-i586 +PKGNAME= sun-jre15-5.0.5 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.5.0 SHORT= JRE -WRKSRC= ${WRKDIR}/jre1.5.0_04 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//} USE_PKGINSTALL= yes JAVA_WRAPPERS= java javaws keytool orbd policytool rmid rmiregistry \ servertool tnameserv @@ -54,6 +53,8 @@ do-configure: ${MV} -f $$file $$file.default; \ done @${ECHO} 'CONF_FILES="${CONF_FILES}"' >${HEADER_EXTRA_TMPL} + +pre-install: .if !empty(PKG_OPTIONS:Msun-jre-jce) cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security ${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} diff --git a/lang/sun-jre15/PLIST b/lang/sun-jre15/PLIST index b46085066a9..299e0549f39 100644 --- a/lang/sun-jre15/PLIST +++ b/lang/sun-jre15/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/02/02 13:32:34 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2005/10/11 17:56:25 tv Exp $ bin/sun15-java bin/sun15-javaws bin/sun15-keytool @@ -54,6 +54,8 @@ 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.9.0.bfc.default +java/sun-1.5/lib/fontconfig.RedHat.9.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 @@ -247,6 +249,17 @@ java/sun-1.5/lib/zi/America/Anchorage java/sun-1.5/lib/zi/America/Anguilla java/sun-1.5/lib/zi/America/Antigua java/sun-1.5/lib/zi/America/Araguaina +java/sun-1.5/lib/zi/America/Argentina/Buenos_Aires +java/sun-1.5/lib/zi/America/Argentina/Catamarca +java/sun-1.5/lib/zi/America/Argentina/ComodRivadavia +java/sun-1.5/lib/zi/America/Argentina/Cordoba +java/sun-1.5/lib/zi/America/Argentina/Jujuy +java/sun-1.5/lib/zi/America/Argentina/La_Rioja +java/sun-1.5/lib/zi/America/Argentina/Mendoza +java/sun-1.5/lib/zi/America/Argentina/Rio_Gallegos +java/sun-1.5/lib/zi/America/Argentina/San_Juan +java/sun-1.5/lib/zi/America/Argentina/Tucuman +java/sun-1.5/lib/zi/America/Argentina/Ushuaia java/sun-1.5/lib/zi/America/Aruba java/sun-1.5/lib/zi/America/Asuncion java/sun-1.5/lib/zi/America/Bahia @@ -256,17 +269,14 @@ java/sun-1.5/lib/zi/America/Belize java/sun-1.5/lib/zi/America/Boa_Vista java/sun-1.5/lib/zi/America/Bogota java/sun-1.5/lib/zi/America/Boise -java/sun-1.5/lib/zi/America/Buenos_Aires java/sun-1.5/lib/zi/America/Cambridge_Bay java/sun-1.5/lib/zi/America/Campo_Grande java/sun-1.5/lib/zi/America/Cancun java/sun-1.5/lib/zi/America/Caracas -java/sun-1.5/lib/zi/America/Catamarca java/sun-1.5/lib/zi/America/Cayenne java/sun-1.5/lib/zi/America/Cayman java/sun-1.5/lib/zi/America/Chicago java/sun-1.5/lib/zi/America/Chihuahua -java/sun-1.5/lib/zi/America/Cordoba java/sun-1.5/lib/zi/America/Costa_Rica java/sun-1.5/lib/zi/America/Cuiaba java/sun-1.5/lib/zi/America/Curacao @@ -299,7 +309,6 @@ java/sun-1.5/lib/zi/America/Indianapolis java/sun-1.5/lib/zi/America/Inuvik java/sun-1.5/lib/zi/America/Iqaluit java/sun-1.5/lib/zi/America/Jamaica -java/sun-1.5/lib/zi/America/Jujuy java/sun-1.5/lib/zi/America/Juneau java/sun-1.5/lib/zi/America/Kentucky/Monticello java/sun-1.5/lib/zi/America/La_Paz @@ -311,7 +320,6 @@ java/sun-1.5/lib/zi/America/Managua java/sun-1.5/lib/zi/America/Manaus java/sun-1.5/lib/zi/America/Martinique java/sun-1.5/lib/zi/America/Mazatlan -java/sun-1.5/lib/zi/America/Mendoza java/sun-1.5/lib/zi/America/Menominee java/sun-1.5/lib/zi/America/Merida java/sun-1.5/lib/zi/America/Mexico_City @@ -648,6 +656,7 @@ java/sun-1.5/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so @dirrm java/sun-1.5/lib/zi/America/North_Dakota @dirrm java/sun-1.5/lib/zi/America/Kentucky @dirrm java/sun-1.5/lib/zi/America/Indiana +@dirrm java/sun-1.5/lib/zi/America/Argentina @dirrm java/sun-1.5/lib/zi/America @dirrm java/sun-1.5/lib/zi/Africa @dirrm java/sun-1.5/lib/zi diff --git a/lang/sun-jre15/distinfo b/lang/sun-jre15/distinfo index 07ca8b76a07..2a7b70c3306 100644 --- a/lang/sun-jre15/distinfo +++ b/lang/sun-jre15/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/07/21 18:23:16 tv Exp $ +$NetBSD: distinfo,v 1.7 2005/10/11 17:56:25 tv Exp $ -SHA1 (jre-1_5_0_04-linux-i586.bin) = 66724287dd2645d373cbf438c4ee5e7b98b596f5 -RMD160 (jre-1_5_0_04-linux-i586.bin) = db14e459c4f81ebb489897f30ee2c91dbdc4f0f4 -Size (jre-1_5_0_04-linux-i586.bin) = 16595999 bytes +SHA1 (jre-1_5_0_05-linux-i586.bin) = 494714be78e2eecc93a9f890747ae6d5d8190605 +RMD160 (jre-1_5_0_05-linux-i586.bin) = c0f370f9656ff628a0c73a572bcefe44156ba2d0 +Size (jre-1_5_0_05-linux-i586.bin) = 16635771 bytes SHA1 (jce_policy-1_5_0.zip) = f0e887b91b4499142285633e65c5710c3a133a16 RMD160 (jce_policy-1_5_0.zip) = eb12d0333c3ddbbba57a0e825a6891a75ec485c0 Size (jce_policy-1_5_0.zip) = 8826 bytes diff --git a/lang/sun-jre15/sfiles.mk b/lang/sun-jre15/sfiles.mk index c42480bd9d0..8f789fc7ffc 100644 --- a/lang/sun-jre15/sfiles.mk +++ b/lang/sun-jre15/sfiles.mk @@ -1,4 +1,4 @@ -# $NetBSD: sfiles.mk,v 1.3 2004/10/06 16:44:52 tv Exp $ +# $NetBSD: sfiles.mk,v 1.4 2005/10/11 17:56:25 tv Exp $ # # Created with "make makesfiles" # Do not edit this file manually! @@ -11,6 +11,8 @@ 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.9.0.bfc +SFILES+= fontconfig.RedHat.9.0.properties.src SFILES+= fontconfig.RedHat.bfc SFILES+= fontconfig.RedHat.properties.src SFILES+= fontconfig.SuSE.bfc |