Update jre from 25 to 45, see:

http://www.oracle.com/technetwork/java/javase/7u-relnotes-515228.html

6 files changed, 13 insertions, 33 deletions

diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile
index 89ab77558c4..a5d96e93913 100644
--- a/lang/sun-jre7/Makefile
+++ b/lang/sun-jre7/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.17 2013/07/06 01:13:48 obache Exp $
+# $NetBSD: Makefile,v 1.18 2013/12/31 16:46:56 christos Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 # Note: This needs to be kept in sync with the sun-jdk7 package
 # Note: If you make makesum, make sure that you include both archs in distinfo
 
-DISTNAME=	jre-7u25-${DIST_OS}-${DIST_ARCH}
-PKGNAME=	sun-jre7-7.0.25
+DISTNAME=	jre-7u45-${DIST_OS}-${DIST_ARCH}
+PKGNAME=	sun-jre7-7.0.45
 MASTER_SITES=	# empty
 
 LICENSE=	oracle-binary-code-license
 
-DOWNLOAD_NAME=	Java Runtime Environment (JRE) 7u25
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 7u45
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.7.0_25
+WRKSRC=		${WRKDIR}/jre1.7.0_45
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre7/PLIST.linux-i386 b/lang/sun-jre7/PLIST.linux-i386
index 35e1964f764..b253858ac29 100644
--- a/lang/sun-jre7/PLIST.linux-i386
+++ b/lang/sun-jre7/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.2 2013/07/04 12:25:31 obache Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.3 2013/12/31 16:46:56 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -192,7 +192,6 @@ java/sun-7/lib/i386/libnio.so
 java/sun-7/lib/i386/libnpjp2.so
 java/sun-7/lib/i386/libnpt.so
 java/sun-7/lib/i386/libprism-es2.so
-java/sun-7/lib/i386/librmi.so
 java/sun-7/lib/i386/libsctp.so
 java/sun-7/lib/i386/libsplashscreen.so
 java/sun-7/lib/i386/libsunec.so
@@ -266,7 +265,6 @@ java/sun-7/lib/security/javafx.policy
 java/sun-7/lib/security/javaws.policy
 java/sun-7/lib/security/local_policy.jar
 java/sun-7/lib/security/trusted.libraries
-java/sun-7/lib/servicetag/jdk_header.png
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
diff --git a/lang/sun-jre7/PLIST.linux-x86_64 b/lang/sun-jre7/PLIST.linux-x86_64
index ef408a9c973..80450cafed5 100644
--- a/lang/sun-jre7/PLIST.linux-x86_64
+++ b/lang/sun-jre7/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.2 2013/07/04 12:25:31 obache Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.3 2013/12/31 16:46:56 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -75,7 +75,6 @@ java/sun-7/lib/amd64/libnio.so
 java/sun-7/lib/amd64/libnpjp2.so
 java/sun-7/lib/amd64/libnpt.so
 java/sun-7/lib/amd64/libprism-es2.so
-java/sun-7/lib/amd64/librmi.so
 java/sun-7/lib/amd64/libsctp.so
 java/sun-7/lib/amd64/libsplashscreen.so
 java/sun-7/lib/amd64/libsunec.so
@@ -260,7 +259,6 @@ java/sun-7/lib/security/javafx.policy
 java/sun-7/lib/security/javaws.policy
 java/sun-7/lib/security/local_policy.jar
 java/sun-7/lib/security/trusted.libraries
-java/sun-7/lib/servicetag/jdk_header.png
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
diff --git a/lang/sun-jre7/PLIST.solaris-i386 b/lang/sun-jre7/PLIST.solaris-i386
index 8068c92b599..c9a2559f6dd 100644
--- a/lang/sun-jre7/PLIST.solaris-i386
+++ b/lang/sun-jre7/PLIST.solaris-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-i386,v 1.2 2013/07/04 12:25:31 obache Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.3 2013/12/31 16:46:56 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -176,7 +176,6 @@ java/sun-7/lib/i386/libnet.so
 java/sun-7/lib/i386/libnio.so
 java/sun-7/lib/i386/libnpjp2.so
 java/sun-7/lib/i386/libnpt.so
-java/sun-7/lib/i386/librmi.so
 java/sun-7/lib/i386/libsctp.so
 java/sun-7/lib/i386/libsplashscreen.so
 java/sun-7/lib/i386/libsunec.so
