On Tue, 2014-04-29 at 06:13 -0400, Kurt Miller wrote:
> On Tue, 2014-04-29 at 05:10 -0400, Kurt Miller wrote:
> > Security update to u55. Remove patches included in upstream repository.
> > Update cacerts.
> >
> > Tested on amd64 with native_bootstrap and building all ports that
> > require jdk/1.7 to build.
>
> Sorry, evolution word-wrapped the diff. Again as attachment.
Updated diff. This adds a makefile target called build-bootjdk that
we will need when we ditch jdk/1.6. It also includes an additional
patch that is needed when we start using the bootjdk instead of
jdk/1.6 to build.
Thanks,
-Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 25 Nov 2013 14:16:22 -0000 1.67
+++ Makefile 29 Apr 2014 12:13:31 -0000
@@ -5,17 +5,16 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT-main= Java2(TM) SE Dev Kit v${V}
COMMENT-jre= Java2(TM) SE Runtime Environment v${V}
-U= 21
+U= 55
V= 1.7.0.${U}
-B= b11
+B= b13
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
-REVISION= 2
EPOCH= 0
-JDK_SRC= openjdk-7u6-fcs-src-b24-28_aug_2012.zip
-PATCH_SET= openjdk-7u${U}-patch-set-20130506.zip
+JDK_SRC= openjdk-7u40-fcs-src-b43-26_aug_2013.zip
+PATCH_SET= openjdk-7u${U}-patch-set-20140428.zip
DISTFILES= ${JDK_SRC} ${PATCH_SET}:1
EXTRACT_ONLY= ${JDK_SRC} ${PATCH_SET}
@@ -31,7 +30,7 @@ FLAVOR?=
HOMEPAGE= http://openjdk.java.net/
-MASTER_SITES= http://www.java.net/download/openjdk/jdk7u6/promoted/${B}/ \
+MASTER_SITES= http://download.java.net/openjdk/jdk7u40/promoted/b43/ \
http://openbsd.dead-parrot.de/distfiles/ \
http://distfiles.nl/
MASTER_SITES1= http://www.intricatesoftware.com/distfiles/ \
@@ -143,3 +142,22 @@ do-install:
cd ${JREIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JREHOME} -xf -
.include <bsd.port.mk>
+
+# The bootjdk is the jdk image with some parts deleted
+# and a copy of the system shared libs needed to run it.
+# The parts deleted are not needed for bootstrap and would
+# require more system shared libs to be saved.
+build-bootjdk: ${_BUILD_COOKIE}
+ @rm -rf ${WRKDIR}/tmp
+ @mkdir -p ${WRKDIR}/tmp/bootjdk
+ @mkdir -p ${WRKDIR}/tmp/bootjdk-libs
+ @cd ${JDKIMAGEDIR} && tar -cf - * | tar -C ${WRKDIR}/tmp/bootjdk -xf -
+ @cd ${WRKDIR}/tmp/bootjdk && rm -rf demo sample
+ @cd ${WRKDIR}/tmp/bootjdk && rm bin/appletviewer bin/policytool jre/bin/policytool
+ @cd ${WRKDIR}/tmp/bootjdk/jre/lib/${ARCH} && rm libnpt.so libinstrument.so libsplashscreen.so libjsound.so xawt/libmawt.so
+ @LD_LIBRARY_PATH="${WRKDIR}/tmp/bootjdk/jre/lib/${ARCH}:${WRKDIR}/tmp/bootjdk/jre/lib/${ARCH}/server" \
+ find ${WRKDIR}/tmp/bootjdk -type f -perm -500 -exec ldd {} \; 2>/dev/null | \
+ grep rlib | cut -d"/" -f 2-20 | sort -u | grep -v "\.so$$" | \
+ xargs -I % cp /% ${WRKDIR}/tmp/bootjdk-libs
+ @cd ${WRKDIR}/tmp && tar czf openjdk7-bootjdk-${ARCH}-$$(date +%Y%m%d).tar.gz bootjdk*
+ @echo "New bootjdk is located at ${WRKDIR}/tmp/openjdk7-bootjdk-${ARCH}-$$(date +%Y%m%d).tar.gz"
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 1 Jun 2013 21:12:15 -0000 1.17
+++ distinfo 29 Apr 2014 12:13:31 -0000
@@ -1,4 +1,4 @@
-SHA256 (jdk/openjdk-7u21-patch-set-20130506.zip) = HqckEUjkKJhou48lEboky5WDJLJkd2ZkScT2qkPrIUM=
-SHA256 (jdk/openjdk-7u6-fcs-src-b24-28_aug_2012.zip) = qbsNejvr3IJW/G97Ye2Ep5wU/P/NV3YXgBhDoB7CMfQ=
-SIZE (jdk/openjdk-7u21-patch-set-20130506.zip) = 1088680
-SIZE (jdk/openjdk-7u6-fcs-src-b24-28_aug_2012.zip) = 103777502
+SHA256 (jdk/openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = APjqVhh2y8rRdLo8p6muELUN9Gp4KsZMKsV6w1e1BZY=
+SHA256 (jdk/openjdk-7u55-patch-set-20140428.zip) = Z8jP0jO85C/EQZvA8Bf0YZy+FNNgzulMgbciw43nHSk=
+SIZE (jdk/openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
+SIZE (jdk/openjdk-7u55-patch-set-20140428.zip) = 999744
Index: files/cacerts
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/files/cacerts,v
retrieving revision 1.2
diff -u -p -r1.2 cacerts
Binary files /tmp/cvs24778c and cacerts differ
Index: patches/patch-hotspot_make_bsd_makefiles_gcc_make
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_gcc_make,v
retrieving revision 1.6
diff -u -p -r1.6 patch-hotspot_make_bsd_makefiles_gcc_make
--- patches/patch-hotspot_make_bsd_makefiles_gcc_make 14 Jan 2013 20:16:56 -0000 1.6
+++ patches/patch-hotspot_make_bsd_makefiles_gcc_make 29 Apr 2014 12:13:32 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.6 2013/01/14 20:16:56 kurt Exp $
---- hotspot/make/bsd/makefiles/gcc.make.orig Wed Jan 9 18:58:26 2013
-+++ hotspot/make/bsd/makefiles/gcc.make Wed Jan 9 18:59:05 2013
-@@ -300,7 +300,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- endif
-
- OPT_CFLAGS/ia64 = -g
-- OPT_CFLAGS/amd64 = -g
-+ OPT_CFLAGS/amd64 = -gstabs
- OPT_CFLAGS/arm = -g
- OPT_CFLAGS/ppc = -g
- OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
+$OpenBSD$
+--- hotspot/make/bsd/makefiles/gcc.make.orig Tue Apr 29 07:09:53 2014
++++ hotspot/make/bsd/makefiles/gcc.make Tue Apr 29 07:09:58 2014
+@@ -289,7 +289,7 @@ endif
+ # (warning: that could easily inflate libjvm_g.so to 150M!)
+ # Note: The Itanium gcc compiler crashes when using -gstabs.
+ DEBUG_CFLAGS/ia64 = -g
+-DEBUG_CFLAGS/amd64 = -g
++DEBUG_CFLAGS/amd64 = -gstabs
+ DEBUG_CFLAGS/arm = -g
+ DEBUG_CFLAGS/ppc = -g
+ DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
Index: patches/patch-hotspot_src_share_vm_runtime_os_cpp
===================================================================
RCS file: patches/patch-hotspot_src_share_vm_runtime_os_cpp
diff -N patches/patch-hotspot_src_share_vm_runtime_os_cpp
--- patches/patch-hotspot_src_share_vm_runtime_os_cpp 10 Apr 2013 02:49:05 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.7 2013/04/10 02:49:05 kurt Exp $
---- hotspot/src/share/vm/runtime/os.cpp.orig Tue Apr 9 20:35:59 2013
-+++ hotspot/src/share/vm/runtime/os.cpp Tue Apr 9 20:36:23 2013
-@@ -398,13 +398,6 @@ void* os::native_java_library() {
- if (_native_java_library == NULL) {
- vm_exit_during_initialization("Unable to load native library", ebuf);
- }
--
--#if defined(__OpenBSD__)
-- // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so
-- // ignore errors
-- dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net");
-- dll_load(buffer, ebuf, sizeof(ebuf));
--#endif
- }
- static jboolean onLoaded = JNI_FALSE;
- if (onLoaded) {
Index: patches/patch-jdk_make_common_shared_Sanity_gmk
===================================================================
RCS file: patches/patch-jdk_make_common_shared_Sanity_gmk
diff -N patches/patch-jdk_make_common_shared_Sanity_gmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-jdk_make_common_shared_Sanity_gmk 29 Apr 2014 12:13:32 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- jdk/make/common/shared/Sanity.gmk.orig Fri Sep 6 14:27:37 2013
++++ jdk/make/common/shared/Sanity.gmk Tue Apr 29 07:09:58 2014
+@@ -521,7 +521,7 @@ sane-variant:
+ # LD_LIBRARY_PATH should not be set, unless you are insane.
+ ######################################################
+ sane-ld_library_path:
+-ifdef LD_LIBRARY_PATH
++ifdef LD_LIBRARY_PATH_DISABLED
+ @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set. This may \n" \
+ " produce binaries binaries incorrectly. Please unset it \n" \
+ " and start your build again. \n" \
+@@ -1255,7 +1255,7 @@ sane-ant_version:
+ -a "$(ANT_CHECK)" != "newer" ]; then \
+ $(ECHO) "ERROR: The version of ant being used is older than \n" \
+ " the required version of '$(REQUIRED_ANT_VER)'. \n" \
+- " The version of ant found was '$(ANT_VER)'. \n" \
++ " The version of ant found was '$(ANT_VER)' '$(_ANT_VER)'. \n" \
+ "" >> $(ERROR_FILE) ; \
+ fi
+
Index: patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java
===================================================================
RCS file: patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java
diff -N patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java
--- patches/patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java 14 Jan 2013 20:16:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-jdk_src_share_classes_sun_net_spi_DefaultProxySelector_java,v 1.2 2013/01/14 20:16:56 kurt Exp $
-
-Crash due to missing synchronization on gconf_client.
-Upstream CR 7188755.
-
---- jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java.orig Tue Aug 28 19:14:39 2012
-+++ jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java Wed Jan 9 18:59:05 2013
-@@ -345,6 +345,6 @@ public class DefaultProxySelector extends ProxySelecto
- }
- }
-
-- private native static boolean init();
-- private native Proxy getSystemProxy(String protocol, String host);
-+ private synchronized native static boolean init();
-+ private synchronized native Proxy getSystemProxy(String protocol, String host);
- }
Index: patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider_java
===================================================================
RCS file: patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider_java
diff -N patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider_java
--- patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider_java 13 Mar 2014 13:47:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider_java,v 1.2 2014/03/13 13:47:10 dcoppa Exp $
-
-Fix DefaultAsynchronousChannelProvider.create so it does not crash
-("java.lang.InternalError: platform not recognized"), but instead
-creates an instance of BsdAsynchronousChannelProvider()
-
---- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig Wed Aug 29 01:15:24 2012
-+++ jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Wed Oct 30 14:26:01 2013
-@@ -50,7 +50,7 @@ public class DefaultAsynchronousChannelProvider {
- return new SolarisAsynchronousChannelProvider();
- if (osname.equals("Linux"))
- return new LinuxAsynchronousChannelProvider();
-- if (osname.contains("OS X"))
-+ if (osname.contains("OS X") || osname.equals("OpenBSD"))
- return new BsdAsynchronousChannelProvider();
- throw new InternalError("platform not recognized");
- }
Index: patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
===================================================================
RCS file: patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
diff -N patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
--- patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c 16 Oct 2013 15:36:49 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface_c,v 1.6 2013/10/16 15:36:49 bluhm Exp $
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig Sat Sep 7 17:12:52 2013
-+++ jdk/src/solaris/native/java/net/NetworkInterface.c Sat Sep 7 18:53:36 2013
-@@ -65,6 +65,7 @@
- #include <net/if_var.h>
- #elif defined(__OpenBSD__)
- #include <netinet/if_ether.h>
-+#include <netinet6/in6_var.h>
- #elif defined(__NetBSD__)
- #include <net/if_ether.h>
- #endif
Index: pkg/PLIST-jre
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/pkg/PLIST-jre,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-jre
--- pkg/PLIST-jre 14 Jan 2013 20:16:56 -0000 1.11
+++ pkg/PLIST-jre 29 Apr 2014 12:13:32 -0000
@@ -17,33 +17,11 @@ ${JREHOME}/bin/
@bin ${JREHOME}/bin/tnameserv
@bin ${JREHOME}/bin/unpack200
${JREHOME}/lib/
-${JREHOME}/lib/applet/
-${JREHOME}/lib/calendars.properties
-${JREHOME}/lib/charsets.jar
-${JREHOME}/lib/classlist
-${JREHOME}/lib/cmm/
-${JREHOME}/lib/cmm/CIEXYZ.pf
-${JREHOME}/lib/cmm/GRAY.pf
-${JREHOME}/lib/cmm/LINEAR_RGB.pf
-${JREHOME}/lib/cmm/PYCC.pf
-${JREHOME}/lib/cmm/sRGB.pf
-${JREHOME}/lib/content-types.properties
-${JREHOME}/lib/currency.data
-${JREHOME}/lib/ext/
-${JREHOME}/lib/ext/dnsns.jar
-${JREHOME}/lib/ext/localedata.jar
-${JREHOME}/lib/ext/meta-index
-${JREHOME}/lib/ext/sunec.jar
-${JREHOME}/lib/ext/sunjce_provider.jar
-${JREHOME}/lib/ext/sunpkcs11.jar
-${JREHOME}/lib/ext/zipfs.jar
-${JREHOME}/lib/flavormap.properties
-${JREHOME}/lib/fontconfig.bfc
-${JREHOME}/lib/fontconfig.properties.src
${JREHOME}/lib/${MACHINE_ARCH}/
${JREHOME}/lib/${MACHINE_ARCH}/headless/
${JREHOME}/lib/${MACHINE_ARCH}/headless/libmawt.so
@bin ${JREHOME}/lib/${MACHINE_ARCH}/jexec
+@bin ${JREHOME}/lib/${MACHINE_ARCH}/jspawnhelper
${JREHOME}/lib/${MACHINE_ARCH}/jli/
${JREHOME}/lib/${MACHINE_ARCH}/jli/libjli.so
${JREHOME}/lib/${MACHINE_ARCH}/jvm.cfg
@@ -68,7 +46,6 @@ ${JREHOME}/lib/${MACHINE_ARCH}/libjdwp.s
${JREHOME}/lib/${MACHINE_ARCH}/libjpeg.so
${JREHOME}/lib/${MACHINE_ARCH}/libjsdt.diz
${JREHOME}/lib/${MACHINE_ARCH}/libjsdt.so
-${JREHOME}/lib/${MACHINE_ARCH}/libjsig.diz
${JREHOME}/lib/${MACHINE_ARCH}/libjsig.so
${JREHOME}/lib/${MACHINE_ARCH}/libjsound.so
${JREHOME}/lib/${MACHINE_ARCH}/liblcms.so
@@ -79,8 +56,6 @@ ${JREHOME}/lib/${MACHINE_ARCH}/libnet.so
${JREHOME}/lib/${MACHINE_ARCH}/libnio.so
${JREHOME}/lib/${MACHINE_ARCH}/libnpt.diz
${JREHOME}/lib/${MACHINE_ARCH}/libnpt.so
-${JREHOME}/lib/${MACHINE_ARCH}/librmi.so
-${JREHOME}/lib/${MACHINE_ARCH}/libsaproc.diz
${JREHOME}/lib/${MACHINE_ARCH}/libsplashscreen.so
${JREHOME}/lib/${MACHINE_ARCH}/libsunec.so
${JREHOME}/lib/${MACHINE_ARCH}/libunpack.so
@@ -89,12 +64,33 @@ ${JREHOME}/lib/${MACHINE_ARCH}/libverify
${JREHOME}/lib/${MACHINE_ARCH}/libzip.so
${JREHOME}/lib/${MACHINE_ARCH}/server/
${JREHOME}/lib/${MACHINE_ARCH}/server/Xusage.txt
-${JREHOME}/lib/${MACHINE_ARCH}/server/libjsig.diz
${JREHOME}/lib/${MACHINE_ARCH}/server/libjsig.so
-${JREHOME}/lib/${MACHINE_ARCH}/server/libjvm.diz
${JREHOME}/lib/${MACHINE_ARCH}/server/libjvm.so
${JREHOME}/lib/${MACHINE_ARCH}/xawt/
${JREHOME}/lib/${MACHINE_ARCH}/xawt/libmawt.so
+${JREHOME}/lib/applet/
+${JREHOME}/lib/calendars.properties
+${JREHOME}/lib/charsets.jar
+${JREHOME}/lib/classlist
+${JREHOME}/lib/cmm/
+${JREHOME}/lib/cmm/CIEXYZ.pf
+${JREHOME}/lib/cmm/GRAY.pf
+${JREHOME}/lib/cmm/LINEAR_RGB.pf
+${JREHOME}/lib/cmm/PYCC.pf
+${JREHOME}/lib/cmm/sRGB.pf
+${JREHOME}/lib/content-types.properties
+${JREHOME}/lib/currency.data
+${JREHOME}/lib/ext/
+${JREHOME}/lib/ext/dnsns.jar
+${JREHOME}/lib/ext/localedata.jar
+${JREHOME}/lib/ext/meta-index
+${JREHOME}/lib/ext/sunec.jar
+${JREHOME}/lib/ext/sunjce_provider.jar
+${JREHOME}/lib/ext/sunpkcs11.jar
+${JREHOME}/lib/ext/zipfs.jar
+${JREHOME}/lib/flavormap.properties
+${JREHOME}/lib/fontconfig.bfc
+${JREHOME}/lib/fontconfig.properties.src
${JREHOME}/lib/images/
${JREHOME}/lib/images/cursors/
${JREHOME}/lib/images/cursors/cursors.properties
@@ -127,8 +123,6 @@ ${JREHOME}/lib/security/cacerts
${JREHOME}/lib/security/java.policy
${JREHOME}/lib/security/java.security
${JREHOME}/lib/security/local_policy.jar
-${JREHOME}/lib/servicetag/
-${JREHOME}/lib/servicetag/jdk_header.png
${JREHOME}/lib/sound.properties
${JREHOME}/lib/zi/
${JREHOME}/lib/zi/Africa/
@@ -157,7 +151,6 @@ ${JREHOME}/lib/zi/Africa/Freetown
${JREHOME}/lib/zi/Africa/Gaborone
${JREHOME}/lib/zi/Africa/Harare
${JREHOME}/lib/zi/Africa/Johannesburg
-${JREHOME}/lib/zi/Africa/Juba
${JREHOME}/lib/zi/Africa/Kampala
${JREHOME}/lib/zi/Africa/Khartoum
${JREHOME}/lib/zi/Africa/Kigali
@@ -187,7 +180,6 @@ ${JREHOME}/lib/zi/Africa/Windhoek
${JREHOME}/lib/zi/America/
${JREHOME}/lib/zi/America/Adak
${JREHOME}/lib/zi/America/Anchorage
-${JREHOME}/lib/zi/America/Anguilla
${JREHOME}/lib/zi/America/Antigua
${JREHOME}/lib/zi/America/Araguaina
${JREHOME}/lib/zi/America/Argentina/
@@ -203,7 +195,6 @@ ${JREHOME}/lib/zi/America/Argentina/San_
${JREHOME}/lib/zi/America/Argentina/San_Luis
${JREHOME}/lib/zi/America/Argentina/Tucuman
${JREHOME}/lib/zi/America/Argentina/Ushuaia
-${JREHOME}/lib/zi/America/Aruba
${JREHOME}/lib/zi/America/Asuncion
${JREHOME}/lib/zi/America/Atikokan
${JREHOME}/lib/zi/America/Bahia
@@ -232,7 +223,6 @@ ${JREHOME}/lib/zi/America/Dawson
${JREHOME}/lib/zi/America/Dawson_Creek
${JREHOME}/lib/zi/America/Denver
${JREHOME}/lib/zi/America/Detroit
-${JREHOME}/lib/zi/America/Dominica
${JREHOME}/lib/zi/America/Edmonton
${JREHOME}/lib/zi/America/Eirunepe
${JREHOME}/lib/zi/America/El_Salvador
@@ -241,8 +231,6 @@ ${JREHOME}/lib/zi/America/Glace_Bay
${JREHOME}/lib/zi/America/Godthab
${JREHOME}/lib/zi/America/Goose_Bay
${JREHOME}/lib/zi/America/Grand_Turk
-${JREHOME}/lib/zi/America/Grenada
-${JREHOME}/lib/zi/America/Guadeloupe
${JREHOME}/lib/zi/America/Guatemala
${JREHOME}/lib/zi/America/Guayaquil
${JREHOME}/lib/zi/America/Guyana
@@ -283,7 +271,6 @@ ${JREHOME}/lib/zi/America/Moncton
${JREHOME}/lib/zi/America/Monterrey
${JREHOME}/lib/zi/America/Montevideo
${JREHOME}/lib/zi/America/Montreal
-${JREHOME}/lib/zi/America/Montserrat
${JREHOME}/lib/zi/America/Nassau
${JREHOME}/lib/zi/America/New_York
${JREHOME}/lib/zi/America/Nipigon
@@ -316,17 +303,12 @@ ${JREHOME}/lib/zi/America/Sao_Paulo
${JREHOME}/lib/zi/America/Scoresbysund
${JREHOME}/lib/zi/America/Sitka
${JREHOME}/lib/zi/America/St_Johns
-${JREHOME}/lib/zi/America/St_Kitts
-${JREHOME}/lib/zi/America/St_Lucia
-${JREHOME}/lib/zi/America/St_Thomas
-${JREHOME}/lib/zi/America/St_Vincent
${JREHOME}/lib/zi/America/Swift_Current
${JREHOME}/lib/zi/America/Tegucigalpa
${JREHOME}/lib/zi/America/Thule
${JREHOME}/lib/zi/America/Thunder_Bay
${JREHOME}/lib/zi/America/Tijuana
${JREHOME}/lib/zi/America/Toronto
-${JREHOME}/lib/zi/America/Tortola
${JREHOME}/lib/zi/America/Vancouver
${JREHOME}/lib/zi/America/Whitehorse
${JREHOME}/lib/zi/America/Winnipeg
@@ -338,7 +320,6 @@ ${JREHOME}/lib/zi/Antarctica/Davis
${JREHOME}/lib/zi/Antarctica/DumontDUrville
${JREHOME}/lib/zi/Antarctica/Macquarie
${JREHOME}/lib/zi/Antarctica/Mawson
-${JREHOME}/lib/zi/Antarctica/McMurdo
${JREHOME}/lib/zi/Antarctica/Palmer
${JREHOME}/lib/zi/Antarctica/Rothera
${JREHOME}/lib/zi/Antarctica/Syowa
@@ -381,6 +362,7 @@ ${JREHOME}/lib/zi/Asia/Kamchatka
${JREHOME}/lib/zi/Asia/Karachi
${JREHOME}/lib/zi/Asia/Kashgar
${JREHOME}/lib/zi/Asia/Kathmandu
+${JREHOME}/lib/zi/Asia/Khandyga
${JREHOME}/lib/zi/Asia/Kolkata
${JREHOME}/lib/zi/Asia/Krasnoyarsk
${JREHOME}/lib/zi/Asia/Kuala_Lumpur
@@ -419,6 +401,7 @@ ${JREHOME}/lib/zi/Asia/Thimphu
${JREHOME}/lib/zi/Asia/Tokyo
${JREHOME}/lib/zi/Asia/Ulaanbaatar
${JREHOME}/lib/zi/Asia/Urumqi
+${JREHOME}/lib/zi/Asia/Ust-Nera
${JREHOME}/lib/zi/Asia/Vientiane
${JREHOME}/lib/zi/Asia/Vladivostok
${JREHOME}/lib/zi/Asia/Yakutsk
@@ -520,7 +503,6 @@ ${JREHOME}/lib/zi/Europe/Stockholm
${JREHOME}/lib/zi/Europe/Tallinn
${JREHOME}/lib/zi/Europe/Tirane
${JREHOME}/lib/zi/Europe/Uzhgorod
-${JREHOME}/lib/zi/Europe/Vaduz
${JREHOME}/lib/zi/Europe/Vienna
${JREHOME}/lib/zi/Europe/Vilnius
${JREHOME}/lib/zi/Europe/Volgograd
@@ -561,7 +543,6 @@ ${JREHOME}/lib/zi/Pacific/Gambier
${JREHOME}/lib/zi/Pacific/Guadalcanal
${JREHOME}/lib/zi/Pacific/Guam
${JREHOME}/lib/zi/Pacific/Honolulu
-${JREHOME}/lib/zi/Pacific/Johnston
${JREHOME}/lib/zi/Pacific/Kiritimati
${JREHOME}/lib/zi/Pacific/Kosrae
${JREHOME}/lib/zi/Pacific/Kwajalein
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/jdk/1.7/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 14 Jan 2013 20:16:56 -0000 1.13
+++ pkg/PLIST-main 29 Apr 2014 12:13:32 -0000
@@ -442,33 +442,11 @@ ${JDKHOME}/jre/bin/
@bin ${JDKHOME}/jre/bin/tnameserv
@bin ${JDKHOME}/jre/bin/unpack200
${JDKHOME}/jre/lib/
-${JDKHOME}/jre/lib/applet/
-${JDKHOME}/jre/lib/calendars.properties
-${JDKHOME}/jre/lib/charsets.jar
-${JDKHOME}/jre/lib/classlist
-${JDKHOME}/jre/lib/cmm/
-${JDKHOME}/jre/lib/cmm/CIEXYZ.pf
-${JDKHOME}/jre/lib/cmm/GRAY.pf
-${JDKHOME}/jre/lib/cmm/LINEAR_RGB.pf
-${JDKHOME}/jre/lib/cmm/PYCC.pf
-${JDKHOME}/jre/lib/cmm/sRGB.pf
-${JDKHOME}/jre/lib/content-types.properties
-${JDKHOME}/jre/lib/currency.data
-${JDKHOME}/jre/lib/ext/
-${JDKHOME}/jre/lib/ext/dnsns.jar
-${JDKHOME}/jre/lib/ext/localedata.jar
-${JDKHOME}/jre/lib/ext/meta-index
-${JDKHOME}/jre/lib/ext/sunec.jar
-${JDKHOME}/jre/lib/ext/sunjce_provider.jar
-${JDKHOME}/jre/lib/ext/sunpkcs11.jar
-${JDKHOME}/jre/lib/ext/zipfs.jar
-${JDKHOME}/jre/lib/flavormap.properties
-${JDKHOME}/jre/lib/fontconfig.bfc
-${JDKHOME}/jre/lib/fontconfig.properties.src
${JDKHOME}/jre/lib/${MACHINE_ARCH}/
${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/
${JDKHOME}/jre/lib/${MACHINE_ARCH}/headless/libmawt.so
@bin ${JDKHOME}/jre/lib/${MACHINE_ARCH}/jexec
+@bin ${JDKHOME}/jre/lib/${MACHINE_ARCH}/jspawnhelper
${JDKHOME}/jre/lib/${MACHINE_ARCH}/jli/
${JDKHOME}/jre/lib/${MACHINE_ARCH}/jli/libjli.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/jvm.cfg
@@ -494,7 +472,6 @@ ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjd
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjpeg.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsdt.diz
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsdt.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.diz
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsig.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjsound.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/liblcms.so
@@ -505,8 +482,6 @@ ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libne
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnio.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnpt.diz
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libnpt.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/librmi.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsaproc.diz
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsaproc.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsplashscreen.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libsunec.so
@@ -516,12 +491,33 @@ ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libve
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libzip.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/
${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/Xusage.txt
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.diz
${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjsig.so
-${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.diz
${JDKHOME}/jre/lib/${MACHINE_ARCH}/server/libjvm.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/
${JDKHOME}/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so
+${JDKHOME}/jre/lib/applet/
+${JDKHOME}/jre/lib/calendars.properties
+${JDKHOME}/jre/lib/charsets.jar
+${JDKHOME}/jre/lib/classlist
+${JDKHOME}/jre/lib/cmm/
+${JDKHOME}/jre/lib/cmm/CIEXYZ.pf
+${JDKHOME}/jre/lib/cmm/GRAY.pf
+${JDKHOME}/jre/lib/cmm/LINEAR_RGB.pf
+${JDKHOME}/jre/lib/cmm/PYCC.pf
+${JDKHOME}/jre/lib/cmm/sRGB.pf
+${JDKHOME}/jre/lib/content-types.properties
+${JDKHOME}/jre/lib/currency.data
+${JDKHOME}/jre/lib/ext/
+${JDKHOME}/jre/lib/ext/dnsns.jar
+${JDKHOME}/jre/lib/ext/localedata.jar
+${JDKHOME}/jre/lib/ext/meta-index
+${JDKHOME}/jre/lib/ext/sunec.jar
+${JDKHOME}/jre/lib/ext/sunjce_provider.jar
+${JDKHOME}/jre/lib/ext/sunpkcs11.jar
+${JDKHOME}/jre/lib/ext/zipfs.jar
+${JDKHOME}/jre/lib/flavormap.properties
+${JDKHOME}/jre/lib/fontconfig.bfc
+${JDKHOME}/jre/lib/fontconfig.properties.src
${JDKHOME}/jre/lib/images/
${JDKHOME}/jre/lib/images/cursors/
${JDKHOME}/jre/lib/images/cursors/cursors.properties
@@ -554,8 +550,6 @@ ${JDKHOME}/jre/lib/security/cacerts
${JDKHOME}/jre/lib/security/java.policy
${JDKHOME}/jre/lib/security/java.security
${JDKHOME}/jre/lib/security/local_policy.jar
-${JDKHOME}/jre/lib/servicetag/
-${JDKHOME}/jre/lib/servicetag/jdk_header.png
${JDKHOME}/jre/lib/sound.properties
${JDKHOME}/jre/lib/zi/
${JDKHOME}/jre/lib/zi/Africa/
@@ -584,7 +578,6 @@ ${JDKHOME}/jre/lib/zi/Africa/Freetown
${JDKHOME}/jre/lib/zi/Africa/Gaborone
${JDKHOME}/jre/lib/zi/Africa/Harare
${JDKHOME}/jre/lib/zi/Africa/Johannesburg
-${JDKHOME}/jre/lib/zi/Africa/Juba
${JDKHOME}/jre/lib/zi/Africa/Kampala
${JDKHOME}/jre/lib/zi/Africa/Khartoum
${JDKHOME}/jre/lib/zi/Africa/Kigali
@@ -614,7 +607,6 @@ ${JDKHOME}/jre/lib/zi/Africa/Windhoek
${JDKHOME}/jre/lib/zi/America/
${JDKHOME}/jre/lib/zi/America/Adak
${JDKHOME}/jre/lib/zi/America/Anchorage
-${JDKHOME}/jre/lib/zi/America/Anguilla
${JDKHOME}/jre/lib/zi/America/Antigua
${JDKHOME}/jre/lib/zi/America/Araguaina
${JDKHOME}/jre/lib/zi/America/Argentina/
@@ -630,7 +622,6 @@ ${JDKHOME}/jre/lib/zi/America/Argentina/
${JDKHOME}/jre/lib/zi/America/Argentina/San_Luis
${JDKHOME}/jre/lib/zi/America/Argentina/Tucuman
${JDKHOME}/jre/lib/zi/America/Argentina/Ushuaia
-${JDKHOME}/jre/lib/zi/America/Aruba
${JDKHOME}/jre/lib/zi/America/Asuncion
${JDKHOME}/jre/lib/zi/America/Atikokan
${JDKHOME}/jre/lib/zi/America/Bahia
@@ -659,7 +650,6 @@ ${JDKHOME}/jre/lib/zi/America/Dawson
${JDKHOME}/jre/lib/zi/America/Dawson_Creek
${JDKHOME}/jre/lib/zi/America/Denver
${JDKHOME}/jre/lib/zi/America/Detroit
-${JDKHOME}/jre/lib/zi/America/Dominica
${JDKHOME}/jre/lib/zi/America/Edmonton
${JDKHOME}/jre/lib/zi/America/Eirunepe
${JDKHOME}/jre/lib/zi/America/El_Salvador
@@ -668,8 +658,6 @@ ${JDKHOME}/jre/lib/zi/America/Glace_Bay
${JDKHOME}/jre/lib/zi/America/Godthab
${JDKHOME}/jre/lib/zi/America/Goose_Bay
${JDKHOME}/jre/lib/zi/America/Grand_Turk
-${JDKHOME}/jre/lib/zi/America/Grenada
-${JDKHOME}/jre/lib/zi/America/Guadeloupe
${JDKHOME}/jre/lib/zi/America/Guatemala
${JDKHOME}/jre/lib/zi/America/Guayaquil
${JDKHOME}/jre/lib/zi/America/Guyana
@@ -710,7 +698,6 @@ ${JDKHOME}/jre/lib/zi/America/Moncton
${JDKHOME}/jre/lib/zi/America/Monterrey
${JDKHOME}/jre/lib/zi/America/Montevideo
${JDKHOME}/jre/lib/zi/America/Montreal
-${JDKHOME}/jre/lib/zi/America/Montserrat
${JDKHOME}/jre/lib/zi/America/Nassau
${JDKHOME}/jre/lib/zi/America/New_York
${JDKHOME}/jre/lib/zi/America/Nipigon
@@ -743,17 +730,12 @@ ${JDKHOME}/jre/lib/zi/America/Sao_Paulo
${JDKHOME}/jre/lib/zi/America/Scoresbysund
${JDKHOME}/jre/lib/zi/America/Sitka
${JDKHOME}/jre/lib/zi/America/St_Johns
-${JDKHOME}/jre/lib/zi/America/St_Kitts
-${JDKHOME}/jre/lib/zi/America/St_Lucia
-${JDKHOME}/jre/lib/zi/America/St_Thomas
-${JDKHOME}/jre/lib/zi/America/St_Vincent
${JDKHOME}/jre/lib/zi/America/Swift_Current
${JDKHOME}/jre/lib/zi/America/Tegucigalpa
${JDKHOME}/jre/lib/zi/America/Thule
${JDKHOME}/jre/lib/zi/America/Thunder_Bay
${JDKHOME}/jre/lib/zi/America/Tijuana
${JDKHOME}/jre/lib/zi/America/Toronto
-${JDKHOME}/jre/lib/zi/America/Tortola
${JDKHOME}/jre/lib/zi/America/Vancouver
${JDKHOME}/jre/lib/zi/America/Whitehorse
${JDKHOME}/jre/lib/zi/America/Winnipeg
@@ -765,7 +747,6 @@ ${JDKHOME}/jre/lib/zi/Antarctica/Davis
${JDKHOME}/jre/lib/zi/Antarctica/DumontDUrville
${JDKHOME}/jre/lib/zi/Antarctica/Macquarie
${JDKHOME}/jre/lib/zi/Antarctica/Mawson
-${JDKHOME}/jre/lib/zi/Antarctica/McMurdo
${JDKHOME}/jre/lib/zi/Antarctica/Palmer
${JDKHOME}/jre/lib/zi/Antarctica/Rothera
${JDKHOME}/jre/lib/zi/Antarctica/Syowa
@@ -808,6 +789,7 @@ ${JDKHOME}/jre/lib/zi/Asia/Kamchatka
${JDKHOME}/jre/lib/zi/Asia/Karachi
${JDKHOME}/jre/lib/zi/Asia/Kashgar
${JDKHOME}/jre/lib/zi/Asia/Kathmandu
+${JDKHOME}/jre/lib/zi/Asia/Khandyga
${JDKHOME}/jre/lib/zi/Asia/Kolkata
${JDKHOME}/jre/lib/zi/Asia/Krasnoyarsk
${JDKHOME}/jre/lib/zi/Asia/Kuala_Lumpur
@@ -846,6 +828,7 @@ ${JDKHOME}/jre/lib/zi/Asia/Thimphu
${JDKHOME}/jre/lib/zi/Asia/Tokyo
${JDKHOME}/jre/lib/zi/Asia/Ulaanbaatar
${JDKHOME}/jre/lib/zi/Asia/Urumqi
+${JDKHOME}/jre/lib/zi/Asia/Ust-Nera
${JDKHOME}/jre/lib/zi/Asia/Vientiane
${JDKHOME}/jre/lib/zi/Asia/Vladivostok
${JDKHOME}/jre/lib/zi/Asia/Yakutsk
@@ -947,7 +930,6 @@ ${JDKHOME}/jre/lib/zi/Europe/Stockholm
${JDKHOME}/jre/lib/zi/Europe/Tallinn
${JDKHOME}/jre/lib/zi/Europe/Tirane
${JDKHOME}/jre/lib/zi/Europe/Uzhgorod
-${JDKHOME}/jre/lib/zi/Europe/Vaduz
${JDKHOME}/jre/lib/zi/Europe/Vienna
${JDKHOME}/jre/lib/zi/Europe/Vilnius
${JDKHOME}/jre/lib/zi/Europe/Volgograd
@@ -988,7 +970,6 @@ ${JDKHOME}/jre/lib/zi/Pacific/Gambier
${JDKHOME}/jre/lib/zi/Pacific/Guadalcanal
${JDKHOME}/jre/lib/zi/Pacific/Guam
${JDKHOME}/jre/lib/zi/Pacific/Honolulu
-${JDKHOME}/jre/lib/zi/Pacific/Johnston
${JDKHOME}/jre/lib/zi/Pacific/Kiritimati
${JDKHOME}/jre/lib/zi/Pacific/Kosrae
${JDKHOME}/jre/lib/zi/Pacific/Kwajalein
@@ -1060,7 +1041,6 @@ ${JDKHOME}/man/man1/
@man ${JDKHOME}/man/man1/jstack.1
@man ${JDKHOME}/man/man1/jstat.1
@man ${JDKHOME}/man/man1/jstatd.1
-@man ${JDKHOME}/man/man1/jvisualvm.1
@man ${JDKHOME}/man/man1/keytool.1
@man ${JDKHOME}/man/man1/native2ascii.1
@man ${JDKHOME}/man/man1/orbd.1
