Update jdk 1.7 to u9 level:
- Update to u6 via patchset from upstream bsd_port and u6 source from Oracle
- Copied u6 - u9 patchset from FreeBSD/Greg Lewis's port
- Updated classloader patch from Matthew Dempsky (matthew@)
Tested on amd64 and i386. Please test in a bulk build.
Thanks,
-Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/jdk/1.7/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 24 Oct 2012 18:54:03 - 1.52
+++ Makefile 11 Jan 2013 20:28:37 -
@@ -5,26 +5,18 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT-main= Java2(TM) SE Dev Kit v${V}
COMMENT-jre= Java2(TM) SE Runtime Environment v${V}
-V= 1.7.0.03
-B= b13
+V= 1.7.0.09
+B= b24
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
-REVISION-main= 1
PKGNAME-jre= jre-${V}
-REVISION-jre= 1
EPOCH= 0
-# see openjdk/jaxp/jaxp.properties openjdk/jaxws/jaxws.properties
-# in ${WRKDIR} for names and download locations of extra distfiles
+JDK_SRC= openjdk-7u6-fcs-src-b24-28_aug_2012.zip
+PATCH_SET= openjdk-7u6-patch-set-20130111.zip
+PATCH_SET2= openjdk-7u9-patch-set-20130110.zip
-JDK_SRC= openjdk-7u2-fcs-src-${B}-17_nov_2011.zip
-JAXP_SRC= jaxp145_01.zip
-JAXWS_SRC= jdk7-jaxws2_2_4-b04-2011_06_01.zip
-JAF_SRC= jdk7-jaf-2010_08_19.zip
-PATCH_SET= openjdk-7u2-patch-set-20120314.zip
-PATCH_SET2= openjdk-7u3-patch-set-20120417.zip
-
-DISTFILES= ${JDK_SRC} ${JAXP_SRC}:0 ${JAXWS_SRC}:1 ${JAF_SRC}:2 ${PATCH_SET}:3 ${PATCH_SET2}:3
+DISTFILES= ${JDK_SRC} ${PATCH_SET}:1 ${PATCH_SET2}:1
EXTRACT_ONLY= ${JDK_SRC} ${PATCH_SET} ${PATCH_SET2}
DIST_SUBDIR= jdk
@@ -38,22 +30,10 @@ FLAVOR?=
HOMEPAGE= http://openjdk.java.net/
-MASTER_SITES= http://www.java.net/download/openjdk/jdk7u2/promoted/${B}/ \
- http://openbsd.dead-parrot.de/distfiles/ \
- http://distfiles.nl/
-MASTER_SITES0= http://download.java.net/jaxp/1.4.5/ \
- http://icedtea.classpath.org/download/drops/ \
- http://openbsd.dead-parrot.de/distfiles/ \
- http://distfiles.nl/
-MASTER_SITES1= http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/ \
- http://icedtea.classpath.org/download/drops/ \
- http://openbsd.dead-parrot.de/distfiles/ \
- http://distfiles.nl/
-MASTER_SITES2= http://java.net/downloads/jax-ws/JDK7/ \
- http://icedtea.classpath.org/download/drops/ \
+MASTER_SITES= http://www.java.net/download/openjdk/jdk7u6/promoted/${B}/ \
http://openbsd.dead-parrot.de/distfiles/ \
http://distfiles.nl/
-MASTER_SITES3= http://www.intricatesoftware.com/distfiles/ \
+MASTER_SITES1= http://www.intricatesoftware.com/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
http://distfiles.nl/
@@ -97,17 +77,17 @@ PARALLEL_BUILD= No
MAKE_ENV= ALT_BOOTDIR=${ALT_BOOTDIR} \
ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \
ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \
- ALT_DROPS_DIR=${DISTDIR}/${DIST_SUBDIR} \
ALT_PACKAGE_PATH=${LOCALBASE} \
ALT_X11_PATH=${X11BASE} \
DEFAULT_LIBPATH=/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib \
NO_DOCS=true \
CC=${CC} \
CXX=${CXX} \
+ COMPILER_WARNINGS_FATAL=false \
USERNAME=${USER} \
MILESTONE=fcs \
- BUILD_NUMBER=b04 \
- JDK_UPDATE_VERSION=03 \
+ BUILD_NUMBER=${B} \
+ JDK_UPDATE_VERSION=09 \
HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
#ALL_TARGET= debug_build
@@ -133,66 +113,24 @@ PKG_ARGS+= -Dclient_vm=1
PKG_ARGS+= -Dclient_vm=0
.endif
-COPYDIRS= hotspot/agent/src/os/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86 \
- hotspot/src/os/linux/vm \
- hotspot/src/os_cpu/linux_x86/vm \
- hotspot/src/os_cpu/linux_zero/vm \
- hotspot/make/linux \
- hotspot/make/linux/makefiles \
- jdk/src/linux/doc/man \
- jdk/src/linux/doc/man/ja
-
-COPYFILES= hotspot/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java \
- corba/make/common/Defs-linux.gmk \
- corba/make/common/shared/Defs-linux.gmk \
- jdk/make/com/sun/tools/attach/mapfile-linux \
+COPYFILES= hotspot/src/os/linux/vm/decoder_linux.cpp \
jdk/make/common/Defs-linux.gmk \
jdk/make/common/shared/Defs-linux.gmk \
- jdk/make/java/nio/mapfile-linux \
- jdk/make/netbeans/common/architectures/name-Linux.properties \
- jdk/make/sun/awt/mapfile-vers-linux \
- jdk/make/tools/sharing/classlist.linux \
- jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \
- jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
- jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java \
- jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java \
- jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java \
-