@@ -248,7 +247,6 @@ java/sun-7/lib/security/local_policy.jar
 java/sun-7/lib/security/sunpkcs11-solaris.cfg.default
 java/sun-7/lib/security/trusted.libraries
 java/sun-7/lib/security/ucrypto-solaris.cfg.default
-java/sun-7/lib/servicetag/jdk_header.png
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
diff --git a/lang/sun-jre7/PLIST.solaris-x86_64 b/lang/sun-jre7/PLIST.solaris-x86_64
index cfe2e3480a6..f041d0401cf 100644
--- a/lang/sun-jre7/PLIST.solaris-x86_64
+++ b/lang/sun-jre7/PLIST.solaris-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-x86_64,v 1.2 2013/07/04 12:25:31 obache Exp $
+@comment $NetBSD: PLIST.solaris-x86_64,v 1.3 2013/12/31 16:46:56 christos Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -70,7 +70,6 @@ java/sun-7/lib/amd64/libmlib_image.so
 java/sun-7/lib/amd64/libnet.so
 java/sun-7/lib/amd64/libnio.so
 java/sun-7/lib/amd64/libnpt.so
-java/sun-7/lib/amd64/librmi.so
 java/sun-7/lib/amd64/libsctp.so
 java/sun-7/lib/amd64/libsplashscreen.so
 java/sun-7/lib/amd64/libsunec.so
@@ -302,7 +301,6 @@ java/sun-7/lib/security/local_policy.jar
 java/sun-7/lib/security/sunpkcs11-solaris.cfg.default
 java/sun-7/lib/security/trusted.libraries
 java/sun-7/lib/security/ucrypto-solaris.cfg.default
-java/sun-7/lib/servicetag/jdk_header.png
 java/sun-7/lib/sound.properties.default
 java/sun-7/lib/zi/Africa/Abidjan
 java/sun-7/lib/zi/Africa/Accra
diff --git a/lang/sun-jre7/distinfo b/lang/sun-jre7/distinfo
index 6d9abeda715..b746356e253 100644
--- a/lang/sun-jre7/distinfo
+++ b/lang/sun-jre7/distinfo
@@ -1,17 +1,5 @@
-$NetBSD: distinfo,v 1.12 2013/07/04 12:25:31 obache Exp $
+$NetBSD: distinfo,v 1.13 2013/12/31 16:46:56 christos Exp $
 
-SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
-RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
-Size (UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
-SHA1 (jre-7u25-linux-i586.tar.gz) = a052a45b4ae664906d67ac2693b75d3ff2e4c5ed
-RMD160 (jre-7u25-linux-i586.tar.gz) = c76fc667ef629b3f81163797b045a6df90130d76
-Size (jre-7u25-linux-i586.tar.gz) = 48273509 bytes
-SHA1 (jre-7u25-linux-x64.tar.gz) = fb4c38af805bda3923092b332bdb520d07d94aa5
-RMD160 (jre-7u25-linux-x64.tar.gz) = 2eaaeeb86c29c4fd62feed385affc340820ff2cb
-Size (jre-7u25-linux-x64.tar.gz) = 46962005 bytes
-SHA1 (jre-7u25-solaris-i586.tar.gz) = ba7b5d772cf254a98991b74dbe7fd77693436323
-RMD160 (jre-7u25-solaris-i586.tar.gz) = f870b3e1fc1b5708665430c82ebf729b0ea9fee5
-Size (jre-7u25-solaris-i586.tar.gz) = 47922091 bytes
-SHA1 (jre-7u25-solaris-x64.tar.gz) = a77a45c990b4d215e625edecc991e7a07c1bac15
-RMD160 (jre-7u25-solaris-x64.tar.gz) = 1d419480ad48f99caabd372fda2f32e9c336dcf0
-Size (jre-7u25-solaris-x64.tar.gz) = 15654306 bytes
+SHA1 (jre-7u45-linux-x64.tar.gz) = 729cbee2591a5b429f4fa9272db6e988371b7923
+RMD160 (jre-7u45-linux-x64.tar.gz) = 117ba716c76d2afba47e7adf1c834b7e4a9edc91
+Size (jre-7u45-linux-x64.tar.gz) = 46842143 bytes