Sat Jun 15 09:31:06 2013 UTC ()
Add SunOS/GCC support.  With huge thanks to "jesse" from #SmartOS who did the
bulk of the porting work.  Tested on SmartOS 32-bit.  64-bit builds currently
fail, they should hopefully be fixed soon.


(jperkin)
diff -r1.49 -r1.50 pkgsrc/lang/openjdk7/Makefile
diff -r1.9 -r1.10 pkgsrc/lang/openjdk7/PLIST
diff -r0 -r1.1 pkgsrc/lang/openjdk7/PLIST.SunOS
diff -r1.7 -r1.8 pkgsrc/lang/openjdk7/bootstrap.mk
diff -r1.23 -r1.24 pkgsrc/lang/openjdk7/distinfo
diff -r1.8 -r1.9 pkgsrc/lang/openjdk7/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/lang/openjdk7/patches/patch-ab
diff -r1.5 -r1.6 pkgsrc/lang/openjdk7/patches/patch-ak
diff -r1.5 -r1.6 pkgsrc/lang/openjdk7/patches/patch-aq
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-af
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-ah
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-al
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-am
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-ar
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-bd
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-bi
diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/patch-bn
diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/patch-ad
diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/patch-ae
diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/patch-aj
diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/patch-ap
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-ai
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-an
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-ao
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-ba
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-bg
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-bh
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-bj
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-bk
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-bl
diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-utils.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_adlc.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_build__vm__def.sh
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_debug.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jsig.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jvmg.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_optimized.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_product.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_saproc.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_com_sun_java_pack_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris-gcc.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_Mapfile-vers.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_shared_Compiler-gcc.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-versions.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_nio_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_sun_awt_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_sun_security_ec_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_make_sun_xawt_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_bin_ergo__i586.c
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_sun_awt_X11Color.c
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_test_Makefile
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_Test4144543.java
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-jdk_test_sun_security_ec_TestEC.java
cvs diff -r1.49 -r1.50 pkgsrc/lang/openjdk7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2013/06/04 22:16:33 1.49
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2013/06/15 09:31:05 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2013/06/04 22:16:33 tron Exp $ 1# $NetBSD: Makefile,v 1.50 2013/06/15 09:31:05 jperkin Exp $
2 2
3DISTNAME= openjdk-7u6-fcs-src-b24-09_aug_2012 3DISTNAME= openjdk-7u6-fcs-src-b24-09_aug_2012
4PKGNAME= openjdk7-1.7.21 4PKGNAME= openjdk7-1.7.21
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -61,36 +61,67 @@ MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${M @@ -61,36 +61,67 @@ MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${M
61MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS} 61MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
62 62
63MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc 63MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
64MAKE_ENV+= NO_DOCS=true 64MAKE_ENV+= NO_DOCS=true
65MAKE_ENV+= SKIP_COMPARE_IMAGES=true 65MAKE_ENV+= SKIP_COMPARE_IMAGES=true
66MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes 66MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
67MAKE_ENV+= SKIP_DEBUG_BUILD=yes 67MAKE_ENV+= SKIP_DEBUG_BUILD=yes
68 68
69# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. 69# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
70MAKE_ENV+= JAVA_HOME= 70MAKE_ENV+= JAVA_HOME=
71MAKE_ENV+= CLASSPATH= 71MAKE_ENV+= CLASSPATH=
72 72
73MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\"" 73MAKE_ENV+= EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\""
74BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/} 74BUILDDIR= ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
75LD_LIBRARY_PATH= ${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server 75LD_LIBRARY_PATH= ${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server
76MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 76MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
77BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk7/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/} 77BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk7/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}
78 78
79PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/} 79PLIST_SUBST+= ARCH=${MACHINE_ARCH:S/x86_64/amd64/}
80PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS} 80PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS}
81 81
82.include "../../mk/compiler.mk" 82.include "../../mk/compiler.mk"
83 83
 84.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
 85MAKE_ENV+= USE_GCC=1
 86MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q}
 87.endif
 88
 89# SmartOS has ccs tools in /usr/bin
 90.if ${OS_VARIANT} == "SmartOS"
 91SUBST_CLASSES+= ccspath
 92SUBST_STAGE.ccspath= pre-build
 93SUBST_FILES.ccspath= jdk/make/common/shared/Defs-utils.gmk
 94SUBST_FILES.ccspath+= hotspot/make/solaris/makefiles/build_vm_def.sh
 95SUBST_SED.ccspath= -e 's/UNIXCCS_PATH/UNIXCOMMAND_PATH/g'
 96SUBST_SED.ccspath+= -e 's,/usr/ccs/bin,/usr/bin,g'
 97.endif
 98
 99.if ${OPSYS} == "SunOS"
 100SUBST_CLASSES+= mapfix
 101SUBST_STAGE.mapfix= pre-build
 102SUBST_FILES.mapfix= jdk/make/com/sun/java/pack/mapfile-vers
 103SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-amd64
 104SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-i586
 105SUBST_SED.mapfix= -e '/__fsr_init_value/d'
 106SUBST_SED.mapfix+= -e '/__progname/d'
 107
 108# environ should only be removed from this file (added by patches)
 109SUBST_CLASSES+= mapfix2
 110SUBST_STAGE.mapfix2= pre-build
 111SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers
 112SUBST_SED.mapfix2= -e '/environ/d'
 113.endif
 114
84.if !empty(PKGSRC_COMPILER:Mclang) 115.if !empty(PKGSRC_COMPILER:Mclang)
85_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \ 116_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \
86 -Wno-shorten-64-to-32 -Wno-conversion \ 117 -Wno-shorten-64-to-32 -Wno-conversion \
87 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 118 -Wno-unused-value -Wno-switch-enum -Wno-switch \
88 -Wno-tautological-compare \ 119 -Wno-tautological-compare \
89 -Wno-delete-non-virtual-dtor \ 120 -Wno-delete-non-virtual-dtor \
90 -Wno-return-type -Wno-unused-parameter \ 121 -Wno-return-type -Wno-unused-parameter \
91 -Wno-parentheses-equality -Wno-empty-body 122 -Wno-parentheses-equality -Wno-empty-body
92. if ${MACHINE_ARCH} == "x86_64" 123. if ${MACHINE_ARCH} == "x86_64"
93_WRAP_EXTRA_ARGS.CXX+= -mstackrealign 124_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
94. endif 125. endif
95.endif 126.endif
96.include "bootstrap.mk" 127.include "bootstrap.mk"
@@ -107,57 +138,73 @@ SUBST_FILES.add-rpaths= jdk/make/sun/aw @@ -107,57 +138,73 @@ SUBST_FILES.add-rpaths= jdk/make/sun/aw
107 jdk/make/sun/jdga/Makefile \ 138 jdk/make/sun/jdga/Makefile \
108 jdk/make/sun/splashscreen/Makefile \ 139 jdk/make/sun/splashscreen/Makefile \
109 jdk/make/sun/xawt/Makefile 140 jdk/make/sun/xawt/Makefile
110SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g' 141SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g'
111 142
112SUBST_CLASSES+= fontpaths 143SUBST_CLASSES+= fontpaths
113SUBST_STAGE.fontpaths= pre-build 144SUBST_STAGE.fontpaths= pre-build
114SUBST_MESSAGE.fontpaths= fixing font paths 145SUBST_MESSAGE.fontpaths= fixing font paths
115SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties 146SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
116SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c 147SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
117SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g' 148SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
118SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g' 149SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
119 150
120PLIST_VARS+= i386 jce 151PLIST_VARS+= i386 jce manja
121.if ${MACHINE_ARCH} == "i386" 152.if ${MACHINE_ARCH} == "i386"
122PLIST.i386= yes 153PLIST.i386= yes
123.endif 154.endif
 155.if ${OPSYS} != "SunOS"
 156PLIST.manja= yes
 157.endif
124 158
125post-extract: 159post-extract:
126 chmod +x ${ANT_BIN}/ant 160 chmod +x ${ANT_BIN}/ant
127 cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \ 161 cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \
128 ${WRKSRC}/jdk/src/share/classes 162 ${WRKSRC}/jdk/src/share/classes
129 cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \ 163 cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \
130 ${WRKSRC}/jdk/src/share/classes 164 ${WRKSRC}/jdk/src/share/classes
131# cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch 165# cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch
132 mv ${WRKDIR}/bootstrap/bin/java ${WRKDIR}/bootstrap/bin/java-real 166.if ${OPSYS} == "SunOS"
133 printf '#!/bin/sh\nexec %s/bootstrap/bin/java-real -mx256m "$$@"\n' \ 167 ${MKDIR} ${ALT_BOOTDIR}/bin
134 ${WRKDIR} > ${WRKDIR}/bootstrap/bin/java 168 ${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include
135 chmod a+x ${WRKDIR}/bootstrap/bin/java 169 ${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib
 170 printf '#!/bin/sh\nexec %s/bin/java -mx256m "$$@"\n' \
 171 ${JDK_BOOTDIR} > ${ALT_BOOTDIR}/bin/java
 172.else
 173 mv ${ALT_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin/java-real
 174 printf '#!/bin/sh\nexec %s/bin/java-real -mx256m "$$@"\n' \
 175 ${ALT_BOOTDIR} > ${ALT_BOOTDIR}/bin/java
 176.endif
 177 chmod a+x ${ALT_BOOTDIR}/bin/java
136.for t in idlj jar javac javah javap native2ascii rmic 178.for t in idlj jar javac javah javap native2ascii rmic
137 mv ${WRKDIR}/bootstrap/bin/${t} ${WRKDIR}/bootstrap/bin/${t}-real 179.if ${OPSYS} == "SunOS"
138 printf '#!/bin/sh\n\nexec %s/bootstrap/bin/${t}-real -J-mx256m "$$@"\n' \ 180 printf '#!/bin/sh\n\nexec %s/bin/${t} -J-mx256m "$$@"\n' \
139 ${WRKDIR} > ${WRKDIR}/bootstrap/bin/${t} 181 ${JDK_BOOTDIR} > ${ALT_BOOTDIR}/bin/${t}
140 chmod a+x ${WRKDIR}/bootstrap/bin/${t} 182.else
 183 mv ${ALT_BOOTDIR}/bin/${t} ${ALT_BOOTDIR}/bin/${t}-real
 184 printf '#!/bin/sh\n\nexec %s/bin/${t}-real -J-mx256m "$$@"\n' \
 185 ${ALT_BOOTDIR} > ${ALT_BOOTDIR}/bin/${t}
 186.endif
 187 chmod a+x ${ALT_BOOTDIR}/bin/${t}
141.endfor 188.endfor
142 189
143do-build: ${WRKDIR}/stage3-done 190do-build: ${WRKDIR}/stage3-done
144 191
145# stage 1 builds a native JDK using the bootstrap binaries 192# stage 1 builds a native JDK using the bootstrap binaries
146${WRKDIR}/stage1-done: 193${WRKDIR}/stage1-done:
147 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 194 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
148 rm -rf ${WRKDIR}/bootstrap 195 rm -rf ${ALT_BOOTDIR}
149 cd ${BUILDDIR} && mv j2sdk-image ${WRKDIR}/bootstrap 196 cd ${BUILDDIR} && mv j2sdk-image ${ALT_BOOTDIR}
150 rm -rf ${BUILDDIR} 197 mv ${BUILDDIR} ${BUILDDIR}-stage1
151 touch ${WRKDIR}/stage1-done 198 touch ${WRKDIR}/stage1-done
152 199
153# stage 2 rebuilds the JDK using native tools 200# stage 2 rebuilds the JDK using native tools
154${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done 201${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
155 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 202 ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
156 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep 203 touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
157 touch ${WRKDIR}/stage2-done 204 touch ${WRKDIR}/stage2-done
158 205
159# stage 3 builds third party add-ons 206# stage 3 builds third party add-ons
160${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out 207${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
161 touch ${WRKDIR}/stage3-done 208 touch ${WRKDIR}/stage3-done
162 209
163${WRKDIR}/cacerts.out: 210${WRKDIR}/cacerts.out:
@@ -179,26 +226,34 @@ do-install: @@ -179,26 +226,34 @@ do-install:
179 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts 226 ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
180 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h 227 rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h
181 ln -s ${LOWER_OPSYS}/jni_md.h \ 228 ln -s ${LOWER_OPSYS}/jni_md.h \
182 ${DESTDIR}${JAVA_HOME}/include/jni_md.h 229 ${DESTDIR}${JAVA_HOME}/include/jni_md.h
183 230
184.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*) 231.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*)
185MAKE_ENV+= PTHREAD_STACKSIZE=1024 232MAKE_ENV+= PTHREAD_STACKSIZE=1024
186.endif 233.endif
187 234
188.if ${OPSYS} == "NetBSD" 235.if ${OPSYS} == "NetBSD"
189TOOLS_PLATFORM.unzip= 236TOOLS_PLATFORM.unzip=
190.endif 237.endif
191 238
 239# Include binutils for objcopy and GNU strip on SmartOS
 240.if ${OS_VARIANT} == "SmartOS"
 241.include "../../devel/binutils/buildlink3.mk"
 242BUILDLINK_DEPMETHOD.binutils?= build
 243MAKE_ENV+= ALT_OBJCOPY=${PREFIX}/bin/gobjcopy
 244MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip
 245.endif
 246
192.include "../../converters/libiconv/buildlink3.mk" 247.include "../../converters/libiconv/buildlink3.mk"
193.include "../../fonts/fontconfig/buildlink3.mk" 248.include "../../fonts/fontconfig/buildlink3.mk"
194.include "../../graphics/freetype2/buildlink3.mk" 249.include "../../graphics/freetype2/buildlink3.mk"
195BUILDLINK_DEPMETHOD.cups?= build 250BUILDLINK_DEPMETHOD.cups?= build
196.include "../../print/cups/buildlink3.mk" 251.include "../../print/cups/buildlink3.mk"
197.include "../../x11/libXext/buildlink3.mk" 252.include "../../x11/libXext/buildlink3.mk"
198.include "../../x11/libXi/buildlink3.mk" 253.include "../../x11/libXi/buildlink3.mk"
199BUILDLINK_DEPMETHOD.libXp?= build 254BUILDLINK_DEPMETHOD.libXp?= build
200.include "../../x11/libXp/buildlink3.mk" 255.include "../../x11/libXp/buildlink3.mk"
201BUILDLINK_DEPMETHOD.libXt?= build 256BUILDLINK_DEPMETHOD.libXt?= build
202.include "../../x11/libXt/buildlink3.mk" 257.include "../../x11/libXt/buildlink3.mk"
203.include "../../x11/libXtst/buildlink3.mk" 258.include "../../x11/libXtst/buildlink3.mk"
204.include "../../x11/libXrender/buildlink3.mk" 259.include "../../x11/libXrender/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/lang/openjdk7/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/PLIST 2013/06/02 15:32:03 1.9
+++ pkgsrc/lang/openjdk7/Attic/PLIST 2013/06/15 09:31:05 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2013/06/02 15:32:03 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.10 2013/06/15 09:31:05 jperkin Exp $
2bin/openjdk7-jar 2bin/openjdk7-jar
3bin/openjdk7-java 3bin/openjdk7-java
4bin/openjdk7-javac 4bin/openjdk7-javac
5bin/openjdk7-javadoc 5bin/openjdk7-javadoc
6bin/openjdk7-javah 6bin/openjdk7-javah
7bin/openjdk7-javap 7bin/openjdk7-javap
8bin/openjdk7-keytool 8bin/openjdk7-keytool
9bin/openjdk7-orbd 9bin/openjdk7-orbd
10bin/openjdk7-policytool 10bin/openjdk7-policytool
11bin/openjdk7-rmid 11bin/openjdk7-rmid
12bin/openjdk7-rmiregistry 12bin/openjdk7-rmiregistry
13bin/openjdk7-servertool 13bin/openjdk7-servertool
14bin/openjdk7-tnameserv 14bin/openjdk7-tnameserv
@@ -915,27 +915,27 @@ java/openjdk7/jre/lib/zi/SystemV/MST7 @@ -915,27 +915,27 @@ java/openjdk7/jre/lib/zi/SystemV/MST7
915java/openjdk7/jre/lib/zi/SystemV/MST7MDT 915java/openjdk7/jre/lib/zi/SystemV/MST7MDT
916java/openjdk7/jre/lib/zi/SystemV/PST8 916java/openjdk7/jre/lib/zi/SystemV/PST8
917java/openjdk7/jre/lib/zi/SystemV/PST8PDT 917java/openjdk7/jre/lib/zi/SystemV/PST8PDT
918java/openjdk7/jre/lib/zi/SystemV/YST9 918java/openjdk7/jre/lib/zi/SystemV/YST9
919java/openjdk7/jre/lib/zi/SystemV/YST9YDT 919java/openjdk7/jre/lib/zi/SystemV/YST9YDT
920java/openjdk7/jre/lib/zi/WET 920java/openjdk7/jre/lib/zi/WET
921java/openjdk7/jre/lib/zi/ZoneInfoMappings 921java/openjdk7/jre/lib/zi/ZoneInfoMappings
922java/openjdk7/lib/ct.sym 922java/openjdk7/lib/ct.sym
923java/openjdk7/lib/ir.idl 923java/openjdk7/lib/ir.idl
924java/openjdk7/lib/jconsole.jar 924java/openjdk7/lib/jconsole.jar
925java/openjdk7/lib/orb.idl 925java/openjdk7/lib/orb.idl
926java/openjdk7/lib/sa-jdi.jar 926java/openjdk7/lib/sa-jdi.jar
927java/openjdk7/lib/tools.jar 927java/openjdk7/lib/tools.jar
928java/openjdk7/man/ja 928${PLIST.manja}java/openjdk7/man/ja
929java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1 929java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
930java/openjdk7/man/ja_JP.UTF-8/man1/apt.1 930java/openjdk7/man/ja_JP.UTF-8/man1/apt.1
931java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1 931java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
932java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1 932java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
933java/openjdk7/man/ja_JP.UTF-8/man1/jar.1 933java/openjdk7/man/ja_JP.UTF-8/man1/jar.1
934java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1 934java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1
935java/openjdk7/man/ja_JP.UTF-8/man1/java.1 935java/openjdk7/man/ja_JP.UTF-8/man1/java.1
936java/openjdk7/man/ja_JP.UTF-8/man1/javac.1 936java/openjdk7/man/ja_JP.UTF-8/man1/javac.1
937java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1 937java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1
938java/openjdk7/man/ja_JP.UTF-8/man1/javah.1 938java/openjdk7/man/ja_JP.UTF-8/man1/javah.1
939java/openjdk7/man/ja_JP.UTF-8/man1/javap.1 939java/openjdk7/man/ja_JP.UTF-8/man1/javap.1
940java/openjdk7/man/ja_JP.UTF-8/man1/jcmd.1 940java/openjdk7/man/ja_JP.UTF-8/man1/jcmd.1
941java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1 941java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1
File Added: pkgsrc/lang/openjdk7/Attic/PLIST.SunOS
@comment $NetBSD: PLIST.SunOS,v 1.1 2013/06/15 09:31:05 jperkin Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
bin/openjdk7-javadoc
bin/openjdk7-javah
bin/openjdk7-javap
bin/openjdk7-keytool
bin/openjdk7-orbd
bin/openjdk7-policytool
bin/openjdk7-rmid
bin/openjdk7-rmiregistry
bin/openjdk7-servertool
bin/openjdk7-tnameserv
java/openjdk7/ASSEMBLY_EXCEPTION
java/openjdk7/LICENSE
java/openjdk7/THIRD_PARTY_README
java/openjdk7/bin/appletviewer
java/openjdk7/bin/apt
java/openjdk7/bin/extcheck
java/openjdk7/bin/idlj
java/openjdk7/bin/jar
java/openjdk7/bin/jarsigner
java/openjdk7/bin/java
java/openjdk7/bin/java-rmi.cgi
java/openjdk7/bin/javac
java/openjdk7/bin/javadoc
java/openjdk7/bin/javah
java/openjdk7/bin/javap
java/openjdk7/bin/jcmd
java/openjdk7/bin/jconsole
java/openjdk7/bin/jdb
java/openjdk7/bin/jhat
java/openjdk7/bin/jinfo
java/openjdk7/bin/jmap
java/openjdk7/bin/jps
java/openjdk7/bin/jrunscript
java/openjdk7/bin/jsadebugd
java/openjdk7/bin/jstack
java/openjdk7/bin/jstat
java/openjdk7/bin/jstatd
java/openjdk7/bin/keytool
java/openjdk7/bin/native2ascii
java/openjdk7/bin/orbd
java/openjdk7/bin/pack200
java/openjdk7/bin/policytool
java/openjdk7/bin/rmic
java/openjdk7/bin/rmid
java/openjdk7/bin/rmiregistry
java/openjdk7/bin/schemagen
java/openjdk7/bin/serialver
java/openjdk7/bin/servertool
java/openjdk7/bin/tnameserv
java/openjdk7/bin/unpack200
java/openjdk7/bin/wsgen
java/openjdk7/bin/wsimport
java/openjdk7/bin/xjc
java/openjdk7/demo/README
java/openjdk7/demo/applets/ArcTest/ArcCanvas.class
java/openjdk7/demo/applets/ArcTest/ArcControls.class
java/openjdk7/demo/applets/ArcTest/ArcTest.class
java/openjdk7/demo/applets/ArcTest/ArcTest.java
java/openjdk7/demo/applets/ArcTest/IntegerTextField.class
java/openjdk7/demo/applets/ArcTest/example1.html
java/openjdk7/demo/applets/BarChart/BarChart.class
java/openjdk7/demo/applets/BarChart/BarChart.java
java/openjdk7/demo/applets/BarChart/example1.html
java/openjdk7/demo/applets/BarChart/example2.html
java/openjdk7/demo/applets/Blink/Blink$1.class
java/openjdk7/demo/applets/Blink/Blink.class
java/openjdk7/demo/applets/Blink/Blink.java
java/openjdk7/demo/applets/Blink/example1.html
java/openjdk7/demo/applets/CardTest/CardPanel.class
java/openjdk7/demo/applets/CardTest/CardTest.class
java/openjdk7/demo/applets/CardTest/CardTest.java
java/openjdk7/demo/applets/CardTest/example1.html
java/openjdk7/demo/applets/Clock/Clock.class
java/openjdk7/demo/applets/Clock/Clock.java
java/openjdk7/demo/applets/Clock/example1.html
java/openjdk7/demo/applets/DitherTest/CardinalTextField.class
java/openjdk7/demo/applets/DitherTest/DitherCanvas.class
java/openjdk7/demo/applets/DitherTest/DitherControls.class
java/openjdk7/demo/applets/DitherTest/DitherMethod.class
java/openjdk7/demo/applets/DitherTest/DitherTest$1.class
java/openjdk7/demo/applets/DitherTest/DitherTest.class
java/openjdk7/demo/applets/DitherTest/DitherTest.java
java/openjdk7/demo/applets/DitherTest/example1.html
java/openjdk7/demo/applets/DrawTest/DrawControls.class
java/openjdk7/demo/applets/DrawTest/DrawPanel.class
java/openjdk7/demo/applets/DrawTest/DrawTest.class
java/openjdk7/demo/applets/DrawTest/DrawTest.java
java/openjdk7/demo/applets/DrawTest/example1.html
java/openjdk7/demo/applets/Fractal/CLSFractal.class
java/openjdk7/demo/applets/Fractal/CLSFractal.java
java/openjdk7/demo/applets/Fractal/CLSRule.class
java/openjdk7/demo/applets/Fractal/CLSTurtle.class
java/openjdk7/demo/applets/Fractal/ContextLSystem.class
java/openjdk7/demo/applets/Fractal/example1.html
java/openjdk7/demo/applets/GraphicsTest/AppletFrame.class
java/openjdk7/demo/applets/GraphicsTest/AppletFrame.java
java/openjdk7/demo/applets/GraphicsTest/ArcCard.class
java/openjdk7/demo/applets/GraphicsTest/ArcDegreePanel.class
java/openjdk7/demo/applets/GraphicsTest/ArcPanel.class
java/openjdk7/demo/applets/GraphicsTest/ColorUtils.class
java/openjdk7/demo/applets/GraphicsTest/GraphicsCards.class
java/openjdk7/demo/applets/GraphicsTest/GraphicsPanel.class
java/openjdk7/demo/applets/GraphicsTest/GraphicsTest.class
java/openjdk7/demo/applets/GraphicsTest/GraphicsTest.java
java/openjdk7/demo/applets/GraphicsTest/OvalShape.class
java/openjdk7/demo/applets/GraphicsTest/PolygonShape.class
java/openjdk7/demo/applets/GraphicsTest/RectShape.class
java/openjdk7/demo/applets/GraphicsTest/RoundRectShape.class
java/openjdk7/demo/applets/GraphicsTest/Shape.class
java/openjdk7/demo/applets/GraphicsTest/ShapeTest.class
java/openjdk7/demo/applets/GraphicsTest/example1.html
java/openjdk7/demo/applets/MoleculeViewer/Atom.class
java/openjdk7/demo/applets/MoleculeViewer/Matrix3D.class
java/openjdk7/demo/applets/MoleculeViewer/Matrix3D.java
java/openjdk7/demo/applets/MoleculeViewer/XYZApp.class
java/openjdk7/demo/applets/MoleculeViewer/XYZApp.java
java/openjdk7/demo/applets/MoleculeViewer/XYZChemModel.class
java/openjdk7/demo/applets/MoleculeViewer/example1.html
java/openjdk7/demo/applets/MoleculeViewer/example2.html
java/openjdk7/demo/applets/MoleculeViewer/example3.html
java/openjdk7/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz
java/openjdk7/demo/applets/MoleculeViewer/models/benzene.xyz
java/openjdk7/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz
java/openjdk7/demo/applets/MoleculeViewer/models/cyclohexane.xyz
java/openjdk7/demo/applets/MoleculeViewer/models/ethane.xyz
java/openjdk7/demo/applets/MoleculeViewer/models/water.xyz
java/openjdk7/demo/applets/NervousText/NervousText.class
java/openjdk7/demo/applets/NervousText/NervousText.java
java/openjdk7/demo/applets/NervousText/example1.html
java/openjdk7/demo/applets/SimpleGraph/GraphApplet.class
java/openjdk7/demo/applets/SimpleGraph/GraphApplet.java
java/openjdk7/demo/applets/SimpleGraph/example1.html
java/openjdk7/demo/applets/SortDemo/BidirBubbleSortAlgorithm.class
java/openjdk7/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java
java/openjdk7/demo/applets/SortDemo/BubbleSortAlgorithm.class
java/openjdk7/demo/applets/SortDemo/BubbleSortAlgorithm.java
java/openjdk7/demo/applets/SortDemo/QSortAlgorithm.class
java/openjdk7/demo/applets/SortDemo/QSortAlgorithm.java
java/openjdk7/demo/applets/SortDemo/SortAlgorithm.class
java/openjdk7/demo/applets/SortDemo/SortAlgorithm.java
java/openjdk7/demo/applets/SortDemo/SortItem.class
java/openjdk7/demo/applets/SortDemo/SortItem.java
java/openjdk7/demo/applets/SortDemo/example1.html
java/openjdk7/demo/applets/SpreadSheet/Cell.class
java/openjdk7/demo/applets/SpreadSheet/CellUpdater.class
java/openjdk7/demo/applets/SpreadSheet/InputField.class
java/openjdk7/demo/applets/SpreadSheet/Node.class
java/openjdk7/demo/applets/SpreadSheet/SpreadSheet.class
java/openjdk7/demo/applets/SpreadSheet/SpreadSheet.java
java/openjdk7/demo/applets/SpreadSheet/SpreadSheetInput.class
java/openjdk7/demo/applets/SpreadSheet/example1.html
java/openjdk7/demo/applets/WireFrame/FileFormatException.class
java/openjdk7/demo/applets/WireFrame/Matrix3D.class
java/openjdk7/demo/applets/WireFrame/Matrix3D.java
java/openjdk7/demo/applets/WireFrame/Model3D.class
java/openjdk7/demo/applets/WireFrame/ThreeD.class
java/openjdk7/demo/applets/WireFrame/ThreeD.java
java/openjdk7/demo/applets/WireFrame/example1.html
java/openjdk7/demo/applets/WireFrame/example2.html
java/openjdk7/demo/applets/WireFrame/example3.html
java/openjdk7/demo/applets/WireFrame/example4.html
java/openjdk7/demo/applets/WireFrame/models/cube.obj
java/openjdk7/demo/applets/WireFrame/models/dinasaur.obj
java/openjdk7/demo/applets/WireFrame/models/hughes_500.obj
java/openjdk7/demo/applets/WireFrame/models/knoxS.obj
java/openjdk7/demo/jfc/CodePointIM/CodePointIM.jar
java/openjdk7/demo/jfc/CodePointIM/README.html
java/openjdk7/demo/jfc/CodePointIM/README_ja.html
java/openjdk7/demo/jfc/CodePointIM/README_zh_CN.html
java/openjdk7/demo/jfc/CodePointIM/src.zip
java/openjdk7/demo/jfc/FileChooserDemo/FileChooserDemo.jar
java/openjdk7/demo/jfc/FileChooserDemo/README.txt
java/openjdk7/demo/jfc/FileChooserDemo/src.zip
java/openjdk7/demo/jfc/Font2DTest/Font2DTest.html
java/openjdk7/demo/jfc/Font2DTest/Font2DTest.jar
java/openjdk7/demo/jfc/Font2DTest/README.txt
java/openjdk7/demo/jfc/Font2DTest/src.zip
java/openjdk7/demo/jfc/Metalworks/Metalworks.jar
java/openjdk7/demo/jfc/Metalworks/README.txt
java/openjdk7/demo/jfc/Metalworks/src.zip
java/openjdk7/demo/jfc/Notepad/Notepad.jar
java/openjdk7/demo/jfc/Notepad/README.txt
java/openjdk7/demo/jfc/Notepad/src.zip
java/openjdk7/demo/jfc/SampleTree/README.txt
java/openjdk7/demo/jfc/SampleTree/SampleTree.jar
java/openjdk7/demo/jfc/SampleTree/src.zip
java/openjdk7/demo/jfc/SwingApplet/README.txt
java/openjdk7/demo/jfc/SwingApplet/SwingApplet.html
java/openjdk7/demo/jfc/SwingApplet/SwingApplet.jar
java/openjdk7/demo/jfc/SwingApplet/src.zip
java/openjdk7/demo/jfc/TableExample/README.txt
java/openjdk7/demo/jfc/TableExample/TableExample.jar
java/openjdk7/demo/jfc/TableExample/src.zip
java/openjdk7/demo/jfc/TransparentRuler/README.txt
java/openjdk7/demo/jfc/TransparentRuler/TransparentRuler.jar
java/openjdk7/demo/jfc/TransparentRuler/src.zip
java/openjdk7/demo/jni/Poller/Poller.jar
java/openjdk7/demo/jni/Poller/README.txt
java/openjdk7/demo/jni/Poller/lib/libPoller.so
java/openjdk7/demo/jni/Poller/src.zip
java/openjdk7/demo/jpda/com/sun/tools/example/README
java/openjdk7/demo/jpda/examples.jar
java/openjdk7/demo/jpda/src.zip
java/openjdk7/demo/jvmti/compiledMethodLoad/README.txt
java/openjdk7/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
java/openjdk7/demo/jvmti/compiledMethodLoad/src.zip
java/openjdk7/demo/jvmti/gctest/README.txt
java/openjdk7/demo/jvmti/gctest/lib/libgctest.so
java/openjdk7/demo/jvmti/gctest/src.zip
java/openjdk7/demo/jvmti/heapTracker/README.txt
java/openjdk7/demo/jvmti/heapTracker/heapTracker.jar
java/openjdk7/demo/jvmti/heapTracker/lib/libheapTracker.so
java/openjdk7/demo/jvmti/heapTracker/src.zip
java/openjdk7/demo/jvmti/heapViewer/README.txt
java/openjdk7/demo/jvmti/heapViewer/lib/libheapViewer.so
java/openjdk7/demo/jvmti/heapViewer/src.zip
java/openjdk7/demo/jvmti/hprof/README.txt
java/openjdk7/demo/jvmti/hprof/lib/libhprof.so
java/openjdk7/demo/jvmti/hprof/src.zip
java/openjdk7/demo/jvmti/index.html
java/openjdk7/demo/jvmti/minst/README.txt
java/openjdk7/demo/jvmti/minst/lib/libminst.so
java/openjdk7/demo/jvmti/minst/minst.jar
java/openjdk7/demo/jvmti/minst/src.zip
java/openjdk7/demo/jvmti/mtrace/README.txt
java/openjdk7/demo/jvmti/mtrace/lib/libmtrace.so
java/openjdk7/demo/jvmti/mtrace/mtrace.jar
java/openjdk7/demo/jvmti/mtrace/src.zip
java/openjdk7/demo/jvmti/versionCheck/README.txt
java/openjdk7/demo/jvmti/versionCheck/lib/libversionCheck.so
java/openjdk7/demo/jvmti/versionCheck/src.zip
java/openjdk7/demo/jvmti/waiters/README.txt
java/openjdk7/demo/jvmti/waiters/lib/libwaiters.so
java/openjdk7/demo/jvmti/waiters/src.zip
java/openjdk7/demo/management/FullThreadDump/FullThreadDump.jar
java/openjdk7/demo/management/FullThreadDump/README.txt
java/openjdk7/demo/management/FullThreadDump/src.zip
java/openjdk7/demo/management/JTop/JTop.jar
java/openjdk7/demo/management/JTop/README.txt
java/openjdk7/demo/management/JTop/src.zip
java/openjdk7/demo/management/MemoryMonitor/MemoryMonitor.jar
java/openjdk7/demo/management/MemoryMonitor/README.txt
java/openjdk7/demo/management/MemoryMonitor/src.zip
java/openjdk7/demo/management/VerboseGC/README.txt
java/openjdk7/demo/management/VerboseGC/VerboseGC.jar
java/openjdk7/demo/management/VerboseGC/src.zip
java/openjdk7/demo/management/index.html
java/openjdk7/demo/nbproject/README.txt
java/openjdk7/demo/nbproject/jfc/FileChooserDemo/build.properties
java/openjdk7/demo/nbproject/jfc/FileChooserDemo/build.xml
java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/Font2DTest/build.properties
java/openjdk7/demo/nbproject/jfc/Font2DTest/build.xml
java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/Metalworks/build.properties
java/openjdk7/demo/nbproject/jfc/Metalworks/build.xml
java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/Notepad/build.properties
java/openjdk7/demo/nbproject/jfc/Notepad/build.xml
java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/SampleTree/build.properties
java/openjdk7/demo/nbproject/jfc/SampleTree/build.xml
java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/SwingApplet/build.properties
java/openjdk7/demo/nbproject/jfc/SwingApplet/build.xml
java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/TableExample/build.properties
java/openjdk7/demo/nbproject/jfc/TableExample/build.xml
java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/project.xml
java/openjdk7/demo/nbproject/jfc/TransparentRuler/build.properties
java/openjdk7/demo/nbproject/jfc/TransparentRuler/build.xml
java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml
java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml
java/openjdk7/demo/nbproject/management/FullThreadDump/build.properties
java/openjdk7/demo/nbproject/management/FullThreadDump/build.xml
java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml
java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/project.xml
java/openjdk7/demo/nbproject/management/JTop/build.properties
java/openjdk7/demo/nbproject/management/JTop/build.xml
java/openjdk7/demo/nbproject/management/JTop/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/management/JTop/nbproject/jdk.xml
java/openjdk7/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/management/JTop/nbproject/project.xml
java/openjdk7/demo/nbproject/management/MemoryMonitor/build.properties
java/openjdk7/demo/nbproject/management/MemoryMonitor/build.xml
java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml
java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/project.xml
java/openjdk7/demo/nbproject/management/VerboseGC/build.properties
java/openjdk7/demo/nbproject/management/VerboseGC/build.xml
java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/jdk.xml
java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/project.xml
java/openjdk7/demo/nbproject/project.xml
java/openjdk7/demo/nbproject/scripting/jconsole-plugin/build.properties
java/openjdk7/demo/nbproject/scripting/jconsole-plugin/build.xml
java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml
java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml
java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml
java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml
java/openjdk7/demo/nio/zipfs/Demo.java
java/openjdk7/demo/nio/zipfs/README.txt
java/openjdk7/demo/nio/zipfs/src.zip
java/openjdk7/demo/nio/zipfs/zipfs.jar
java/openjdk7/demo/scripting/jconsole-plugin/README.txt
java/openjdk7/demo/scripting/jconsole-plugin/build.xml
java/openjdk7/demo/scripting/jconsole-plugin/jconsole-plugin.jar
java/openjdk7/demo/scripting/jconsole-plugin/src.zip
java/openjdk7/include/classfile_constants.h
java/openjdk7/include/jawt.h
java/openjdk7/include/jdwpTransport.h
java/openjdk7/include/jni.h
java/openjdk7/include/jni_md.h
java/openjdk7/include/jvmti.h
java/openjdk7/include/jvmticmlr.h
java/openjdk7/include/solaris/jawt_md.h
java/openjdk7/include/solaris/jni_md.h
java/openjdk7/jre/ASSEMBLY_EXCEPTION
java/openjdk7/jre/LICENSE
java/openjdk7/jre/THIRD_PARTY_README
java/openjdk7/jre/bin/java
java/openjdk7/jre/bin/keytool
java/openjdk7/jre/bin/orbd
java/openjdk7/jre/bin/pack200
java/openjdk7/jre/bin/policytool
java/openjdk7/jre/bin/rmid
java/openjdk7/jre/bin/rmiregistry
java/openjdk7/jre/bin/servertool
java/openjdk7/jre/bin/tnameserv
java/openjdk7/jre/bin/unpack200
java/openjdk7/jre/lib/applet/.keep
java/openjdk7/jre/lib/calendars.properties
java/openjdk7/jre/lib/charsets.jar
java/openjdk7/jre/lib/classlist
java/openjdk7/jre/lib/cmm/CIEXYZ.pf
java/openjdk7/jre/lib/cmm/GRAY.pf
java/openjdk7/jre/lib/cmm/LINEAR_RGB.pf
java/openjdk7/jre/lib/cmm/PYCC.pf
java/openjdk7/jre/lib/cmm/sRGB.pf
java/openjdk7/jre/lib/content-types.properties
java/openjdk7/jre/lib/currency.data
java/openjdk7/jre/lib/ext/dnsns.jar
java/openjdk7/jre/lib/ext/localedata.jar
java/openjdk7/jre/lib/ext/meta-index
java/openjdk7/jre/lib/ext/sunec.jar
java/openjdk7/jre/lib/ext/sunjce_provider.jar
java/openjdk7/jre/lib/ext/sunpkcs11.jar
java/openjdk7/jre/lib/ext/zipfs.jar
java/openjdk7/jre/lib/flavormap.properties
java/openjdk7/jre/lib/fontconfig.bfc
java/openjdk7/jre/lib/fontconfig.properties.src
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_db.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_db.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_dtrace.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/64/libjvm_dtrace.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/Xusage.txt
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjsig.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjsig.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_db.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_db.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_dtrace.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/client/libjvm_dtrace.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/headless/libmawt.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/jexec
java/openjdk7/jre/lib/${MACHINE_ARCH}/jli/libjli.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/jvm.cfg
java/openjdk7/jre/lib/${MACHINE_ARCH}/libattach.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libattach.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libawt.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libdt_socket.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libdt_socket.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libfontmanager.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libfreetype.so.6
java/openjdk7/jre/lib/${MACHINE_ARCH}/libhprof.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libhprof.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libinstrument.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libinstrument.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2gss.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2pcsc.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libj2pkcs11.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjaas_unix.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjava_crw_demo.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjawt.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjdwp.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjpeg.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsdt.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsdt.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsig.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsig.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libjsound.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/liblcms.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libmanagement.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libmanagement.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libmlib_image.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libnet.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libnio.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libnpt.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libnpt.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/librmi.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libsaproc.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libsaproc.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libsctp.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libsplashscreen.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libsunec.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libunpack.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libverify.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/libverify.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/libzip.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_db.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_db.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_dtrace.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/64/libjvm_dtrace.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/Xusage.txt
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjsig.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjsig.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_db.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_db.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_dtrace.diz
java/openjdk7/jre/lib/${MACHINE_ARCH}/server/libjvm_dtrace.so
java/openjdk7/jre/lib/${MACHINE_ARCH}/xawt/libmawt.so
java/openjdk7/jre/lib/images/cursors/cursors.properties
java/openjdk7/jre/lib/images/cursors/invalid32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_LinkDrop32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_MoveDrop32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
java/openjdk7/jre/lib/jce.jar
java/openjdk7/jre/lib/jsse.jar
java/openjdk7/jre/lib/jvm.hprof.txt
java/openjdk7/jre/lib/logging.properties
java/openjdk7/jre/lib/management-agent.jar
java/openjdk7/jre/lib/management/jmxremote.access
java/openjdk7/jre/lib/management/jmxremote.password.template
java/openjdk7/jre/lib/management/management.properties
java/openjdk7/jre/lib/management/snmp.acl.template
java/openjdk7/jre/lib/meta-index
java/openjdk7/jre/lib/net.properties
java/openjdk7/jre/lib/psfont.properties.ja
java/openjdk7/jre/lib/psfontj2d.properties
java/openjdk7/jre/lib/resources.jar
java/openjdk7/jre/lib/rhino.jar
java/openjdk7/jre/lib/rt.jar
java/openjdk7/jre/lib/sdp/sdp.conf.template
java/openjdk7/jre/lib/security/US_export_policy.jar
java/openjdk7/jre/lib/security/cacerts
java/openjdk7/jre/lib/security/java.policy
java/openjdk7/jre/lib/security/java.security
java/openjdk7/jre/lib/security/local_policy.jar
java/openjdk7/jre/lib/security/sunpkcs11-solaris.cfg
java/openjdk7/jre/lib/servicetag/jdk_header.png
java/openjdk7/jre/lib/sound.properties
java/openjdk7/jre/lib/zi/Africa/Abidjan
java/openjdk7/jre/lib/zi/Africa/Accra
java/openjdk7/jre/lib/zi/Africa/Addis_Ababa
java/openjdk7/jre/lib/zi/Africa/Algiers
java/openjdk7/jre/lib/zi/Africa/Asmara
java/openjdk7/jre/lib/zi/Africa/Bamako
java/openjdk7/jre/lib/zi/Africa/Bangui
java/openjdk7/jre/lib/zi/Africa/Banjul
java/openjdk7/jre/lib/zi/Africa/Bissau
java/openjdk7/jre/lib/zi/Africa/Blantyre
java/openjdk7/jre/lib/zi/Africa/Brazzaville
java/openjdk7/jre/lib/zi/Africa/Bujumbura
java/openjdk7/jre/lib/zi/Africa/Cairo
java/openjdk7/jre/lib/zi/Africa/Casablanca
java/openjdk7/jre/lib/zi/Africa/Ceuta
java/openjdk7/jre/lib/zi/Africa/Conakry
java/openjdk7/jre/lib/zi/Africa/Dakar
java/openjdk7/jre/lib/zi/Africa/Dar_es_Salaam
java/openjdk7/jre/lib/zi/Africa/Djibouti
java/openjdk7/jre/lib/zi/Africa/Douala
java/openjdk7/jre/lib/zi/Africa/El_Aaiun
java/openjdk7/jre/lib/zi/Africa/Freetown
java/openjdk7/jre/lib/zi/Africa/Gaborone
java/openjdk7/jre/lib/zi/Africa/Harare
java/openjdk7/jre/lib/zi/Africa/Johannesburg
java/openjdk7/jre/lib/zi/Africa/Juba
java/openjdk7/jre/lib/zi/Africa/Kampala
java/openjdk7/jre/lib/zi/Africa/Khartoum
java/openjdk7/jre/lib/zi/Africa/Kigali
java/openjdk7/jre/lib/zi/Africa/Kinshasa
java/openjdk7/jre/lib/zi/Africa/Lagos
java/openjdk7/jre/lib/zi/Africa/Libreville
java/openjdk7/jre/lib/zi/Africa/Lome
java/openjdk7/jre/lib/zi/Africa/Luanda
java/openjdk7/jre/lib/zi/Africa/Lubumbashi
java/openjdk7/jre/lib/zi/Africa/Lusaka
java/openjdk7/jre/lib/zi/Africa/Malabo
java/openjdk7/jre/lib/zi/Africa/Maputo
java/openjdk7/jre/lib/zi/Africa/Maseru
java/openjdk7/jre/lib/zi/Africa/Mbabane
java/openjdk7/jre/lib/zi/Africa/Mogadishu
java/openjdk7/jre/lib/zi/Africa/Monrovia
java/openjdk7/jre/lib/zi/Africa/Nairobi
java/openjdk7/jre/lib/zi/Africa/Ndjamena
java/openjdk7/jre/lib/zi/Africa/Niamey
java/openjdk7/jre/lib/zi/Africa/Nouakchott
java/openjdk7/jre/lib/zi/Africa/Ouagadougou
java/openjdk7/jre/lib/zi/Africa/Porto-Novo
java/openjdk7/jre/lib/zi/Africa/Sao_Tome
java/openjdk7/jre/lib/zi/Africa/Tripoli
java/openjdk7/jre/lib/zi/Africa/Tunis
java/openjdk7/jre/lib/zi/Africa/Windhoek
java/openjdk7/jre/lib/zi/America/Adak
java/openjdk7/jre/lib/zi/America/Anchorage
java/openjdk7/jre/lib/zi/America/Anguilla
java/openjdk7/jre/lib/zi/America/Antigua
java/openjdk7/jre/lib/zi/America/Araguaina
java/openjdk7/jre/lib/zi/America/Argentina/Buenos_Aires
java/openjdk7/jre/lib/zi/America/Argentina/Catamarca
java/openjdk7/jre/lib/zi/America/Argentina/Cordoba
java/openjdk7/jre/lib/zi/America/Argentina/Jujuy
java/openjdk7/jre/lib/zi/America/Argentina/La_Rioja
java/openjdk7/jre/lib/zi/America/Argentina/Mendoza
java/openjdk7/jre/lib/zi/America/Argentina/Rio_Gallegos
java/openjdk7/jre/lib/zi/America/Argentina/Salta
java/openjdk7/jre/lib/zi/America/Argentina/San_Juan
java/openjdk7/jre/lib/zi/America/Argentina/San_Luis
java/openjdk7/jre/lib/zi/America/Argentina/Tucuman
java/openjdk7/jre/lib/zi/America/Argentina/Ushuaia
java/openjdk7/jre/lib/zi/America/Aruba
java/openjdk7/jre/lib/zi/America/Asuncion
java/openjdk7/jre/lib/zi/America/Atikokan
java/openjdk7/jre/lib/zi/America/Bahia
java/openjdk7/jre/lib/zi/America/Bahia_Banderas
java/openjdk7/jre/lib/zi/America/Barbados
java/openjdk7/jre/lib/zi/America/Belem
java/openjdk7/jre/lib/zi/America/Belize
java/openjdk7/jre/lib/zi/America/Blanc-Sablon
java/openjdk7/jre/lib/zi/America/Boa_Vista
java/openjdk7/jre/lib/zi/America/Bogota
java/openjdk7/jre/lib/zi/America/Boise
java/openjdk7/jre/lib/zi/America/Cambridge_Bay
java/openjdk7/jre/lib/zi/America/Campo_Grande
java/openjdk7/jre/lib/zi/America/Cancun
java/openjdk7/jre/lib/zi/America/Caracas
java/openjdk7/jre/lib/zi/America/Cayenne
java/openjdk7/jre/lib/zi/America/Cayman
java/openjdk7/jre/lib/zi/America/Chicago
java/openjdk7/jre/lib/zi/America/Chihuahua
java/openjdk7/jre/lib/zi/America/Costa_Rica
java/openjdk7/jre/lib/zi/America/Creston
java/openjdk7/jre/lib/zi/America/Cuiaba
java/openjdk7/jre/lib/zi/America/Curacao
java/openjdk7/jre/lib/zi/America/Danmarkshavn
java/openjdk7/jre/lib/zi/America/Dawson
java/openjdk7/jre/lib/zi/America/Dawson_Creek
java/openjdk7/jre/lib/zi/America/Denver
java/openjdk7/jre/lib/zi/America/Detroit
java/openjdk7/jre/lib/zi/America/Dominica
java/openjdk7/jre/lib/zi/America/Edmonton
java/openjdk7/jre/lib/zi/America/Eirunepe
java/openjdk7/jre/lib/zi/America/El_Salvador
java/openjdk7/jre/lib/zi/America/Fortaleza
java/openjdk7/jre/lib/zi/America/Glace_Bay
java/openjdk7/jre/lib/zi/America/Godthab
java/openjdk7/jre/lib/zi/America/Goose_Bay
java/openjdk7/jre/lib/zi/America/Grand_Turk
java/openjdk7/jre/lib/zi/America/Grenada
java/openjdk7/jre/lib/zi/America/Guadeloupe
java/openjdk7/jre/lib/zi/America/Guatemala
java/openjdk7/jre/lib/zi/America/Guayaquil
java/openjdk7/jre/lib/zi/America/Guyana
java/openjdk7/jre/lib/zi/America/Halifax
java/openjdk7/jre/lib/zi/America/Havana
java/openjdk7/jre/lib/zi/America/Hermosillo
java/openjdk7/jre/lib/zi/America/Indiana/Indianapolis
java/openjdk7/jre/lib/zi/America/Indiana/Knox
java/openjdk7/jre/lib/zi/America/Indiana/Marengo
java/openjdk7/jre/lib/zi/America/Indiana/Petersburg
java/openjdk7/jre/lib/zi/America/Indiana/Tell_City
java/openjdk7/jre/lib/zi/America/Indiana/Vevay
java/openjdk7/jre/lib/zi/America/Indiana/Vincennes
java/openjdk7/jre/lib/zi/America/Indiana/Winamac
java/openjdk7/jre/lib/zi/America/Inuvik
java/openjdk7/jre/lib/zi/America/Iqaluit
java/openjdk7/jre/lib/zi/America/Jamaica
java/openjdk7/jre/lib/zi/America/Juneau
java/openjdk7/jre/lib/zi/America/Kentucky/Louisville
java/openjdk7/jre/lib/zi/America/Kentucky/Monticello
java/openjdk7/jre/lib/zi/America/La_Paz
java/openjdk7/jre/lib/zi/America/Lima
java/openjdk7/jre/lib/zi/America/Los_Angeles
java/openjdk7/jre/lib/zi/America/Maceio
java/openjdk7/jre/lib/zi/America/Managua
java/openjdk7/jre/lib/zi/America/Manaus
java/openjdk7/jre/lib/zi/America/Martinique
java/openjdk7/jre/lib/zi/America/Matamoros
java/openjdk7/jre/lib/zi/America/Mazatlan
java/openjdk7/jre/lib/zi/America/Menominee
java/openjdk7/jre/lib/zi/America/Merida
java/openjdk7/jre/lib/zi/America/Metlakatla
java/openjdk7/jre/lib/zi/America/Mexico_City
java/openjdk7/jre/lib/zi/America/Miquelon
java/openjdk7/jre/lib/zi/America/Moncton
java/openjdk7/jre/lib/zi/America/Monterrey
java/openjdk7/jre/lib/zi/America/Montevideo
java/openjdk7/jre/lib/zi/America/Montreal
java/openjdk7/jre/lib/zi/America/Montserrat
java/openjdk7/jre/lib/zi/America/Nassau
java/openjdk7/jre/lib/zi/America/New_York
java/openjdk7/jre/lib/zi/America/Nipigon
java/openjdk7/jre/lib/zi/America/Nome
java/openjdk7/jre/lib/zi/America/Noronha
java/openjdk7/jre/lib/zi/America/North_Dakota/Beulah
java/openjdk7/jre/lib/zi/America/North_Dakota/Center
java/openjdk7/jre/lib/zi/America/North_Dakota/New_Salem
java/openjdk7/jre/lib/zi/America/Ojinaga
java/openjdk7/jre/lib/zi/America/Panama
java/openjdk7/jre/lib/zi/America/Pangnirtung
java/openjdk7/jre/lib/zi/America/Paramaribo
java/openjdk7/jre/lib/zi/America/Phoenix
java/openjdk7/jre/lib/zi/America/Port-au-Prince
java/openjdk7/jre/lib/zi/America/Port_of_Spain
java/openjdk7/jre/lib/zi/America/Porto_Velho
java/openjdk7/jre/lib/zi/America/Puerto_Rico
java/openjdk7/jre/lib/zi/America/Rainy_River
java/openjdk7/jre/lib/zi/America/Rankin_Inlet
java/openjdk7/jre/lib/zi/America/Recife
java/openjdk7/jre/lib/zi/America/Regina
java/openjdk7/jre/lib/zi/America/Resolute
java/openjdk7/jre/lib/zi/America/Rio_Branco
java/openjdk7/jre/lib/zi/America/Santa_Isabel
java/openjdk7/jre/lib/zi/America/Santarem
java/openjdk7/jre/lib/zi/America/Santiago
java/openjdk7/jre/lib/zi/America/Santo_Domingo
java/openjdk7/jre/lib/zi/America/Sao_Paulo
java/openjdk7/jre/lib/zi/America/Scoresbysund
java/openjdk7/jre/lib/zi/America/Sitka
java/openjdk7/jre/lib/zi/America/St_Johns
java/openjdk7/jre/lib/zi/America/St_Kitts
java/openjdk7/jre/lib/zi/America/St_Lucia
java/openjdk7/jre/lib/zi/America/St_Thomas
java/openjdk7/jre/lib/zi/America/St_Vincent
java/openjdk7/jre/lib/zi/America/Swift_Current
java/openjdk7/jre/lib/zi/America/Tegucigalpa
java/openjdk7/jre/lib/zi/America/Thule
java/openjdk7/jre/lib/zi/America/Thunder_Bay
java/openjdk7/jre/lib/zi/America/Tijuana
java/openjdk7/jre/lib/zi/America/Toronto
java/openjdk7/jre/lib/zi/America/Tortola
java/openjdk7/jre/lib/zi/America/Vancouver
java/openjdk7/jre/lib/zi/America/Whitehorse
java/openjdk7/jre/lib/zi/America/Winnipeg
java/openjdk7/jre/lib/zi/America/Yakutat
java/openjdk7/jre/lib/zi/America/Yellowknife
java/openjdk7/jre/lib/zi/Antarctica/Casey
java/openjdk7/jre/lib/zi/Antarctica/Davis
java/openjdk7/jre/lib/zi/Antarctica/DumontDUrville
java/openjdk7/jre/lib/zi/Antarctica/Macquarie
java/openjdk7/jre/lib/zi/Antarctica/Mawson
java/openjdk7/jre/lib/zi/Antarctica/McMurdo
java/openjdk7/jre/lib/zi/Antarctica/Palmer
java/openjdk7/jre/lib/zi/Antarctica/Rothera
java/openjdk7/jre/lib/zi/Antarctica/Syowa
java/openjdk7/jre/lib/zi/Antarctica/Vostok
java/openjdk7/jre/lib/zi/Asia/Aden
java/openjdk7/jre/lib/zi/Asia/Almaty
java/openjdk7/jre/lib/zi/Asia/Amman
java/openjdk7/jre/lib/zi/Asia/Anadyr
java/openjdk7/jre/lib/zi/Asia/Aqtau
java/openjdk7/jre/lib/zi/Asia/Aqtobe
java/openjdk7/jre/lib/zi/Asia/Ashgabat
java/openjdk7/jre/lib/zi/Asia/Baghdad
java/openjdk7/jre/lib/zi/Asia/Bahrain
java/openjdk7/jre/lib/zi/Asia/Baku
java/openjdk7/jre/lib/zi/Asia/Bangkok
java/openjdk7/jre/lib/zi/Asia/Beirut
java/openjdk7/jre/lib/zi/Asia/Bishkek
java/openjdk7/jre/lib/zi/Asia/Brunei
java/openjdk7/jre/lib/zi/Asia/Choibalsan
java/openjdk7/jre/lib/zi/Asia/Chongqing
java/openjdk7/jre/lib/zi/Asia/Colombo
java/openjdk7/jre/lib/zi/Asia/Damascus
java/openjdk7/jre/lib/zi/Asia/Dhaka
java/openjdk7/jre/lib/zi/Asia/Dili
java/openjdk7/jre/lib/zi/Asia/Dubai
java/openjdk7/jre/lib/zi/Asia/Dushanbe
java/openjdk7/jre/lib/zi/Asia/Gaza
java/openjdk7/jre/lib/zi/Asia/Harbin
java/openjdk7/jre/lib/zi/Asia/Hebron
java/openjdk7/jre/lib/zi/Asia/Ho_Chi_Minh
java/openjdk7/jre/lib/zi/Asia/Hong_Kong
java/openjdk7/jre/lib/zi/Asia/Hovd
java/openjdk7/jre/lib/zi/Asia/Irkutsk
java/openjdk7/jre/lib/zi/Asia/Jakarta
java/openjdk7/jre/lib/zi/Asia/Jayapura
java/openjdk7/jre/lib/zi/Asia/Jerusalem
java/openjdk7/jre/lib/zi/Asia/Kabul
java/openjdk7/jre/lib/zi/Asia/Kamchatka
java/openjdk7/jre/lib/zi/Asia/Karachi
java/openjdk7/jre/lib/zi/Asia/Kashgar
java/openjdk7/jre/lib/zi/Asia/Kathmandu
java/openjdk7/jre/lib/zi/Asia/Kolkata
java/openjdk7/jre/lib/zi/Asia/Krasnoyarsk
java/openjdk7/jre/lib/zi/Asia/Kuala_Lumpur
java/openjdk7/jre/lib/zi/Asia/Kuching
java/openjdk7/jre/lib/zi/Asia/Kuwait
java/openjdk7/jre/lib/zi/Asia/Macau
java/openjdk7/jre/lib/zi/Asia/Magadan
java/openjdk7/jre/lib/zi/Asia/Makassar
java/openjdk7/jre/lib/zi/Asia/Manila
java/openjdk7/jre/lib/zi/Asia/Muscat
java/openjdk7/jre/lib/zi/Asia/Nicosia
java/openjdk7/jre/lib/zi/Asia/Novokuznetsk
java/openjdk7/jre/lib/zi/Asia/Novosibirsk
java/openjdk7/jre/lib/zi/Asia/Omsk
java/openjdk7/jre/lib/zi/Asia/Oral
java/openjdk7/jre/lib/zi/Asia/Phnom_Penh
java/openjdk7/jre/lib/zi/Asia/Pontianak
java/openjdk7/jre/lib/zi/Asia/Pyongyang
java/openjdk7/jre/lib/zi/Asia/Qatar
java/openjdk7/jre/lib/zi/Asia/Qyzylorda
java/openjdk7/jre/lib/zi/Asia/Rangoon
java/openjdk7/jre/lib/zi/Asia/Riyadh
java/openjdk7/jre/lib/zi/Asia/Riyadh87
java/openjdk7/jre/lib/zi/Asia/Riyadh88
java/openjdk7/jre/lib/zi/Asia/Riyadh89
java/openjdk7/jre/lib/zi/Asia/Sakhalin
java/openjdk7/jre/lib/zi/Asia/Samarkand
java/openjdk7/jre/lib/zi/Asia/Seoul
java/openjdk7/jre/lib/zi/Asia/Shanghai
java/openjdk7/jre/lib/zi/Asia/Singapore
java/openjdk7/jre/lib/zi/Asia/Taipei
java/openjdk7/jre/lib/zi/Asia/Tashkent
java/openjdk7/jre/lib/zi/Asia/Tbilisi
java/openjdk7/jre/lib/zi/Asia/Tehran
java/openjdk7/jre/lib/zi/Asia/Thimphu
java/openjdk7/jre/lib/zi/Asia/Tokyo
java/openjdk7/jre/lib/zi/Asia/Ulaanbaatar
java/openjdk7/jre/lib/zi/Asia/Urumqi
java/openjdk7/jre/lib/zi/Asia/Vientiane
java/openjdk7/jre/lib/zi/Asia/Vladivostok
java/openjdk7/jre/lib/zi/Asia/Yakutsk
java/openjdk7/jre/lib/zi/Asia/Yekaterinburg
java/openjdk7/jre/lib/zi/Asia/Yerevan
java/openjdk7/jre/lib/zi/Atlantic/Azores
java/openjdk7/jre/lib/zi/Atlantic/Bermuda
java/openjdk7/jre/lib/zi/Atlantic/Canary
java/openjdk7/jre/lib/zi/Atlantic/Cape_Verde
java/openjdk7/jre/lib/zi/Atlantic/Faroe
java/openjdk7/jre/lib/zi/Atlantic/Madeira
java/openjdk7/jre/lib/zi/Atlantic/Reykjavik
java/openjdk7/jre/lib/zi/Atlantic/South_Georgia
java/openjdk7/jre/lib/zi/Atlantic/St_Helena
java/openjdk7/jre/lib/zi/Atlantic/Stanley
java/openjdk7/jre/lib/zi/Australia/Adelaide
java/openjdk7/jre/lib/zi/Australia/Brisbane
java/openjdk7/jre/lib/zi/Australia/Broken_Hill
java/openjdk7/jre/lib/zi/Australia/Currie
java/openjdk7/jre/lib/zi/Australia/Darwin
java/openjdk7/jre/lib/zi/Australia/Eucla
java/openjdk7/jre/lib/zi/Australia/Hobart
java/openjdk7/jre/lib/zi/Australia/Lindeman
java/openjdk7/jre/lib/zi/Australia/Lord_Howe
java/openjdk7/jre/lib/zi/Australia/Melbourne
java/openjdk7/jre/lib/zi/Australia/Perth
java/openjdk7/jre/lib/zi/Australia/Sydney
java/openjdk7/jre/lib/zi/CET
java/openjdk7/jre/lib/zi/CST6CDT
java/openjdk7/jre/lib/zi/EET
java/openjdk7/jre/lib/zi/EST
java/openjdk7/jre/lib/zi/EST5EDT
java/openjdk7/jre/lib/zi/Etc/GMT
java/openjdk7/jre/lib/zi/Etc/GMT+1
java/openjdk7/jre/lib/zi/Etc/GMT+10
java/openjdk7/jre/lib/zi/Etc/GMT+11
java/openjdk7/jre/lib/zi/Etc/GMT+12
java/openjdk7/jre/lib/zi/Etc/GMT+2
java/openjdk7/jre/lib/zi/Etc/GMT+3
java/openjdk7/jre/lib/zi/Etc/GMT+4
java/openjdk7/jre/lib/zi/Etc/GMT+5
java/openjdk7/jre/lib/zi/Etc/GMT+6
java/openjdk7/jre/lib/zi/Etc/GMT+7
java/openjdk7/jre/lib/zi/Etc/GMT+8
java/openjdk7/jre/lib/zi/Etc/GMT+9
java/openjdk7/jre/lib/zi/Etc/GMT-1
java/openjdk7/jre/lib/zi/Etc/GMT-10
java/openjdk7/jre/lib/zi/Etc/GMT-11
java/openjdk7/jre/lib/zi/Etc/GMT-12
java/openjdk7/jre/lib/zi/Etc/GMT-13
java/openjdk7/jre/lib/zi/Etc/GMT-14
java/openjdk7/jre/lib/zi/Etc/GMT-2
java/openjdk7/jre/lib/zi/Etc/GMT-3
java/openjdk7/jre/lib/zi/Etc/GMT-4
java/openjdk7/jre/lib/zi/Etc/GMT-5
java/openjdk7/jre/lib/zi/Etc/GMT-6
java/openjdk7/jre/lib/zi/Etc/GMT-7
java/openjdk7/jre/lib/zi/Etc/GMT-8
java/openjdk7/jre/lib/zi/Etc/GMT-9
java/openjdk7/jre/lib/zi/Etc/UCT
java/openjdk7/jre/lib/zi/Etc/UTC
java/openjdk7/jre/lib/zi/Europe/Amsterdam
java/openjdk7/jre/lib/zi/Europe/Andorra
java/openjdk7/jre/lib/zi/Europe/Athens
java/openjdk7/jre/lib/zi/Europe/Belgrade
java/openjdk7/jre/lib/zi/Europe/Berlin
java/openjdk7/jre/lib/zi/Europe/Brussels
java/openjdk7/jre/lib/zi/Europe/Bucharest
java/openjdk7/jre/lib/zi/Europe/Budapest
java/openjdk7/jre/lib/zi/Europe/Chisinau
java/openjdk7/jre/lib/zi/Europe/Copenhagen
java/openjdk7/jre/lib/zi/Europe/Dublin
java/openjdk7/jre/lib/zi/Europe/Gibraltar
java/openjdk7/jre/lib/zi/Europe/Helsinki
java/openjdk7/jre/lib/zi/Europe/Istanbul
java/openjdk7/jre/lib/zi/Europe/Kaliningrad
java/openjdk7/jre/lib/zi/Europe/Kiev
java/openjdk7/jre/lib/zi/Europe/Lisbon
java/openjdk7/jre/lib/zi/Europe/London
java/openjdk7/jre/lib/zi/Europe/Luxembourg
java/openjdk7/jre/lib/zi/Europe/Madrid
java/openjdk7/jre/lib/zi/Europe/Malta
java/openjdk7/jre/lib/zi/Europe/Minsk
java/openjdk7/jre/lib/zi/Europe/Monaco
java/openjdk7/jre/lib/zi/Europe/Moscow
java/openjdk7/jre/lib/zi/Europe/Oslo
java/openjdk7/jre/lib/zi/Europe/Paris
java/openjdk7/jre/lib/zi/Europe/Prague
java/openjdk7/jre/lib/zi/Europe/Riga
java/openjdk7/jre/lib/zi/Europe/Rome
java/openjdk7/jre/lib/zi/Europe/Samara
java/openjdk7/jre/lib/zi/Europe/Simferopol
java/openjdk7/jre/lib/zi/Europe/Sofia
java/openjdk7/jre/lib/zi/Europe/Stockholm
java/openjdk7/jre/lib/zi/Europe/Tallinn
java/openjdk7/jre/lib/zi/Europe/Tirane
java/openjdk7/jre/lib/zi/Europe/Uzhgorod
java/openjdk7/jre/lib/zi/Europe/Vaduz
java/openjdk7/jre/lib/zi/Europe/Vienna
java/openjdk7/jre/lib/zi/Europe/Vilnius
java/openjdk7/jre/lib/zi/Europe/Volgograd
java/openjdk7/jre/lib/zi/Europe/Warsaw
java/openjdk7/jre/lib/zi/Europe/Zaporozhye
java/openjdk7/jre/lib/zi/Europe/Zurich
java/openjdk7/jre/lib/zi/GMT
java/openjdk7/jre/lib/zi/HST
java/openjdk7/jre/lib/zi/Indian/Antananarivo
java/openjdk7/jre/lib/zi/Indian/Chagos
java/openjdk7/jre/lib/zi/Indian/Christmas
java/openjdk7/jre/lib/zi/Indian/Cocos
java/openjdk7/jre/lib/zi/Indian/Comoro
java/openjdk7/jre/lib/zi/Indian/Kerguelen
java/openjdk7/jre/lib/zi/Indian/Mahe
java/openjdk7/jre/lib/zi/Indian/Maldives
java/openjdk7/jre/lib/zi/Indian/Mauritius
java/openjdk7/jre/lib/zi/Indian/Mayotte
java/openjdk7/jre/lib/zi/Indian/Reunion
java/openjdk7/jre/lib/zi/MET
java/openjdk7/jre/lib/zi/MST
java/openjdk7/jre/lib/zi/MST7MDT
java/openjdk7/jre/lib/zi/PST8PDT
java/openjdk7/jre/lib/zi/Pacific/Apia
java/openjdk7/jre/lib/zi/Pacific/Auckland
java/openjdk7/jre/lib/zi/Pacific/Chatham
java/openjdk7/jre/lib/zi/Pacific/Chuuk
java/openjdk7/jre/lib/zi/Pacific/Easter
java/openjdk7/jre/lib/zi/Pacific/Efate
java/openjdk7/jre/lib/zi/Pacific/Enderbury
java/openjdk7/jre/lib/zi/Pacific/Fakaofo
java/openjdk7/jre/lib/zi/Pacific/Fiji
java/openjdk7/jre/lib/zi/Pacific/Funafuti
java/openjdk7/jre/lib/zi/Pacific/Galapagos
java/openjdk7/jre/lib/zi/Pacific/Gambier
java/openjdk7/jre/lib/zi/Pacific/Guadalcanal
java/openjdk7/jre/lib/zi/Pacific/Guam
java/openjdk7/jre/lib/zi/Pacific/Honolulu
java/openjdk7/jre/lib/zi/Pacific/Johnston
java/openjdk7/jre/lib/zi/Pacific/Kiritimati
java/openjdk7/jre/lib/zi/Pacific/Kosrae
java/openjdk7/jre/lib/zi/Pacific/Kwajalein
java/openjdk7/jre/lib/zi/Pacific/Majuro
java/openjdk7/jre/lib/zi/Pacific/Marquesas
java/openjdk7/jre/lib/zi/Pacific/Midway
java/openjdk7/jre/lib/zi/Pacific/Nauru
java/openjdk7/jre/lib/zi/Pacific/Niue
java/openjdk7/jre/lib/zi/Pacific/Norfolk
java/openjdk7/jre/lib/zi/Pacific/Noumea
java/openjdk7/jre/lib/zi/Pacific/Pago_Pago
java/openjdk7/jre/lib/zi/Pacific/Palau
java/openjdk7/jre/lib/zi/Pacific/Pitcairn
java/openjdk7/jre/lib/zi/Pacific/Pohnpei
java/openjdk7/jre/lib/zi/Pacific/Port_Moresby
java/openjdk7/jre/lib/zi/Pacific/Rarotonga
java/openjdk7/jre/lib/zi/Pacific/Saipan
java/openjdk7/jre/lib/zi/Pacific/Tahiti
java/openjdk7/jre/lib/zi/Pacific/Tarawa
java/openjdk7/jre/lib/zi/Pacific/Tongatapu
java/openjdk7/jre/lib/zi/Pacific/Wake
java/openjdk7/jre/lib/zi/Pacific/Wallis
java/openjdk7/jre/lib/zi/SystemV/AST4
java/openjdk7/jre/lib/zi/SystemV/AST4ADT
java/openjdk7/jre/lib/zi/SystemV/CST6
java/openjdk7/jre/lib/zi/SystemV/CST6CDT
java/openjdk7/jre/lib/zi/SystemV/EST5
java/openjdk7/jre/lib/zi/SystemV/EST5EDT
java/openjdk7/jre/lib/zi/SystemV/HST10
java/openjdk7/jre/lib/zi/SystemV/MST7
java/openjdk7/jre/lib/zi/SystemV/MST7MDT
java/openjdk7/jre/lib/zi/SystemV/PST8
java/openjdk7/jre/lib/zi/SystemV/PST8PDT
java/openjdk7/jre/lib/zi/SystemV/YST9
java/openjdk7/jre/lib/zi/SystemV/YST9YDT
java/openjdk7/jre/lib/zi/WET
java/openjdk7/jre/lib/zi/ZoneInfoMappings
java/openjdk7/lib/ct.sym
java/openjdk7/lib/ir.idl
java/openjdk7/lib/jconsole.jar
java/openjdk7/lib/orb.idl
java/openjdk7/lib/sa-jdi.jar
java/openjdk7/lib/tools.jar
java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
java/openjdk7/man/ja_JP.UTF-8/man1/apt.1
java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
java/openjdk7/man/ja_JP.UTF-8/man1/jar.1
java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1
java/openjdk7/man/ja_JP.UTF-8/man1/java.1
java/openjdk7/man/ja_JP.UTF-8/man1/javac.1
java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1
java/openjdk7/man/ja_JP.UTF-8/man1/javah.1
java/openjdk7/man/ja_JP.UTF-8/man1/javap.1
java/openjdk7/man/ja_JP.UTF-8/man1/jcmd.1
java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1
java/openjdk7/man/ja_JP.UTF-8/man1/jdb.1
java/openjdk7/man/ja_JP.UTF-8/man1/jhat.1
java/openjdk7/man/ja_JP.UTF-8/man1/jinfo.1
java/openjdk7/man/ja_JP.UTF-8/man1/jmap.1
java/openjdk7/man/ja_JP.UTF-8/man1/jps.1
java/openjdk7/man/ja_JP.UTF-8/man1/jrunscript.1
java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1
java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1
java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1
java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1
java/openjdk7/man/ja_JP.UTF-8/man1/jvisualvm.1
java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1
java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1
java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1
java/openjdk7/man/ja_JP.UTF-8/man1/pack200.1
java/openjdk7/man/ja_JP.UTF-8/man1/policytool.1
java/openjdk7/man/ja_JP.UTF-8/man1/rmic.1
java/openjdk7/man/ja_JP.UTF-8/man1/rmid.1
java/openjdk7/man/ja_JP.UTF-8/man1/rmiregistry.1
java/openjdk7/man/ja_JP.UTF-8/man1/schemagen.1
java/openjdk7/man/ja_JP.UTF-8/man1/serialver.1
java/openjdk7/man/ja_JP.UTF-8/man1/servertool.1
java/openjdk7/man/ja_JP.UTF-8/man1/tnameserv.1
java/openjdk7/man/ja_JP.UTF-8/man1/unpack200.1
java/openjdk7/man/ja_JP.UTF-8/man1/wsgen.1
java/openjdk7/man/ja_JP.UTF-8/man1/wsimport.1
java/openjdk7/man/ja_JP.UTF-8/man1/xjc.1
java/openjdk7/man/man1/appletviewer.1
java/openjdk7/man/man1/apt.1
java/openjdk7/man/man1/extcheck.1
java/openjdk7/man/man1/idlj.1
java/openjdk7/man/man1/jar.1
java/openjdk7/man/man1/jarsigner.1
java/openjdk7/man/man1/java.1
java/openjdk7/man/man1/javac.1
java/openjdk7/man/man1/javadoc.1
java/openjdk7/man/man1/javah.1
java/openjdk7/man/man1/javap.1
java/openjdk7/man/man1/jcmd.1
java/openjdk7/man/man1/jconsole.1
java/openjdk7/man/man1/jdb.1
java/openjdk7/man/man1/jhat.1
java/openjdk7/man/man1/jinfo.1
java/openjdk7/man/man1/jmap.1
java/openjdk7/man/man1/jps.1
java/openjdk7/man/man1/jrunscript.1
java/openjdk7/man/man1/jsadebugd.1
java/openjdk7/man/man1/jstack.1
java/openjdk7/man/man1/jstat.1
java/openjdk7/man/man1/jstatd.1
java/openjdk7/man/man1/jvisualvm.1
java/openjdk7/man/man1/keytool.1
java/openjdk7/man/man1/native2ascii.1
java/openjdk7/man/man1/orbd.1
java/openjdk7/man/man1/pack200.1
java/openjdk7/man/man1/policytool.1
java/openjdk7/man/man1/rmic.1
java/openjdk7/man/man1/rmid.1
java/openjdk7/man/man1/rmiregistry.1
java/openjdk7/man/man1/schemagen.1
java/openjdk7/man/man1/serialver.1
java/openjdk7/man/man1/servertool.1
java/openjdk7/man/man1/tnameserv.1
java/openjdk7/man/man1/unpack200.1
java/openjdk7/man/man1/wsgen.1
java/openjdk7/man/man1/wsimport.1
java/openjdk7/man/man1/xjc.1
java/openjdk7/release
java/openjdk7/sample/README
java/openjdk7/sample/dtrace/README.txt
java/openjdk7/sample/dtrace/helpers/dtrace_helper.d
java/openjdk7/sample/dtrace/hotspot/README.txt
java/openjdk7/sample/dtrace/hotspot/class_loading_stat.d
java/openjdk7/sample/dtrace/hotspot/gc_time_stat.d
java/openjdk7/sample/dtrace/hotspot/hotspot_calls_tree.d
java/openjdk7/sample/dtrace/hotspot/method_compile_stat.d
java/openjdk7/sample/dtrace/hotspot/method_invocation_stat.d
java/openjdk7/sample/dtrace/hotspot/method_invocation_stat_filter.d
java/openjdk7/sample/dtrace/hotspot/method_invocation_tree.d
java/openjdk7/sample/dtrace/hotspot/monitors.d
java/openjdk7/sample/dtrace/hotspot/object_allocation_stat.d
java/openjdk7/sample/dtrace/hotspot_jni/CriticalSection.d
java/openjdk7/sample/dtrace/hotspot_jni/CriticalSection_slow.d
java/openjdk7/sample/dtrace/hotspot_jni/README.txt
java/openjdk7/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d
java/openjdk7/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d
java/openjdk7/sample/forkjoin/mergesort/MergeDemo.java
java/openjdk7/sample/forkjoin/mergesort/MergeSort.java
java/openjdk7/sample/jmx/jmx-scandir/build.properties
java/openjdk7/sample/jmx/jmx-scandir/build.xml
java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg
java/openjdk7/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg
java/openjdk7/sample/jmx/jmx-scandir/index.html
java/openjdk7/sample/jmx/jmx-scandir/keystore
java/openjdk7/sample/jmx/jmx-scandir/logging.properties
java/openjdk7/sample/jmx/jmx-scandir/manifest.mf
java/openjdk7/sample/jmx/jmx-scandir/nbproject/file-targets.xml
java/openjdk7/sample/jmx/jmx-scandir/nbproject/jdk.xml
java/openjdk7/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml
java/openjdk7/sample/jmx/jmx-scandir/nbproject/project.xml
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html
java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html
java/openjdk7/sample/jmx/jmx-scandir/src/etc/access.properties
java/openjdk7/sample/jmx/jmx-scandir/src/etc/management.properties
java/openjdk7/sample/jmx/jmx-scandir/src/etc/password.properties
java/openjdk7/sample/jmx/jmx-scandir/src/etc/testconfig.xml
java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java
java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java
java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java
java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java
java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java
java/openjdk7/sample/jmx/jmx-scandir/truststore
java/openjdk7/sample/nbproject/project.xml
java/openjdk7/sample/nio/chatserver/ChatServer.java
java/openjdk7/sample/nio/chatserver/Client.java
java/openjdk7/sample/nio/chatserver/ClientReader.java
java/openjdk7/sample/nio/chatserver/DataReader.java
java/openjdk7/sample/nio/chatserver/MessageReader.java
java/openjdk7/sample/nio/chatserver/NameReader.java
java/openjdk7/sample/nio/chatserver/README.txt
java/openjdk7/sample/nio/file/AclEdit.java
java/openjdk7/sample/nio/file/Chmod.java
java/openjdk7/sample/nio/file/Copy.java
java/openjdk7/sample/nio/file/DiskUsage.java
java/openjdk7/sample/nio/file/FileType.java
java/openjdk7/sample/nio/file/WatchDir.java
java/openjdk7/sample/nio/file/Xdd.java
java/openjdk7/sample/nio/multicast/MulticastAddress.java
java/openjdk7/sample/nio/multicast/Reader.java
java/openjdk7/sample/nio/multicast/Sender.java
java/openjdk7/sample/nio/server/AcceptHandler.java
java/openjdk7/sample/nio/server/Acceptor.java
java/openjdk7/sample/nio/server/B1.java
java/openjdk7/sample/nio/server/BN.java
java/openjdk7/sample/nio/server/BP.java
java/openjdk7/sample/nio/server/ChannelIO.java
java/openjdk7/sample/nio/server/ChannelIOSecure.java
java/openjdk7/sample/nio/server/Content.java
java/openjdk7/sample/nio/server/Dispatcher.java
java/openjdk7/sample/nio/server/Dispatcher1.java
java/openjdk7/sample/nio/server/DispatcherN.java
java/openjdk7/sample/nio/server/FileContent.java
java/openjdk7/sample/nio/server/Handler.java
java/openjdk7/sample/nio/server/MalformedRequestException.java
java/openjdk7/sample/nio/server/N1.java
java/openjdk7/sample/nio/server/N2.java
java/openjdk7/sample/nio/server/README.txt
java/openjdk7/sample/nio/server/Reply.java
java/openjdk7/sample/nio/server/Request.java
java/openjdk7/sample/nio/server/RequestHandler.java
java/openjdk7/sample/nio/server/RequestServicer.java
java/openjdk7/sample/nio/server/Sendable.java
java/openjdk7/sample/nio/server/Server.java
java/openjdk7/sample/nio/server/StringContent.java
java/openjdk7/sample/nio/server/URLDumper.java
java/openjdk7/sample/scripting/scriptpad/README.txt
java/openjdk7/sample/scripting/scriptpad/build.properties
java/openjdk7/sample/scripting/scriptpad/build.xml
java/openjdk7/sample/scripting/scriptpad/nbproject/file-targets.xml
java/openjdk7/sample/scripting/scriptpad/nbproject/jdk.xml
java/openjdk7/sample/scripting/scriptpad/nbproject/netbeans-targets.xml
java/openjdk7/sample/scripting/scriptpad/nbproject/project.xml
java/openjdk7/sample/scripting/scriptpad/src/META-INF/manifest.mf
java/openjdk7/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java
java/openjdk7/sample/scripting/scriptpad/src/resources/Main.js
java/openjdk7/sample/scripting/scriptpad/src/resources/conc.js
java/openjdk7/sample/scripting/scriptpad/src/resources/gui.js
java/openjdk7/sample/scripting/scriptpad/src/resources/mm.js
java/openjdk7/sample/scripting/scriptpad/src/resources/scriptpad.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/README.txt
java/openjdk7/sample/scripting/scriptpad/src/scripts/browse.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/insertfile.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/linewrap.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/mail.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/memmonitor.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/memory.bat
java/openjdk7/sample/scripting/scriptpad/src/scripts/memory.js
java/openjdk7/sample/scripting/scriptpad/src/scripts/memory.sh
java/openjdk7/sample/scripting/scriptpad/src/scripts/textcolor.js
java/openjdk7/src.zip
cvs diff -r1.7 -r1.8 pkgsrc/lang/openjdk7/Attic/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/bootstrap.mk 2012/05/16 08:55:45 1.7
+++ pkgsrc/lang/openjdk7/Attic/bootstrap.mk 2013/06/15 09:31:05 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: bootstrap.mk,v 1.7 2012/05/16 08:55:45 marino Exp $ 1# $NetBSD: bootstrap.mk,v 1.8 2013/06/15 09:31:05 jperkin Exp $
2 2
3ONLY_FOR_PLATFORM= NetBSD-[56].*-i386 NetBSD-[56].*-x86_64 3ONLY_FOR_PLATFORM= NetBSD-[56].*-i386 NetBSD-[56].*-x86_64
4ONLY_FOR_PLATFORM+= DragonFly-[23].*-* 4ONLY_FOR_PLATFORM+= DragonFly-[23].*-* SunOS-*-*
5 5
6BOOT.nb5-i386= bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2 6BOOT.nb5-i386= bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2
7BOOT.nb5-amd64= bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2 7BOOT.nb5-amd64= bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2
8BOOT.nb6-i386= bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2 8BOOT.nb6-i386= bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2
9BOOT.nb6-amd64= bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2 9BOOT.nb6-amd64= bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2
10BOOT.df213-i386= bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz 10BOOT.df213-i386= bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz
11# 1.7 partial bootstrap: 11# 1.7 partial bootstrap:
12BOOT.df213-amd64= bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz 12BOOT.df213-amd64= bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz
13BOOT.common-20110811= bootstrap-jdk7-bin-common-20110811.tar.bz2 13BOOT.common-20110811= bootstrap-jdk7-bin-common-20110811.tar.bz2
14 14
15.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo) 15.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
16DISTFILES+= ${BOOT.nb5-i386} 16DISTFILES+= ${BOOT.nb5-i386}
17EXTRACT_ONLY+= ${BOOT.nb5-i386} 17EXTRACT_ONLY+= ${BOOT.nb5-i386}
@@ -43,14 +43,20 @@ EXTRACT_ONLY+= ${BOOT.df213-i386} @@ -43,14 +43,20 @@ EXTRACT_ONLY+= ${BOOT.df213-i386}
43.endif 43.endif
44 44
45.if !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64) || make(distinfo) 45.if !empty(MACHINE_PLATFORM:MDragonFly-*-x86_64) || make(distinfo)
46MASTER_SITES+= http://dl.wolfpond.org/openjdk7/ 46MASTER_SITES+= http://dl.wolfpond.org/openjdk7/
47DISTFILES+= ${BOOT.df213-amd64} 47DISTFILES+= ${BOOT.df213-amd64}
48EXTRACT_ONLY+= ${BOOT.df213-amd64} 48EXTRACT_ONLY+= ${BOOT.df213-amd64}
49.endif 49.endif
50 50
51.if !empty(DISTFILES:M*20110811*) || make(distinfo) 51.if !empty(DISTFILES:M*20110811*) || make(distinfo)
52DISTFILES+= ${BOOT.common-20110811} 52DISTFILES+= ${BOOT.common-20110811}
53EXTRACT_ONLY+= ${BOOT.common-20110811} 53EXTRACT_ONLY+= ${BOOT.common-20110811}
54.endif 54.endif
55 55
 56.if ${OPSYS} == "SunOS"
 57BUILD_DEPENDS+= sun-jdk7-[0-9]*:../../lang/sun-jdk7
 58JDK_BOOTDIR= ${PREFIX}/java/sun-7
 59MAKE_ENV+= ALT_JDK_IMPORT_PATH=${JDK_BOOTDIR}
 60.endif
 61
56ALT_BOOTDIR= ${WRKDIR}/bootstrap 62ALT_BOOTDIR= ${WRKDIR}/bootstrap
cvs diff -r1.23 -r1.24 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2013/06/05 12:05:19 1.23
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2013/06/15 09:31:05 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.23 2013/06/05 12:05:19 obache Exp $ 1$NetBSD: distinfo,v 1.24 2013/06/15 09:31:05 jperkin Exp $
2 2
3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 3SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f 4RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes 5Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
6SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922 6SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922
7RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346 7RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346
8Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes 8Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
9SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2 9SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
10RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7 10RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
11Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes 11Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
12SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4 12SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4
13RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe 13RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe
14Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes 14Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes
@@ -44,57 +44,113 @@ RMD160 (openjdk7/jdk-7u21-20130526.diff) @@ -44,57 +44,113 @@ RMD160 (openjdk7/jdk-7u21-20130526.diff)
44Size (openjdk7/jdk-7u21-20130526.diff) = 4388188 bytes 44Size (openjdk7/jdk-7u21-20130526.diff) = 4388188 bytes
45SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0 45SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0
46RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128 46RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128
47Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes 47Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
48SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be 48SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
49RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818 49RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
50Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes 50Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
51SHA1 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ebdf9ef3dd6fa9bbd22f8f97be807b85aac0f439 51SHA1 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ebdf9ef3dd6fa9bbd22f8f97be807b85aac0f439
52RMD160 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ee9837701f7243f6a4edca7d343bcac4a492ad7f 52RMD160 (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = ee9837701f7243f6a4edca7d343bcac4a492ad7f
53Size (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 bytes 53Size (openjdk7/openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 bytes
54SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1 54SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
55RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0 55RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
56Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes 56Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
57SHA1 (patch-aa) = 14132fe1bc29e6054ff92f6111e7696dffe9d1c6 57SHA1 (patch-aa) = 6c27af8648ef893100a965ef2a009439e7bae6af
58SHA1 (patch-ab) = f7d3a7e9ff645222c9ee49f61b1190dbe593678d 58SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
59SHA1 (patch-ac) = c10145eba997d367014d91a01891bedbde0f62a2 59SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6
60SHA1 (patch-ad) = 430eba5b46f287b448c8ac885f977de57d6c2feb 60SHA1 (patch-ad) = 93ddbb82e8999c581e56e7bc3c194ff87e68d8b9
61SHA1 (patch-ae) = 868a3ecd93b71e1394cdd0b34647b3d2b491e4ff 61SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8
62SHA1 (patch-af) = 978d640a529fa3eba9f5ed8fb25c0ad3691879f9 62SHA1 (patch-af) = 203f61a448989130552a2fbef73f93d1734f4f66
63SHA1 (patch-ag) = 5e972632de0dbb02b23688ebdaa74dc77988eed0 63SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88
64SHA1 (patch-ah) = 430aab5c0c8ccf7a095381ba04385345579d50dc 64SHA1 (patch-ah) = a02db4b415b20146e8703d925b5ac9004606e035
65SHA1 (patch-ai) = fdbd6452c736aa6fe1a7027a204989c4b0e67d2b 65SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec
66SHA1 (patch-aj) = b014df9da89e9f95f029d9e23f58de734e0ae455 66SHA1 (patch-aj) = b8f7f80e41ccc4fe9bb167d857c6a286b3b09f0a
67SHA1 (patch-ak) = 2eb65025598a29153a2085927ed8be241a9a4887 67SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2
68SHA1 (patch-al) = 32860ca2ba2f9974bafde31a490a787dfe502e51 68SHA1 (patch-al) = f52ad9a838357f03348344f09cabf00157bb18cd
69SHA1 (patch-am) = 47f2e3662eb2318f9ebe265eecd15589d9609fa9 69SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703
70SHA1 (patch-an) = 1658febb4bb360d190c39b3bd5461a811a8489c8 70SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
71SHA1 (patch-ao) = e8289024ad75e56d26421a64abdc4553378dd929 71SHA1 (patch-ao) = 258f2a35b66d40c9b1917034eadda307d7a2dfb2
72SHA1 (patch-ap) = 61ee5aba12076825165b35036cc0a5f249049c2b 72SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a
73SHA1 (patch-aq) = 2c49fec8affb45ee5913155573941fc28b401390 73SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d
74SHA1 (patch-ar) = 6dbd78d753c44be344e6ae48acf037043bd9882f 74SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec
75SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2 75SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2
76SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3 76SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3
77SHA1 (patch-aw) = b6de59de25cec67f2f8b776529df7bf23a5d870e 77SHA1 (patch-aw) = b6de59de25cec67f2f8b776529df7bf23a5d870e
78SHA1 (patch-ba) = 258ccc9695289451cdcab52ebe4737a045ebf639 78SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf
79SHA1 (patch-bd) = a081ae435aee1817fefe862cfb2c5ff4d332820e 79SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423
80SHA1 (patch-bg) = 66778a32a03241a6f409eebf9843f0d7db065b41 80SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
81SHA1 (patch-bh) = 5ad9d3ae5fe34b1e9060149b1801a937435fa9e0 81SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
82SHA1 (patch-bi) = cc937210fd8cd5378754b8efc507fb4fcc7afbe6 82SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
83SHA1 (patch-bj) = 221256ff1a5f872fe62a3803b6588b7dd685e6f0 83SHA1 (patch-bj) = 072939cfa9bc5d358393702f71cf98cae87b1743
84SHA1 (patch-bk) = 1d140b248a227ed225e843b74258e9ff6e3d93b2 84SHA1 (patch-bk) = cb6f2da6fb2bbecb981dbf454603c851c48f75bc
85SHA1 (patch-bl) = 203ac82af9e33ef6aced6588b28ad0e451c1d90a 85SHA1 (patch-bl) = 34b829c6768fc67c0c0471880ce642284be602bb
86SHA1 (patch-bn) = df4532d613de76e58e3cbf411acc644ef13052c8 86SHA1 (patch-bn) = e90012a3acbdeec1fe97d53ffa11816379ac90e9
87SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = a2b1bb69cd80ce758873b1e136beaeb42c88fc45 87SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
 88SHA1 (patch-corba_make_common_shared_Platform.gmk) = 88b779af38d2f88db873d74493e5d2721c04531f
 89SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
 90SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
 91SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
 92SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd
 93SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = d0060b60463f3695a9a9d2e60841266233fd589d
 94SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b
 95SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 805a45d52a715206fb4b964c6e7d533895059c30
 96SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a
 97SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18
 98SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70
 99SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 690c750d9c0469cd6b71afed2633aa13373c2a7b
 100SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d4ef9e4ffc8361aa469a9ceacb331ff
 101SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850
 102SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5
 103SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43
 104SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = dfa30c806ceacd2598483a8e1138c2c757462311
 105SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
 106SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
 107SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 7099b9bc230869edced8d521513173ab5bd0fa3f
 108SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b
 109SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
 110SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2
 111SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8
 112SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 113SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = cf7c6226ad7c322f43df900be0e69686ca3a7a57
 114SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7d244b859debf4f68e49fe6fb36fe2598951fcdb
88SHA1 (patch-jdk_make_com_sun_Makefile) = 7b3b8163a4343b820f50b00babd4363c141ada67 115SHA1 (patch-jdk_make_com_sun_Makefile) = 7b3b8163a4343b820f50b00babd4363c141ada67
 116SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
89SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 117SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3
 118SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50
 119SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
 120SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
 121SHA1 (patch-jdk_make_common_Program.gmk) = 2ccab79ba7b84aa418c63d7f2a6f2a8b9e519b64
 122SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
 123SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = bb5d55282bf100986c397e41b1be4d25e73232dc
 124SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
 125SHA1 (patch-jdk_make_java_instrument_Makefile) = c9bd9bf27d9f2971d59762320e5cf9d25c2c4852
 126SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c
 127SHA1 (patch-jdk_make_java_npt_Makefile) = bf7505c30fe3e9014399bc5ce618c5dc40aef62b
 128SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a
 129SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = aa694522a6b75a5ac30d7fe3a530e3feb6563d30
 130SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b
 131SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60
 132SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d
90SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f 133SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f
91SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335 134SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335
92SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44 135SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44
93SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda 136SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda
94SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00 137SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00
95SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507 138SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507
96SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994 139SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994
97SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5 140SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5
98SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155 141SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155
 142SHA1 (patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h) = 23ea055894e3a77dc9e3be1c627d4b0dde342221
 143SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba
 144SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb
 145SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4
 146SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716
99SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 147SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
 148SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = f65f616965c2e1149b72297d7c9b803d7adc4e8a
 149SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
 150SHA1 (patch-jdk_test_Makefile) = d747987549c2f6e9eb42233edae02d8eae6b4584
 151SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb
 152SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d
 153SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c
 154SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295
 155SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32
100SHA1 (patch-langtools_make_build.xml) = 98fe0f88aaa774e47e1a358c7005b203c3123d09 156SHA1 (patch-langtools_make_build.xml) = 98fe0f88aaa774e47e1a358c7005b203c3123d09
cvs diff -r1.8 -r1.9 pkgsrc/lang/openjdk7/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-aa 2013/06/02 06:12:28 1.8
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-aa 2013/06/15 09:31:05 1.9
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.8 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-aa,v 1.9 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2013-05-29 03:57:57.000000000 +0000 5--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2013-05-29 03:57:57.000000000 +0000
4+++ hotspot/src/os/bsd/vm/os_bsd.cpp 6+++ hotspot/src/os/bsd/vm/os_bsd.cpp
5@@ -131,8 +131,11 @@ 7@@ -131,8 +131,11 @@
6 # include <inttypes.h> 8 # include <inttypes.h>
7 # include <sys/ioctl.h> 9 # include <sys/ioctl.h>
8  10
9-#if defined(__FreeBSD__) || defined(__NetBSD__) 11-#if defined(__FreeBSD__) || defined(__NetBSD__)
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 12+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
11 # include <elf.h> 13 # include <elf.h>
12+#if !defined(EM_ALPHA) 14+#if !defined(EM_ALPHA)
13+#define EM_ALPHA 0x9026 15+#define EM_ALPHA 0x9026
14+#endif 16+#endif
cvs diff -r1.5 -r1.6 pkgsrc/lang/openjdk7/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ab 2013/06/02 06:12:28 1.5
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ab 2013/06/15 09:31:05 1.6
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.5 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ab,v 1.6 2013/06/15 09:31:05 jperkin Exp $
 2
 3We use LD_LIBRARY_PATH.
2 4
3--- jdk/make/common/shared/Sanity.gmk.orig 2012-08-10 17:21:34.000000000 +0000 5--- jdk/make/common/shared/Sanity.gmk.orig 2012-08-10 17:21:34.000000000 +0000
4+++ jdk/make/common/shared/Sanity.gmk 6+++ jdk/make/common/shared/Sanity.gmk
5@@ -521,12 +521,7 @@ sane-variant: 7@@ -521,12 +521,7 @@ sane-variant:
6 # LD_LIBRARY_PATH should not be set, unless you are insane. 8 # LD_LIBRARY_PATH should not be set, unless you are insane.
7 ###################################################### 9 ######################################################
8 sane-ld_library_path: 10 sane-ld_library_path:
9-ifdef LD_LIBRARY_PATH 11-ifdef LD_LIBRARY_PATH
10- @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set. This may \n" \ 12- @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set. This may \n" \
11- " produce binaries binaries incorrectly. Please unset it \n" \ 13- " produce binaries binaries incorrectly. Please unset it \n" \
12- " and start your build again. \n" \ 14- " and start your build again. \n" \
13- "" >> $(ERROR_FILE) 15- "" >> $(ERROR_FILE)
14-endif 16-endif
cvs diff -r1.5 -r1.6 pkgsrc/lang/openjdk7/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ak 2013/06/02 06:12:28 1.5
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ak 2013/06/15 09:31:05 1.6
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ak,v 1.5 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ak,v 1.6 2013/06/15 09:31:05 jperkin Exp $
 2
 3Additional rpaths.
2 4
3--- jdk/make/common/Defs-bsd.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/common/Defs-bsd.gmk.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/common/Defs-bsd.gmk 6+++ jdk/make/common/Defs-bsd.gmk
5@@ -336,8 +336,8 @@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink 7@@ -336,8 +336,8 @@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink
6  8
7 LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY)) 9 LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
8  10
9-LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN 11-LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
10-LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%) 12-LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
11+LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} 13+LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}
12+ 14+
13  15
14 # 16 #
cvs diff -r1.5 -r1.6 pkgsrc/lang/openjdk7/patches/Attic/patch-aq (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-aq 2013/06/02 06:12:28 1.5
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-aq 2013/06/15 09:31:05 1.6
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-aq,v 1.5 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-aq,v 1.6 2013/06/15 09:31:05 jperkin Exp $
 2
 3Support __progname.
2 4
3--- jdk/make/java/main/java/mapfile-amd64.orig 2012-08-10 17:21:36.000000000 +0000 5--- jdk/make/java/main/java/mapfile-amd64.orig 2012-08-10 17:21:36.000000000 +0000
4+++ jdk/make/java/main/java/mapfile-amd64 6+++ jdk/make/java/main/java/mapfile-amd64
5@@ -31,6 +31,7 @@ SUNWprivate_1.1 { 7@@ -31,6 +31,7 @@ SUNWprivate_1.1 {
6 global: 8 global:
7 main; # Provides basic adb symbol offsets 9 main; # Provides basic adb symbol offsets
8 environ; # Public symbols and required by Java run time 10 environ; # Public symbols and required by Java run time
9+ __progname; 11+ __progname;
10 _environ; 12 _environ;
11 __environ_lock; 13 __environ_lock;
12  14
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ac 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ac 2013/06/15 09:31:05 1.4
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-ac,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ac,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3__progname support.
2 4
3--- jdk/make/java/main/java/mapfile-i586.orig 2012-08-10 17:21:36.000000000 +0000 5--- jdk/make/java/main/java/mapfile-i586.orig 2012-08-10 17:21:36.000000000 +0000
4+++ jdk/make/java/main/java/mapfile-i586 6+++ jdk/make/java/main/java/mapfile-i586
5@@ -31,6 +31,7 @@ SUNWprivate_1.1 { 7@@ -31,6 +31,7 @@ SUNWprivate_1.1 {
6 global: 8 global:
7 main; # Provides basic adb symbol offsets 9 main; # Provides basic adb symbol offsets
8 environ; # Public symbols and required by Java run time 10 environ; # Public symbols and required by Java run time
9+ __progname; 11+ __progname;
10 _environ; 12 _environ;
11 __environ_lock; 13 __environ_lock;
12 ___Argv; # The following are private, but as they are 14 ___Argv; # The following are private, but as they are
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-af 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-af 2013/06/15 09:31:05 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-af,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-af,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3Use tools from pkgsrc.
2 4
3--- jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/common/shared/Defs-utils.gmk 6+++ jdk/make/common/shared/Defs-utils.gmk
5@@ -286,7 +286,14 @@ ifeq ($(PLATFORM),bsd) 7@@ -286,7 +286,14 @@ ifeq ($(PLATFORM),bsd)
6 endif 8 endif
7 ifeq ($(OS_VENDOR), NetBSD) 9 ifeq ($(OS_VENDOR), NetBSD)
8 NAWK = $(UTILS_USR_BIN_PATH)awk 10 NAWK = $(UTILS_USR_BIN_PATH)awk
9- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip 11- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
10- UNZIP = $(UTILS_DEVTOOL_PATH)unzip 12- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
11+ ZIPEXE = $(PKGSRC_ZIPEXE) 13+ ZIPEXE = $(PKGSRC_ZIPEXE)
12+ UNZIP = $(PKGSRC_UNZIP) 14+ UNZIP = $(PKGSRC_UNZIP)
13+ UNZIPSFX = $(PKGSRC_UNZIPSFX) 15+ UNZIPSFX = $(PKGSRC_UNZIPSFX)
14+ endif 16+ endif
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ah 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ah 2013/06/15 09:31:05 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ah,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ah,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- jdk/make/common/shared/Platform.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/common/shared/Platform.gmk.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/common/shared/Platform.gmk 6+++ jdk/make/common/shared/Platform.gmk
5@@ -224,6 +224,13 @@ ifeq ($(SYSTEM_UNAME), Linux) 7@@ -224,6 +224,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
6 MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' ) 8 MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
7 endif 9 endif
8  10
9+ifeq ($(SYSTEM_UNAME), DragonFly) 11+ifeq ($(SYSTEM_UNAME), DragonFly)
10+ PLATFORM = bsd 12+ PLATFORM = bsd
11+ OS_NAME = dragonfly 13+ OS_NAME = dragonfly
12+ OS_VENDOR = DragonFlyBSD 14+ OS_VENDOR = DragonFlyBSD
13+ REQUIRED_OS_VERSION = 2.4 15+ REQUIRED_OS_VERSION = 2.4
14+endif 16+endif
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-al 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-al 2013/06/15 09:31:05 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-al,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-al,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2013-06-01 14:10:31.000000000 +0000 5--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2013-06-01 14:10:31.000000000 +0000
4+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 6+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
5@@ -28,6 +28,8 @@ package sun.nio.fs; 7@@ -28,6 +28,8 @@ package sun.nio.fs;
6 import java.nio.file.spi.FileSystemProvider; 8 import java.nio.file.spi.FileSystemProvider;
7 import java.security.AccessController; 9 import java.security.AccessController;
8 import java.security.PrivilegedAction; 10 import java.security.PrivilegedAction;
9+import java.util.Set; 11+import java.util.Set;
10+import java.util.HashSet; 12+import java.util.HashSet;
11 import sun.security.action.GetPropertyAction; 13 import sun.security.action.GetPropertyAction;
12  14
13 /** 15 /**
14@@ -37,6 +39,14 @@ import sun.security.action.GetPropertyAc 16@@ -37,6 +39,14 @@ import sun.security.action.GetPropertyAc
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-am 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-am 2013/06/15 09:31:05 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-am,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-am,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3Set username to pkgsrc.
2 4
3--- jdk/make/common/shared/Defs.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/common/shared/Defs.gmk.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/common/shared/Defs.gmk 6+++ jdk/make/common/shared/Defs.gmk
5@@ -303,7 +303,7 @@ else 7@@ -303,7 +303,7 @@ else
6 BUILD_NUMBER = b00 8 BUILD_NUMBER = b00
7 ifndef USER_RELEASE_SUFFIX 9 ifndef USER_RELEASE_SUFFIX
8 BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M') 10 BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
9- CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]') 11- CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
10+ CLEAN_USERNAME := pkgsrc 12+ CLEAN_USERNAME := pkgsrc
11 USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' ) 13 USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
12 endif 14 endif
13 export USER_RELEASE_SUFFIX 15 export USER_RELEASE_SUFFIX
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-ar (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ar 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ar 2013/06/15 09:31:05 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ar,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ar,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3freetype rpath.
2 4
3--- jdk/make/sun/font/Makefile.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/sun/font/Makefile.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/sun/font/Makefile 6+++ jdk/make/sun/font/Makefile
5@@ -134,7 +134,7 @@ else  7@@ -134,7 +134,7 @@ else
6 ifeq ($(USING_SYSTEM_FT_LIB), false) 8 ifeq ($(USING_SYSTEM_FT_LIB), false)
7 FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6 9 FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6
8 endif 10 endif
9- OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype 11- OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype
10+ OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -Wl,-R$(FREETYPE_LIB_PATH) -lfreetype 12+ OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -Wl,-R$(FREETYPE_LIB_PATH) -lfreetype
11 endif  13 endif
12  14
13 library:: $(FREETYPE_LIB) 15 library:: $(FREETYPE_LIB)
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-bd (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bd 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bd 2013/06/15 09:31:05 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-bd,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bd,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3Support __progname and environ.
2 4
3--- jdk/make/com/sun/java/pack/mapfile-vers.orig 2012-08-10 17:21:30.000000000 +0000 5--- jdk/make/com/sun/java/pack/mapfile-vers.orig 2012-08-10 17:21:30.000000000 +0000
4+++ jdk/make/com/sun/java/pack/mapfile-vers 6+++ jdk/make/com/sun/java/pack/mapfile-vers
5@@ -28,6 +28,8 @@ 7@@ -28,6 +28,8 @@
6  8
7 SUNWprivate_1.1 { 9 SUNWprivate_1.1 {
8 global: 10 global:
9+ __progname; 11+ __progname;
10+ environ; 12+ environ;
11 Java_com_sun_java_util_jar_pack_NativeUnpack_finish; 13 Java_com_sun_java_util_jar_pack_NativeUnpack_finish;
12 Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile; 14 Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile;
13 Java_com_sun_java_util_jar_pack_NativeUnpack_getOption; 15 Java_com_sun_java_util_jar_pack_NativeUnpack_getOption;
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-bi (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bi 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bi 2013/06/15 09:31:05 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-bi,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bi,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2012-08-10 16:24:31.000000000 +0000 5--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2012-08-10 16:24:31.000000000 +0000
4+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 6+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
5@@ -94,7 +94,7 @@ 7@@ -94,7 +94,7 @@
6 #define SPELL_REG_FP "ebp" 8 #define SPELL_REG_FP "ebp"
7 #endif // AMD64 9 #endif // AMD64
8  10
9-#ifdef __FreeBSD__ 11-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__DragonFly__) 12+#if defined(__FreeBSD__) || defined(__DragonFly__)
11 # define context_trapno uc_mcontext.mc_trapno 13 # define context_trapno uc_mcontext.mc_trapno
12 # ifdef AMD64 14 # ifdef AMD64
13 # define context_pc uc_mcontext.mc_rip 15 # define context_pc uc_mcontext.mc_rip
14@@ -279,13 +279,8 @@ address os::current_stack_pointer() { 16@@ -279,13 +279,8 @@ address os::current_stack_pointer() {
cvs diff -r1.3 -r1.4 pkgsrc/lang/openjdk7/patches/Attic/patch-bn (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bn 2013/06/02 06:12:28 1.3
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bn 2013/06/15 09:31:05 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-bn,v 1.3 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bn,v 1.4 2013/06/15 09:31:05 jperkin Exp $
 2
 3Use pkgsrc fonts.
2 4
3--- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2012-08-10 17:31:20.000000000 +0000 5--- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2012-08-10 17:31:20.000000000 +0000
4+++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties 6+++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
5@@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g 7@@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g
6  8
7 # Font File Names 9 # Font File Names
8  10
9-filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf 11-filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf
10-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf 12-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf
11-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf 13-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf
12-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf 14-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf
13+filename.DejaVu_LGC_Sans=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans.ttf 15+filename.DejaVu_LGC_Sans=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans.ttf
14+filename.DejaVu_LGC_Sans_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf 16+filename.DejaVu_LGC_Sans_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf
cvs diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ad 2013/06/02 06:12:28 1.4
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ad 2013/06/15 09:31:05 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ad,v 1.4 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ad,v 1.5 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- corba/make/common/shared/Platform.gmk.orig 2012-08-10 16:10:07.000000000 +0000 5--- corba/make/common/shared/Platform.gmk.orig 2012-08-10 16:10:07.000000000 +0000
4+++ corba/make/common/shared/Platform.gmk 6+++ corba/make/common/shared/Platform.gmk
5@@ -238,6 +238,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD) 7@@ -238,6 +238,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD)
6 REQUIRED_OS_VERSION = 6.0 8 REQUIRED_OS_VERSION = 6.0
7 endif 9 endif
8  10
9+ifeq ($(SYSTEM_UNAME), DragonFly) 11+ifeq ($(SYSTEM_UNAME), DragonFly)
10+ PLATFORM = bsd 12+ PLATFORM = bsd
11+ OS_NAME = dragonfly 13+ OS_NAME = dragonfly
12+ OS_VENDOR = DragonFlyBSD 14+ OS_VENDOR = DragonFlyBSD
13+ REQUIRED_OS_VERSION = 2.4 15+ REQUIRED_OS_VERSION = 2.4
14+endif 16+endif
cvs diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ae 2013/06/02 06:12:28 1.4
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ae 2013/06/15 09:31:05 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ae,v 1.4 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ae,v 1.5 2013/06/15 09:31:05 jperkin Exp $
 2
 3Additional BSD support.
2 4
3--- hotspot/make/bsd/makefiles/gcc.make.orig 2013-05-29 03:57:57.000000000 +0000 5--- hotspot/make/bsd/makefiles/gcc.make.orig 2013-05-29 03:57:57.000000000 +0000
4+++ hotspot/make/bsd/makefiles/gcc.make 6+++ hotspot/make/bsd/makefiles/gcc.make
5@@ -242,6 +242,15 @@ MAPFLAG = -Xlinker --version-script=FILE 7@@ -242,6 +242,15 @@ MAPFLAG = -Xlinker --version-script=FILE
6 # 8 #
7 # Shared Library 9 # Shared Library
8 # 10 #
9+ 11+
10+ifeq ($(OS_VENDOR), NetBSD) 12+ifeq ($(OS_VENDOR), NetBSD)
11+# XXX tnn fixme: -lgcc_s seems to be needed on NetBSD. 13+# XXX tnn fixme: -lgcc_s seems to be needed on NetBSD.
12+LFLAGS += -lgcc_s 14+LFLAGS += -lgcc_s
13+endif 15+endif
14+ 16+
cvs diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-aj 2013/06/02 06:12:28 1.4
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-aj 2013/06/15 09:31:05 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aj,v 1.4 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-aj,v 1.5 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2013-05-29 03:57:58.000000000 +0000 5--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2013-05-29 03:57:58.000000000 +0000
4+++ jdk/src/solaris/native/java/net/NetworkInterface.c 6+++ jdk/src/solaris/native/java/net/NetworkInterface.c
5@@ -60,13 +60,11 @@ 7@@ -60,13 +60,11 @@
6 #include <sys/param.h> 8 #include <sys/param.h>
7 #include <sys/ioctl.h> 9 #include <sys/ioctl.h>
8 #include <sys/sockio.h> 10 #include <sys/sockio.h>
9-#if defined(__FreeBSD__) || defined(__APPLE__) 11-#if defined(__FreeBSD__) || defined(__APPLE__)
10+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) 12+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
11 #include <net/ethernet.h> 13 #include <net/ethernet.h>
12 #include <net/if_var.h> 14 #include <net/if_var.h>
13-#elif defined(__OpenBSD__) 15-#elif defined(__OpenBSD__)
14+#elif defined(__OpenBSD__) || defined(__NetBSD__) 16+#elif defined(__OpenBSD__) || defined(__NetBSD__)
cvs diff -r1.4 -r1.5 pkgsrc/lang/openjdk7/patches/Attic/patch-ap (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ap 2013/06/02 06:12:28 1.4
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ap 2013/06/15 09:31:05 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ap,v 1.4 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ap,v 1.5 2013/06/15 09:31:05 jperkin Exp $
 2
 3Use pkgsrc fontconfig.
2 4
3--- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2013-05-29 03:57:58.000000000 +0000 5--- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2013-05-29 03:57:58.000000000 +0000
4+++ jdk/src/solaris/native/sun/awt/fontpath.c 6+++ jdk/src/solaris/native/sun/awt/fontpath.c
5@@ -72,8 +72,8 @@ extern Display *awt_display; 7@@ -72,8 +72,8 @@ extern Display *awt_display;
6 #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1") 8 #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1")
7 #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig") 9 #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig")
8 #else 10 #else
9-#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1") 11-#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1")
10-#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig") 12-#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig")
11+#define FONTCONFIG_DLL_VERSIONED "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig") 13+#define FONTCONFIG_DLL_VERSIONED "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
12+#define FONTCONFIG_DLL "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig") 14+#define FONTCONFIG_DLL "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
13 #endif 15 #endif
14  16
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ag 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ag 2013/06/15 09:31:05 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ag,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ag,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3X rpath.
2 4
3--- jdk/make/launchers/Makefile.launcher.orig 2012-08-10 17:21:41.000000000 +0000 5--- jdk/make/launchers/Makefile.launcher.orig 2012-08-10 17:21:41.000000000 +0000
4+++ jdk/make/launchers/Makefile.launcher 6+++ jdk/make/launchers/Makefile.launcher
5@@ -164,7 +164,7 @@ ifeq ($(GUI_TOOL),true) 7@@ -164,7 +164,7 @@ ifeq ($(GUI_TOOL),true)
6 ifneq ($(PLATFORM), windows) 8 ifneq ($(PLATFORM), windows)
7 ifneq ($(PLATFORM), macosx) 9 ifneq ($(PLATFORM), macosx)
8 # Anything with a GUI needs X11 to be linked in. 10 # Anything with a GUI needs X11 to be linked in.
9- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 11- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
10+ OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) -L$(OPENWIN_LIB) -lX11 12+ OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) -L$(OPENWIN_LIB) -lX11
11 endif 13 endif
12 endif 14 endif
13 endif 15 endif
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ai 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ai 2013/06/15 09:31:05 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ai,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ai,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3Support older NetBSD.
2 4
3--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig 2012-08-10 16:24:15.000000000 +0000 5--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig 2012-08-10 16:24:15.000000000 +0000
4+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 6+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp
5@@ -345,11 +345,16 @@ BsdAttachOperation* BsdAttachListener::d 7@@ -345,11 +345,16 @@ BsdAttachOperation* BsdAttachListener::d
6 #ifdef _ALLBSD_SOURCE 8 #ifdef _ALLBSD_SOURCE
7 uid_t puid; 9 uid_t puid;
8 gid_t pgid; 10 gid_t pgid;
9+#if defined(__NetBSD__) && __NetBSD_Version__ < 500000000 11+#if defined(__NetBSD__) && __NetBSD_Version__ < 500000000
10+ /* no support for LOCAL_PEEREID here */ 12+ /* no support for LOCAL_PEEREID here */
11+ return NULL; 13+ return NULL;
12+#else 14+#else
13 if (::getpeereid(s, &puid, &pgid) != 0) { 15 if (::getpeereid(s, &puid, &pgid) != 0) {
14 int res; 16 int res;
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-an 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-an 2013/06/15 09:31:05 1.3
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-an,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-an,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3NetBSD fix.
2 4
3--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig 2012-08-10 16:24:31.000000000 +0000 5--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig 2012-08-10 16:24:31.000000000 +0000
4+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 6+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
5@@ -43,6 +43,7 @@ 7@@ -43,6 +43,7 @@
6 # define bswap_32(x) swap32(x) 8 # define bswap_32(x) swap32(x)
7 # define bswap_64(x) swap64(x) 9 # define bswap_64(x) swap64(x)
8 # elif defined(__NetBSD__) 10 # elif defined(__NetBSD__)
9+# include <machine/bswap.h> 11+# include <machine/bswap.h>
10 # define bswap_16(x) bswap16(x) 12 # define bswap_16(x) bswap16(x)
11 # define bswap_32(x) bswap32(x) 13 # define bswap_32(x) bswap32(x)
12 # define bswap_64(x) bswap64(x) 14 # define bswap_64(x) bswap64(x)
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ao 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ao 2013/06/15 09:31:05 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ao,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ao,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3Support rhino.
2 4
3--- jdk/make/common/Release.gmk.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/common/Release.gmk.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/common/Release.gmk 6+++ jdk/make/common/Release.gmk
5@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se 7@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se
6 $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar 8 $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
7 $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar 9 $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
8 $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar 10 $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
9+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar 11+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
10 ifneq ($(JFR_JAR),) 12 ifneq ($(JFR_JAR),)
11 $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar 13 $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
12 endif 14 endif
13@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se 15@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se
14 @# 16 @#
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-ba 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-ba 2013/06/15 09:31:05 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ba,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-ba,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- hotspot/src/share/vm/utilities/macros.hpp.orig 2012-08-10 16:28:55.000000000 +0000 5--- hotspot/src/share/vm/utilities/macros.hpp.orig 2012-08-10 16:28:55.000000000 +0000
4+++ hotspot/src/share/vm/utilities/macros.hpp 6+++ hotspot/src/share/vm/utilities/macros.hpp
5@@ -161,7 +161,7 @@ 7@@ -161,7 +161,7 @@
6 #define NOT_WINDOWS(code) code 8 #define NOT_WINDOWS(code) code
7 #endif 9 #endif
8  10
9-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) 11-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
10+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) 12+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__)
11 #define BSD_ONLY(code) code 13 #define BSD_ONLY(code) code
12 #define NOT_BSD(code) 14 #define NOT_BSD(code)
13 #else 15 #else
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-bg (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bg 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bg 2013/06/15 09:31:05 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-bg,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bg,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig 2013-05-29 03:57:58.000000000 +0000 5--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig 2013-05-29 03:57:58.000000000 +0000
4+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 6+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
5@@ -357,7 +357,7 @@ Java_java_net_PlainDatagramSocketImpl_di 7@@ -357,7 +357,7 @@ Java_java_net_PlainDatagramSocketImpl_di
6 #ifdef AF_INET6 8 #ifdef AF_INET6
7 if (ipv6_available()) { 9 if (ipv6_available()) {
8 struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr; 10 struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr;
9-#ifdef __FreeBSD__ 11-#ifdef __FreeBSD__
10+#if defined(__FreeBSD__) || defined(__DragonFly__) 12+#if defined(__FreeBSD__) || defined(__DragonFly__)
11 him6->sin6_family = AF_INET6; 13 him6->sin6_family = AF_INET6;
12 #else 14 #else
13 him6->sin6_family = AF_UNSPEC; 15 him6->sin6_family = AF_UNSPEC;
14@@ -367,7 +367,7 @@ Java_java_net_PlainDatagramSocketImpl_di 16@@ -367,7 +367,7 @@ Java_java_net_PlainDatagramSocketImpl_di
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-bh (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bh 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bh 2013/06/15 09:31:05 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-bh,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bh,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- hotspot/make/defs.make.orig 2012-08-10 16:23:01.000000000 +0000 5--- hotspot/make/defs.make.orig 2012-08-10 16:23:01.000000000 +0000
4+++ hotspot/make/defs.make 6+++ hotspot/make/defs.make
5@@ -124,6 +124,9 @@ ifeq ($(OS),) 7@@ -124,6 +124,9 @@ ifeq ($(OS),)
6 ifeq ($(OS), Darwin) 8 ifeq ($(OS), Darwin)
7 OS=bsd 9 OS=bsd
8 endif 10 endif
9+ ifeq ($(OS), DragonFly) 11+ ifeq ($(OS), DragonFly)
10+ OS=bsd 12+ OS=bsd
11+ endif 13+ endif
12 HOST := $(shell uname -n) 14 HOST := $(shell uname -n)
13 endif 15 endif
14  16
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-bj (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bj 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bj 2013/06/15 09:31:05 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-bj,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bj,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2012-08-10 16:28:55.000000000 +0000 5--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2012-08-10 16:28:55.000000000 +0000
4+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 6+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
5@@ -252,6 +252,9 @@ inline int g_isnan(float f) { return is 7@@ -252,6 +252,9 @@ inline int g_isnan(float f) { return is
6 inline int g_isnan(double f) { return isnand(f); } 8 inline int g_isnan(double f) { return isnand(f); }
7 #elif defined(__APPLE__) 9 #elif defined(__APPLE__)
8 inline int g_isnan(double f) { return isnan(f); } 10 inline int g_isnan(double f) { return isnan(f); }
9+#elif defined(__DragonFly__) 11+#elif defined(__DragonFly__)
10+inline int g_isnan(float f) { return __isnanf(f); } 12+inline int g_isnan(float f) { return __isnanf(f); }
11+inline int g_isnan(double f) { return __isnand(f); } 13+inline int g_isnan(double f) { return __isnand(f); }
12 #elif defined(LINUX) || defined(_ALLBSD_SOURCE) 14 #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
13 inline int g_isnan(float f) { return isnanf(f); } 15 inline int g_isnan(float f) { return isnanf(f); }
14 inline int g_isnan(double f) { return isnan(f); } 16 inline int g_isnan(double f) { return isnan(f); }
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-bk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bk 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bk 2013/06/15 09:31:05 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-bk,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bk,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- jdk/make/java/npt/Makefile.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/java/npt/Makefile.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/java/npt/Makefile 6+++ jdk/make/java/npt/Makefile
5@@ -76,7 +76,7 @@ endif 7@@ -76,7 +76,7 @@ endif
6  8
7 # Add location of iconv headers 9 # Add location of iconv headers
8 ifeq ($(PLATFORM), bsd) 10 ifeq ($(PLATFORM), bsd)
9- ifneq ($(OS_NAME), netbsd) 11- ifneq ($(OS_NAME), netbsd)
10+ ifeq ($(OS_NAME), freebsd) 12+ ifeq ($(OS_NAME), freebsd)
11 CPPFLAGS += -I$(PACKAGE_PATH)/include 13 CPPFLAGS += -I$(PACKAGE_PATH)/include
12 OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv 14 OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
13 endif 15 endif
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-bl (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-bl 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-bl 2013/06/15 09:31:05 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-bl,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-bl,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 3DragonFly support.
2 4
3--- jdk/make/java/instrument/Makefile.orig 2013-05-29 03:57:57.000000000 +0000 5--- jdk/make/java/instrument/Makefile.orig 2013-05-29 03:57:57.000000000 +0000
4+++ jdk/make/java/instrument/Makefile 6+++ jdk/make/java/instrument/Makefile
5@@ -115,7 +115,7 @@ ifneq (,$(findstring $(PLATFORM), macosx 7@@ -115,7 +115,7 @@ ifneq (,$(findstring $(PLATFORM), macosx
6 LDFLAGS += -Wl,--whole-archive 8 LDFLAGS += -Wl,--whole-archive
7 LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a 9 LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
8 LDFLAGS += -Wl,--no-whole-archive 10 LDFLAGS += -Wl,--no-whole-archive
9- ifneq ($(OS_NAME), netbsd) 11- ifneq ($(OS_NAME), netbsd)
10+ ifeq ($(OS_NAME), freebsd) 12+ ifeq ($(OS_NAME), freebsd)
11 # Use CPPFLAGS instead of OTHER_INCLUDES to force this last 13 # Use CPPFLAGS instead of OTHER_INCLUDES to force this last
12 CPPFLAGS += -I$(PACKAGE_PATH)/include 14 CPPFLAGS += -I$(PACKAGE_PATH)/include
13 OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv 15 OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
cvs diff -r1.2 -r1.3 pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_bsd_makefiles_defs.make (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_bsd_makefiles_defs.make 2013/06/02 06:12:28 1.2
+++ pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_bsd_makefiles_defs.make 2013/06/15 09:31:05 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.2 2013/06/02 06:12:28 ryoon Exp $ 1$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.3 2013/06/15 09:31:05 jperkin Exp $
 2
 364-bit support.
2 4
3--- hotspot/make/bsd/makefiles/defs.make.orig 2013-05-29 03:57:57.000000000 +0000 5--- hotspot/make/bsd/makefiles/defs.make.orig 2013-05-29 03:57:57.000000000 +0000
4+++ hotspot/make/bsd/makefiles/defs.make 6+++ hotspot/make/bsd/makefiles/defs.make
5@@ -30,6 +30,10 @@ SLASH_JAVA ?= /java 7@@ -30,6 +30,10 @@ SLASH_JAVA ?= /java
6  8
7 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name 9 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
8 ARCH:=$(shell uname -m) 10 ARCH:=$(shell uname -m)
9+ifeq ($(ARCH),x86_64) 11+ifeq ($(ARCH),x86_64)
10+ ARCH=amd64 12+ ARCH=amd64
11+endif 13+endif
12+ 14+
13 PATH_SEP = : 15 PATH_SEP = :
14 ifeq ($(LP64), 1) 16 ifeq ($(LP64), 1)
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Defs-utils.gmk
$NetBSD: patch-corba_make_common_shared_Defs-utils.gmk,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Use pkgsrc unzip.

--- corba/make/common/shared/Defs-utils.gmk.orig	2013-02-20 04:35:29.000000000 +0000
+++ corba/make/common/shared/Defs-utils.gmk
@@ -136,7 +136,7 @@ TR             = $(UTILS_USR_BIN_PATH)tr
 TRUE           = $(UTILS_COMMAND_PATH)true
 UNAME          = $(UTILS_COMMAND_PATH)uname
 UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
+UNZIP          = $(UTILS_DEVTOOL_PATH)unzip
 UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
 WC             = $(UTILS_USR_BIN_PATH)wc
 WHICH          = $(UTILS_USR_BIN_PATH)which
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-corba_make_common_shared_Platform.gmk
$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Avoid warnings when building in a zone.

--- corba/make/common/shared/Platform.gmk.orig	2013-02-20 04:35:29.000000000 +0000
+++ corba/make/common/shared/Platform.gmk
@@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS)
     REQUIRED_FREE_SPACE=1040000
   endif
   # How much RAM does this machine have:
-  MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3)
+  MB_OF_MEMORY=$(shell /usr/sbin/prtconf 2>&1 | fgrep 'Memory size:' | expand | cut -d' ' -f3)
 endif
 
 # Platform settings specific to Linux
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_adlc.make
$NetBSD: patch-hotspot_make_solaris_makefiles_adlc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/adlc.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/adlc.make
@@ -75,9 +75,11 @@ endif
 
 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 # Compiler warnings are treated as errors
+ifeq ("${Platform_compiler}", "sparcWorks")
 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
   CFLAGS_WARN = +w -errwarn
 endif
+endif
 CFLAGS += $(CFLAGS_WARN)
 
 ifeq ("${Platform_compiler}", "sparcWorks")
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_build__vm__def.sh
$NetBSD: patch-hotspot_make_solaris_makefiles_build__vm__def.sh,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Fix path to nm.

--- hotspot/make/solaris/makefiles/build_vm_def.sh.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/build_vm_def.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/usr/ccs/bin/nm -p $* \
+/usr/bin/nm -p $* \
     | awk '{
           if ($2 == "U") next
           if ($3 ~ /^__1c.*__vtbl_$/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_debug.make
$NetBSD: patch-hotspot_make_solaris_makefiles_debug.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/debug.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/debug.make
@@ -45,7 +45,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+ifdef USE_GCC
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc
+else
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+endif # USE_GCC
 
 _JUNK_ := $(shell echo >&2 ""\
  "-------------------------------------------------------------------------\n" \
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_dtrace.make
$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Enable DTrace support with GCC.

--- hotspot/make/solaris/makefiles/dtrace.make.orig	2012-08-10 16:23:13.000000000 +0000
+++ hotspot/make/solaris/makefiles/dtrace.make
@@ -30,13 +30,6 @@
 ifneq ("${TYPE}", "CORE")
 ifneq ("${TYPE}", "KERNEL")
 
-ifdef USE_GCC
-
-dtraceCheck:
-	$(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds"
-
-else
-
 JVM_DB = libjvm_db
 LIBJVM_DB = libjvm_db.so
 LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so
@@ -63,14 +56,23 @@ DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Pla
 DTRACE = dtrace
 DTRACE.o = $(DTRACE).o
 
-# to remove '-g' option which causes link problems
-# also '-z nodefs' is used as workaround
-GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';)
+ifdef USE_GCC
+  # solaris linker does not like gcc and -fvisibility=hidden without mapfiles
+  GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g' -e 's/ -fvisibility=hidden / /g';)
+else
+  # to remove '-g' option which causes link problems
+  # also '-z nodefs' is used as workaround
+  GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';)
+endif
 
 ifdef LP64
 DTRACE_OPTS = -64 -D_LP64
 endif
 
+ifdef USE_GCC
+  DTRACE_OPTS = -D_GNU_SOURCE
+endif # USE_GCC
+
 # making libjvm_db
 
 # Use mapfile with libjvm_db.so
@@ -384,8 +386,6 @@ dtraceCheck:
 
 endif # ifneq ("${dtraceFound}", "")
 
-endif # ifdef USE_GCC
-
 else # KERNEL build
 
 dtraceCheck:
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_fastdebug.make
$NetBSD: patch-hotspot_make_solaris_makefiles_fastdebug.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/fastdebug.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/fastdebug.make
@@ -116,7 +116,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+ifdef USE_GCC
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc
+else
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+endif # USE_GCC
 
 G_SUFFIX = _g
 VERSION = optimized
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_gcc.make
$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/gcc.make.orig	2012-08-10 16:23:14.000000000 +0000
+++ hotspot/make/solaris/makefiles/gcc.make
@@ -66,11 +66,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
 VM_PICFLAG/AOUT   =
 VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
 
+ifeq ($(JVM_VARIANT_ZERO), true)
+  CFLAGS += $(LIBFFI_CFLAGS)
+endif
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+  CFLAGS += $(LIBFFI_CFLAGS)
+  CFLAGS += $(LLVM_CFLAGS)
+endif
 CFLAGS += $(VM_PICFLAG)
 CFLAGS += -fno-rtti
 CFLAGS += -fno-exceptions
 CFLAGS += -D_REENTRANT
 CFLAGS += -fcheck-new
+# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
+# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+  CFLAGS += -fvisibility=hidden
+endif
 
 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
 
@@ -103,6 +115,11 @@ ifdef CC_INTERP
   CFLAGS += -DCC_INTERP
 endif
 
+# Build for embedded targets
+ifdef JAVASE_EMBEDDED
+  CFLAGS += -DJAVASE_EMBEDDED
+endif
+
 # Keep temporary files (.ii, .s)
 ifdef NEED_ASM
   CFLAGS += -save-temps
@@ -113,9 +130,18 @@ endif
 
 # Compiler warnings are treated as errors 
 WARNINGS_ARE_ERRORS = -Werror 
-# Enable these warnings. See 'info gcc' about details on these options
-ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) 
+
+# Except for a few acceptable ones
+# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+# conversions which might affect the values. To avoid that, we need to turn
+# it off explicitly. 
+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+  ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
+else
+  ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+endif
+
+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
 # Special cases 
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))  
 
@@ -173,7 +199,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME
 endif 
 
 # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
-SONAMEFLAG = -Xlinker -soname=SONAME
+SONAMEFLAG = -Wl,-soname=SONAME
 
 # Build shared library
 SHARED_FLAG = -shared
@@ -181,17 +207,34 @@ SHARED_FLAG = -shared
 #------------------------------------------------------------------------
 # Debug flags
 
-# Use the stabs format for debugging information (this is the default 
-# on gcc-2.91). It's good enough, has all the information about line 
-# numbers and local variables, and libjvm_g.so is only about 16M. 
-# Change this back to "-g" if you want the most expressive format. 
-# (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 += $(DEBUG_CFLAGS/$(BUILDARCH)) 
-ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) 
-DEBUG_CFLAGS += -gstabs 
-endif 
+# DEBUG_BINARIES uses full -g debug information for all configs
+ifeq ($(DEBUG_BINARIES), true)
+  CFLAGS += -g
+else
+# Use the stabs format for debugging information (this is the default
+# on gcc-2.91). It's good enough, has all the information about line
+# numbers and local variables, and libjvm_g.so is only about 16M.
+# Change this back to "-g" if you want the most expressive format.
+# (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 += $(DEBUG_CFLAGS/$(BUILDARCH))
+ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
+DEBUG_CFLAGS += -gstabs
+endif
+endif
+
+# If we are building HEADLESS, pass on to VM
+# so it can set the java.awt.headless property
+ifdef HEADLESS
+  CFLAGS += -DHEADLESS
+endif
+
+# We are building Embedded for a small device
+# favor code space over speed
+ifdef MINIMIZE_RAM_USAGE
+  CFLAGS += -DMINIMIZE_RAM_USAGE
+endif
 
 MCS = /usr/ccs/bin/mcs
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_jsig.make
$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/jsig.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/jsig.make
@@ -47,15 +47,25 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
 LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
 
 ifdef USE_GCC
-LFLAGS_JSIG += -D_REENTRANT
+  LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT
 else
-LFLAGS_JSIG += -mt -xnolib
+  LFLAGS_JSIG += -mt -xnolib
+endif
+
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+  JSIG_DEBUG_CFLAGS = -g
 endif
 
 $(LIBJSIG): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
 	@echo Making signal interposition lib...
+ifdef USE_GCC
+	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+                         $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $(JSIGSRCDIR)/jsig.c -ldl
+else
 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                          $(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl
+endif
 	[ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_jvmg.make
$NetBSD: patch-hotspot_make_solaris_makefiles_jvmg.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/jvmg.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/jvmg.make
@@ -49,7 +49,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef
 
 # This mapfile is only needed when compiling with dtrace support,
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+ifdef USE_GCC
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc
+else
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+endif # USE_GCC
 
 G_SUFFIX = _g
 VERSION = debug
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc
$NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc.orig	2013-03-10 22:22:12.895432470 +0000
+++ hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc
@@ -0,0 +1,43 @@
+#
+
+#
+# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#  
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+        global:
+                # Dtrace support
+                _ZN8Universe15_methodKlassObjE;
+                _ZN9CodeCache5_heapE;
+                _ZN8Universe14_collectedHeapE;
+                _ZTV7nmethod;
+                _ZTV8CodeBlob;
+                _ZTV10BufferBlob;
+                _ZTV11RuntimeStub;
+                _ZTV13SafepointBlob;
+                _ZTV18DeoptimizationBlob;
+
+		__JvmOffsets;
+};
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc
$NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc.orig	2013-03-10 22:22:12.896595236 +0000
+++ hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc
@@ -0,0 +1,46 @@
+#
+
+#
+# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#  
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+        global:
+                # Dtrace support
+                _ZN8Universe15_methodKlassObjE;
+                _ZN9CodeCache5_heapE;
+                _ZN8Universe14_collectedHeapE;
+                _ZTV7nmethod;
+                _ZTV8CodeBlob;
+                _ZTV10BufferBlob;
+                _ZTV11RuntimeStub;
+                _ZTV13SafepointBlob;
+                _ZTV18DeoptimizationBlob;
+
+                _ZTV13ExceptionBlob;
+                _ZTV16UncommonTrapBlob;
+
+		__JvmOffsets;
+};
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc
$NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc.orig	2013-03-10 22:22:12.897768214 +0000
+++ hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc
@@ -0,0 +1,45 @@
+#
+
+#
+# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#  
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+        global:
+                # Dtrace support
+                _ZN8Universe15_methodKlassObjE;
+                _ZN9CodeCache5_heapE;
+                _ZN8Universe14_collectedHeapE;
+                _ZTV7nmethod;
+                _ZTV8CodeBlob;
+                _ZTV10BufferBlob;
+                _ZTV11RuntimeStub;
+                _ZTV13SafepointBlob;
+                _ZTV18DeoptimizationBlob;
+                _ZTV13ExceptionBlob;
+                _ZTV16UncommonTrapBlob;
+
+		__JvmOffsets;
+};
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_optimized.make
$NetBSD: patch-hotspot_make_solaris_makefiles_optimized.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/optimized.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/optimized.make
@@ -57,7 +57,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+ifdef USE_GCC
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc
+else
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+endif # USE_GCC
 
 # Set the environment variable HOTSPARC_GENERIC to "true"
 # to inhibit the effect of the previous line on CFLAGS.
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_product.make
$NetBSD: patch-hotspot_make_solaris_makefiles_product.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/product.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/product.make
@@ -65,11 +65,16 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAG
 # Linker mapfiles
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
 
-ifndef USE_GCC
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+ifdef USE_GCC
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc
+else
+  MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
+endif # USE_GCC
 
+# reorder is not used with gcc
+ifndef USE_GCC
 REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH)
 endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_saproc.make
$NetBSD: patch-hotspot_make_solaris_makefiles_saproc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Only use libdemangle for Sun Studio builds.

--- hotspot/make/solaris/makefiles/saproc.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/saproc.make
@@ -61,6 +61,7 @@ ifdef USE_GCC
 SA_LFLAGS += -D_REENTRANT
 else
 SA_LFLAGS += -mt -xnolib -norunpath
+LIBDEMANGLE = -ldemangle
 endif
 
 # The libproc Pstack_iter() interface changed in Nevada-B159.
@@ -106,7 +107,7 @@ $(LIBSAPROC): $(ADD_GNU_DEBUGLINK) $(FIX
 	           $(SASRCFILES)                                        \
 	           $(SA_LFLAGS)                                         \
 	           -o $@                                                \
-	           -ldl -ldemangle -lthread -lc
+	           -ldl ${LIBDEMANGLE} -lthread -lc
 	[ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_make_solaris_makefiles_vm.make
$NetBSD: patch-hotspot_make_solaris_makefiles_vm.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/make/solaris/makefiles/vm.make.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/make/solaris/makefiles/vm.make
@@ -59,7 +59,11 @@ INCLUDES += $(Src_Dirs_I:%=-I%)
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
   # always build with debug info when we can create .debuginfo files
   # and disable 'lazy debug info' so the .so has everything.
-  SYMFLAG = -g -xs
+  ifdef USE_GCC
+    SYMFLAG = -g
+  else
+    SYMFLAG = -g -xs
+  endif
 else
   ifeq (${VERSION}, debug)
     SYMFLAG = -g
@@ -132,7 +136,7 @@ LIBS += -ldl -lthread -lsocket $(LIBM) -
 endif # 502
 endif # 505
 else
-LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc -ldemangle
+LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc
 endif # sparcWorks
 
 ifeq ("${Platform_arch}", "sparc")
@@ -268,16 +272,19 @@ ifeq ($(LINK_INTO),AOUT)
   LIBS_VM                  = $(LIBS)
 else
   LIBJVM.o                 = $(JVM_OBJ_FILES)
-  LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder
-  LFLAGS_VM$(LDNOMAP)      += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
   LFLAGS_VM                += $(SONAMEFLAG:SONAME=$(LIBJVM))
 ifndef USE_GCC
   LIBS_VM                  = $(LIBS)
+  LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder
+  LFLAGS_VM$(LDNOMAP)      += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
 else
   # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
   # get around library dependency and compatibility issues. Must use gcc not
   # g++ to link.
   LFLAGS_VM                += $(STATIC_LIBGCC)
+  ifeq ($(BUILDARCH),i486)
+    LFLAGS_VM              += -mimpure-text
+  endif
   LIBS_VM                  += $(STATIC_STDCXX) $(LIBS)
 endif
 endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp
$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
@@ -59,6 +59,8 @@ inline void Atomic::dec_ptr(volatile voi
 // facilitate this, os::is_MP() is passed as an additional argument.  64-bit
 // processors are assumed to be multi-threaded and/or multi-core, so the extra
 // argument is unnecessary.
+// This needs cleaning up - gcc always requires is_mp due to laziness of porter.
+#ifndef _GNU_SOURCE
 #ifndef _LP64
 #define IS_MP_DECL() , int is_mp
 #define IS_MP_ARG()  , (int) os::is_MP()
@@ -66,6 +68,11 @@ inline void Atomic::dec_ptr(volatile voi
 #define IS_MP_DECL()
 #define IS_MP_ARG()
 #endif // _LP64
+#else
+#define IS_MP_DECL() , int is_mp
+#define IS_MP_ARG()  , (int) os::is_MP()
+#endif // _GNU_SOURCE
+
 
 extern "C" {
   jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL());
@@ -96,15 +103,27 @@ inline jlong    Atomic::cmpxchg    (jlon
 #ifdef AMD64
 inline void Atomic::store    (jlong    store_value, jlong*             dest) { *dest = store_value; }
 inline void Atomic::store    (jlong    store_value, volatile jlong*    dest) { *dest = store_value; }
+#ifndef _GNU_SOURCE
 extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest);
+#else
+extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest IS_MP_DECL());
+#endif // _GNU_SOURCE
 extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest);
 
 inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+#ifndef _GNU_SOURCE
   return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
+#else
+  return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest IS_MP_ARG());
+#endif // _GNU_SOURCE
 }
 
 inline void*    Atomic::add_ptr(intptr_t add_value, volatile void*     dest) {
+#ifndef _GNU_SOURCE
   return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
+#else
+  return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest IS_MP_ARG());
+#endif // _GNU_SOURCE
 }
 
 inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
@@ -116,11 +135,19 @@ inline void*    Atomic::xchg_ptr(void*
 }
 
 inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+#ifndef _GNU_SOURCE
   return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+#else
+  return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value IS_MP_ARG());
+#endif // _GNU_SOURCE
 }
 
 inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
+#ifndef _GNU_SOURCE
   return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+#else
+  return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value IS_MP_ARG());
+#endif // _GNU_SOURCE
 }
 
 inline jlong Atomic::load(volatile jlong* src) { return *src; }
@@ -257,6 +284,16 @@ extern "C" {
     #endif // if 0
 #endif // AMD64
   }
+
+  inline void _Atomic_move_long(volatile jlong* src, volatile jlong* dst) {
+    __asm__ volatile (
+      "fildll (%0)"   "\n\t"
+      "fistpll (%1)"
+      :
+      :"r" (src), "r" (dst)
+      :"memory");
+  }
+
 }
 #undef LOCK_IF_MP
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp
$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp
@@ -71,7 +71,11 @@ extern "C" {
   }
   inline void _OrderAccess_fence() {
     // Always use locked addl since mfence is sometimes expensive
+#ifdef AMD64
+    __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
+#else
     __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
+#endif // AMD64
   }
 
 }
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp
$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.orig	2012-08-10 16:24:45.000000000 +0000
+++ hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
@@ -237,7 +237,22 @@ frame os::get_sender_for_C_frame(frame*
   return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
 }
 
+#ifdef AMD64
+#define SPELL_REG_FP "rbp"
+#else
+#define SPELL_REG_FP "ebp"
+#endif
+
+#ifdef SPARC_WORKS
 extern "C" intptr_t *_get_current_fp();  // in .il file
+#else
+#ifdef _GNU_SOURCE
+extern "C" intptr_t *_get_current_fp() {
+  register intptr_t **rbp __asm__ (SPELL_REG_FP);
+  return (intptr_t*) *rbp;   // we want what it points to.
+}
+#endif // _GNU_SOURCE
+#endif // SPARC_WORKS
 
 frame os::current_frame() {
   intptr_t* fp = _get_current_fp();  // it's inlined so want current fp
@@ -951,6 +966,11 @@ add_func_t*          os::atomic_add_func
 extern "C" void _solaris_raw_setup_fpu(address ptr);
 void os::setup_fpu() {
   address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
+#ifndef _GNU_SOURCE
   _solaris_raw_setup_fpu(fpu_cntrl);
+#else
+  // same as hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp : os::setup_fpu()
+  __asm__ volatile("fldcw (%0)"::"r"(fpu_cntrl):"memory");
+#endif
 }
 #endif // AMD64
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp
$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC compatability.

--- hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp
@@ -34,14 +34,28 @@ extern "C" {
 
 inline void Prefetch::read (void *loc, intx interval) {
 #ifdef AMD64
+#ifdef SPARC_WORKS
   _Prefetch_read(loc, interval);
+#else
+#ifdef _GNU_SOURCE
+  __asm__ ("prefetcht0 (%0,%1,1)" : : "r" (loc), "r" (interval));
+#endif // _GNU_SOURCE
+#endif // SPARC_WORKS
 #endif // AMD64
 }
 
 // Use of this method should be gated by VM_Version::has_prefetchw.
 inline void Prefetch::write(void *loc, intx interval) {
 #ifdef AMD64
+#ifdef SPARC_WORKS
   _Prefetch_write(loc, interval);
+#else
+#ifdef _GNU_SOURCE
+  // Do not use the 3dnow prefetchw instruction.  It isn't supported on em64t.
+  //  __asm__ ("prefetchw (%0,%1,1)" : : "r" (loc), "r" (interval));
+  __asm__ ("prefetcht0 (%0,%1,1)" : : "r" (loc), "r" (interval));
+#endif // _GNU_SOURCE
+#endif // SPARC_WORKS
 #endif // AMD64
 }
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp
$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC support.

--- hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp
@@ -65,7 +65,10 @@ public:
     __asm__ __volatile__ ("movq %%fs:0, %0" : "=r"(rv));
     return rv;
 #else
-    return gs_thread();
+    uintptr_t rv;
+    __asm__ __volatile__ ("movl %%gs:0, %0" : "=r"(rv));
+    return rv;
+//    return gs_thread();
 #endif // AMD64
 #else  //_GNU_SOURCE
     return _raw_thread_id();
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os_posix_vm_os__posix.cpp
$NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

rlim_t fixes.

--- hotspot/src/os/posix/vm/os_posix.cpp.orig	2013-06-11 09:37:03.648327363 +0000
+++ hotspot/src/os/posix/vm/os_posix.cpp
@@ -130,12 +130,12 @@ void os::Posix::print_rlimit_info(output
 
   st->print(" STACK ");
   getrlimit(RLIMIT_STACK, &rlim);
-  if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+  if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity");
   else st->print("%uk", rlim.rlim_cur >> 10);
 
   st->print(", CORE ");
   getrlimit(RLIMIT_CORE, &rlim);
-  if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+  if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity");
   else st->print("%uk", rlim.rlim_cur >> 10);
 
   //Isn't there on solaris
@@ -148,7 +148,7 @@ void os::Posix::print_rlimit_info(output
 
   st->print(", NOFILE ");
   getrlimit(RLIMIT_NOFILE, &rlim);
-  if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+  if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity");
   else st->print("%d", rlim.rlim_cur);
 
 #ifdef __OpenBSD__
@@ -160,7 +160,7 @@ void os::Posix::print_rlimit_info(output
 #else
   st->print(", AS ");
   getrlimit(RLIMIT_AS, &rlim);
-  if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+  if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity");
   else st->print("%uk", rlim.rlim_cur >> 10);
   st->cr();
 #endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os_solaris_dtrace_jhelper.d
$NetBSD: patch-hotspot_src_os_solaris_dtrace_jhelper.d,v 1.1 2013/06/15 09:31:05 jperkin Exp $

GCC compatability.

--- hotspot/src/os/solaris/dtrace/jhelper.d.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os/solaris/dtrace/jhelper.d
@@ -43,16 +43,33 @@
 
 extern pointer __JvmOffsets;
 
-extern pointer __1cJCodeCacheF_heap_;
-extern pointer __1cIUniverseP_methodKlassObj_;
-extern pointer __1cIUniverseO_collectedHeap_;
-extern pointer __1cIUniverseL_narrow_oop_;
+/* name mangling depends on the compiler used */
+#ifndef _GNU_SOURCE
+#define SYMBOL_JCODECACHE_HEAP	__1cJCodeCacheF_heap_
+#define SYMBOL_UNIVERSE_METHODKLASSOBJ	__1cIUniverseP_methodKlassObj_
+#define SYMBOL_UNIVERSE_COLLECTEDHEAP	__1cIUniverseO_collectedHeap_
+#define SYMBOL_UNIVERSE_NARROW_OOP	__1cIUniverseL_narrow_oop_
+#define SYMBOL_NMETHOD_VTBL	__1cHnmethodG__vtbl_
+#define SYMBOL_BUFFERBLOB_VTBL	__1cKBufferBlobG__vtbl_
+#else
+#define SYMBOL_JCODECACHE_HEAP	_ZN9CodeCache5_heapE
+#define SYMBOL_UNIVERSE_METHODKLASSOBJ	_ZN8Universe15_methodKlassObjE
+#define SYMBOL_UNIVERSE_COLLECTEDHEAP	_ZN8Universe14_collectedHeapE
+#define SYMBOL_UNIVERSE_NARROW_OOP	_ZN8Universe11_narrow_oopE
+#define SYMBOL_NMETHOD_VTBL	_ZTV7nmethod
+#define SYMBOL_BUFFERBLOB_VTBL	_ZTV10BufferBlob
+#endif /* ! _GNU_SOURCE */
+
+extern pointer SYMBOL_JCODECACHE_HEAP;
+extern pointer SYMBOL_UNIVERSE_METHODKLASSOBJ;
+extern pointer SYMBOL_UNIVERSE_COLLECTEDHEAP;
+extern pointer SYMBOL_UNIVERSE_NARROW_OOP;
 #ifdef _LP64
 extern pointer UseCompressedOops;
 #endif
 
-extern pointer __1cHnmethodG__vtbl_;
-extern pointer __1cKBufferBlobG__vtbl_;
+extern pointer SYMBOL_NMETHOD_VTBL;
+extern pointer SYMBOL_BUFFERBLOB_VTBL;
 
 #define copyin_ptr(ADDR)    *(pointer*)  copyin((pointer) (ADDR), sizeof(pointer))
 #define copyin_uchar(ADDR)  *(uchar_t*)  copyin((pointer) (ADDR), sizeof(uchar_t))
@@ -156,8 +173,8 @@ dtrace:helper:ustack:
 #error "Don't know architecture"
 #endif
 
-  this->Universe_methodKlassOop = copyin_ptr(&``__1cIUniverseP_methodKlassObj_);
-  this->CodeCache_heap_address = copyin_ptr(&``__1cJCodeCacheF_heap_);
+  this->Universe_methodKlassOop = copyin_ptr(&``SYMBOL_UNIVERSE_METHODKLASSOBJ);
+  this->CodeCache_heap_address = copyin_ptr(&``SYMBOL_JCODECACHE_HEAP);
 
   /* Reading volatile values */
 #ifdef _LP64
@@ -166,9 +183,9 @@ dtrace:helper:ustack:
   this->Use_Compressed_Oops  = 0;
 #endif
 
-  this->Universe_narrow_oop_base  = copyin_ptr(&``__1cIUniverseL_narrow_oop_ +
+  this->Universe_narrow_oop_base  = copyin_ptr(&``SYMBOL_UNIVERSE_NARROW_OOP +
                                                OFFSET_NarrowOopStruct_base);
-  this->Universe_narrow_oop_shift = copyin_int32(&``__1cIUniverseL_narrow_oop_ +
+  this->Universe_narrow_oop_shift = copyin_int32(&``SYMBOL_UNIVERSE_NARROW_OOP +
                                                  OFFSET_NarrowOopStruct_shift);
 
   this->CodeCache_low = copyin_ptr(this->CodeCache_heap_address + 
@@ -189,7 +206,7 @@ dtrace:helper:ustack:
   /*
    * Get Java heap bounds
    */
-  this->Universe_collectedHeap = copyin_ptr(&``__1cIUniverseO_collectedHeap_);
+  this->Universe_collectedHeap = copyin_ptr(&``SYMBOL_UNIVERSE_COLLECTEDHEAP);
   this->heap_start = copyin_ptr(this->Universe_collectedHeap +
       OFFSET_CollectedHeap_reserved +
       OFFSET_MemRegion_start);
@@ -290,8 +307,8 @@ dtrace:helper:ustack:
   this->start = this->block + SIZE_HeapBlockHeader;
   this->vtbl = copyin_ptr(this->start);
 
-  this->nmethod_vtbl            = (pointer) &``__1cHnmethodG__vtbl_;
-  this->BufferBlob_vtbl         = (pointer) &``__1cKBufferBlobG__vtbl_;
+  this->nmethod_vtbl            = (pointer) &``SYMBOL_NMETHOD_VTBL;
+  this->BufferBlob_vtbl         = (pointer) &``SYMBOL_BUFFERBLOB_VTBL;
 }
 
 dtrace:helper:ustack:
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp
$NetBSD: patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Avoid libdemangle with GCC.

--- hotspot/src/os/solaris/vm/decoder_solaris.cpp.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/os/solaris/vm/decoder_solaris.cpp
@@ -27,6 +27,11 @@
 #include <demangle.h>
 
 bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) {
+#ifdef SPARC_WORKS
   return !cplus_demangle(symbol, buf, (size_t)buflen);
+#else
+  memcpy(buf, symbol, (size_t)buflen);
+  return 0;
+#endif
 }
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_os_solaris_vm_os__solaris.cpp
$NetBSD: patch-hotspot_src_os_solaris_vm_os__solaris.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $

Misc SunOS casts.

--- hotspot/src/os/solaris/vm/os_solaris.cpp.orig	2012-08-10 16:24:27.000000000 +0000
+++ hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -630,7 +630,7 @@ static bool assign_distribution(processo
   const processorid_t limit_id = max_id + 1;
   // Make up markers for available processors.
   bool* available_id = NEW_C_HEAP_ARRAY(bool, limit_id);
-  for (uint c = 0; c < limit_id; c += 1) {
+  for (processorid_t c = 0; c < limit_id; c += 1) {
     available_id[c] = false;
   }
   for (uint a = 0; a < id_length; a += 1) {
@@ -653,7 +653,7 @@ static bool assign_distribution(processo
     // ... find the next available processor in the board.
     for (uint slot = 0; slot < processors_per_board; slot += 1) {
       uint try_id = board * processors_per_board + slot;
-      if ((try_id < limit_id) && (available_id[try_id] == true)) {
+      if ((try_id < (uint)limit_id) && (available_id[try_id] == true)) {
         distribution[assigned] = try_id;
         available_id[try_id] = false;
         assigned += 1;
@@ -661,7 +661,7 @@ static bool assign_distribution(processo
       }
     }
     board += 1;
-    if (board * processors_per_board + 0 >= limit_id) {
+    if (board * processors_per_board + 0 >= (uint)limit_id) {
       board = 0;
     }
   }
@@ -718,7 +718,7 @@ bool os::bind_to_processor(uint processo
 bool os::getenv(const char* name, char* buffer, int len) {
   char* val = ::getenv( name );
   if ( val == NULL
-  ||   strlen(val) + 1  >  len ) {
+  ||   strlen(val) + 1  >  (size_t)len ) {
     if (len > 0)  buffer[0] = 0; // return a null string
     return false;
   }
@@ -925,7 +925,7 @@ void os::init_system_properties_values()
         strcpy(library_path, common_path);
       } else {
         int inserted = 0;
-        for (i = 0; i < info->dls_cnt; i++, path++) {
+        for (i = 0; (uint_t)i < info->dls_cnt; i++, path++) {
           uint_t flags = path->dls_flags & LA_SER_MASK;
           if (((flags & LA_SER_LIBPATH) == 0) && !inserted) {
             strcat(library_path, common_path);
@@ -1059,7 +1059,8 @@ extern "C" void* java_start(void* thread
   // in java_to_os_priority. So we save the native priority
   // in the osThread and recall it here.
 
-  if ( osthr->thread_id() != -1 ) {
+  // thread_id_t ("osThread_solaris.hpp") == thread_t (<thread.h>) == unsigned int
+  if ( osthr->thread_id() != (unsigned int)-1 ) {
     if ( UseThreadPriorities ) {
       int prio = osthr->native_priority();
       if (ThreadPriorityVerbose) {
@@ -2855,7 +2856,7 @@ void os::numa_make_global(char *addr, si
 // Get the number of the locality groups.
 size_t os::numa_get_groups_num() {
   size_t n = Solaris::lgrp_nlgrps(Solaris::lgrp_cookie());
-  return n != -1 ? n : 1;
+  return n != (size_t) -1 ? n : 1;
 }
 
 // Get a list of leaf locality groups. A leaf lgroup is group that
@@ -2867,7 +2868,7 @@ size_t os::numa_get_leaf_groups(int *ids
      return 1;
    }
    int result_size = 0, top = 1, bottom = 0, cur = 0;
-   for (int k = 0; k < size; k++) {
+   for (size_t k = 0; k < size; k++) {
      int r = Solaris::lgrp_children(Solaris::lgrp_cookie(), ids[cur],
                                     (Solaris::lgrp_id_t*)&ids[top], size - top);
      if (r == -1) {
@@ -2987,7 +2988,7 @@ char *os::scan_pages(char *start, char*
           }
 
         if ((validity[i] & 2) != 0 && page_expected->lgrp_id > 0) {
-          if (outdata[types * i] != page_expected->lgrp_id) {
+          if (outdata[types * i] != (uint64_t)page_expected->lgrp_id) {
             break;
           }
         }
@@ -4714,7 +4715,7 @@ const char * signames[] = {
 const char* os::exception_name(int exception_code, char* buf, size_t size) {
   if (0 < exception_code && exception_code <= SIGRTMAX) {
     // signal
-    if (exception_code < sizeof(signames)/sizeof(const char*)) {
+    if ((size_t)exception_code < sizeof(signames)/sizeof(const char*)) {
        jio_snprintf(buf, size, "%s", signames[exception_code]);
     } else {
        jio_snprintf(buf, size, "SIG%d", exception_code);
@@ -5051,7 +5052,7 @@ void os::init(void) {
   // If the pagesize of the VM is greater than 8K determine the appropriate
   // number of initial guard pages.  The user can change this with the
   // command line arguments, if needed.
-  if (vm_page_size() > 8*K) {
+  if ((size_t)vm_page_size() > 8*K) {
     StackYellowPages = 1;
     StackRedPages = 1;
     StackShadowPages = round_to((StackShadowPages*8*K), vm_page_size()) / vm_page_size();
@@ -5072,7 +5073,7 @@ jint os::init_2(void) {
 
   // Allocate a single page and mark it as readable for safepoint polling.  Also
   // use this first mmap call to check support for MAP_ALIGN.
-  address polling_page = (address)Solaris::mmap_chunk((char*)page_size,
+  address polling_page = (address)Solaris::mmap_chunk((char*)(uintptr_t)page_size,
                                                       page_size,
                                                       MAP_PRIVATE | MAP_ALIGN,
                                                       PROT_READ);
@@ -5126,7 +5127,7 @@ jint os::init_2(void) {
   // stack on a power of 2 boundary.  The real fix for this
   // should be to fix the guard page mechanism.
 
-  if (vm_page_size() > 8*K) {
+  if ((size_t)vm_page_size() > 8*K) {
       threadStackSizeInBytes = (threadStackSizeInBytes != 0)
          ? threadStackSizeInBytes +
            ((StackYellowPages + StackRedPages) * vm_page_size())
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.1 2013/06/15 09:31:06 jperkin Exp $

SunOS fixes.

--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2013-02-19 23:21:59.000000000 +0000
+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
@@ -31,6 +31,10 @@
 // globally used constants & types, class (forward)
 // declarations and a few frequently used utility functions.
 
+#ifdef SOLARIS
+#include <inttypes.h>
+#endif // SOLARIS
+
 #include <ctype.h>
 #include <string.h>
 #include <stdarg.h>
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_com_sun_java_pack_Makefile
$NetBSD: patch-jdk_make_com_sun_java_pack_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/com/sun/java/pack/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/com/sun/java/pack/Makefile
@@ -109,6 +109,15 @@ endif
 endif #LINUX
 endif #PLATFORM
 
+# gcc on solaris; this makes a library, too, so the -Wl, will appear on the LDDFLAGS. it needs to be removed for the exe build
+LINKER_EXE = $(LINKER)
+ifeq ($(PLATFORM), solaris) 
+  ifeq ($(CC_VERSION), gcc)
+    REPLACE=-Wl,-soname=lib$(LIBRARY).so
+    LINKER_EXE = $(subst $(REPLACE),,$(LINKER))
+  endif # CC_VERSION
+endif # PLATFORM
+
 UNPACK_EXE = $(BINDIR)/unpack200$(EXE_SUFFIX)
 
 UNPACK_EXE_FILES_cpp =  $(filter-out jni.cpp,$(FILES_cpp))
@@ -157,7 +166,7 @@ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) upd
 	$(prep-target)
 	$(RM) $(TEMPDIR)/mapfile-vers
 	$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
-	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+	$(LINKER_EXE)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
 ifdef MT
 	$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
 endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Defs-solaris-gcc.gmk
$NetBSD: patch-jdk_make_common_Defs-solaris-gcc.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/common/Defs-solaris-gcc.gmk.orig	2013-03-11 12:55:10.407557389 +0000
+++ jdk/make/common/Defs-solaris-gcc.gmk
@@ -0,0 +1,504 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile to specify compiler flags for programs and libraries
+# targeted to Solaris.  Should not contain any rules.
+#
+# WARNING: This file is shared with other workspaces. 
+#          So when it includes other files, it must use JDK_TOPDIR.
+#
+
+# Warning: the following variables are overriden by Defs.gmk. Set
+# values will be silently ignored:
+#   CFLAGS        (set $(OTHER_CFLAGS) instead)
+#   CPPFLAGS      (set $(OTHER_CPPFLAGS) instead)
+#   CXXFLAGS      (set $(OTHER_CXXFLAGS) instead)
+#   LDFLAGS       (set $(OTHER_LDFAGS) instead)
+#   LDLIBS        (set $(EXTRA_LIBS) instead)
+#   LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
+
+# Get shared JDK settings
+include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
+
+# Part of INCREMENTAL_BUILD mechanism.
+#   Compiler emits things like:  path/file.o: file.h
+#   We want something like: relative_path/file.o relative_path/file.d: file.h
+CC_DEPEND	 = -MM
+CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
+
+ifndef PLATFORM_SRC
+  PLATFORM_SRC = $(BUILDDIR)/../src/solaris
+endif # PLATFORM_SRC
+
+# Location of the various .properties files specific to Solaris platform
+ifndef PLATFORM_PROPERTIES
+  PLATFORM_PROPERTIES  = $(BUILDDIR)/../src/solaris/lib
+endif # PLATFORM_SRC
+
+# Platform specific closed sources
+ifndef OPENJDK
+  ifndef CLOSED_PLATFORM_SRC
+    CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
+  endif
+endif
+
+# platform specific include files
+PLATFORM_INCLUDE_NAME = $(PLATFORM)
+PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
+
+# suffix used for make dependencies files.
+DEPEND_SUFFIX = d
+# The suffix applied to the library name for FDLIBM
+FDDLIBM_SUFFIX = a
+# The suffix applied to scripts (.bat for windows, nothing for unix)
+SCRIPT_SUFFIX =
+# CC compiler object code output directive flag value
+CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
+CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
+
+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
+# enabled with debug info files ZIP'ed to save space. For VARIANT !=
+# OPT builds, FDS is always enabled, after all a debug build without
+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
+# meaning when FDS is enabled.
+#
+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
+# disabled for a VARIANT == OPT build.
+#
+# Note: Use of a different variable name for the FDS override option
+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
+# in options via environment variables, use of distinct variables
+# prevents strange behaviours. For example, in a VARIANT != OPT build,
+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
+# variable name is used, then different values can be picked up by
+# different parts of the build. Just to be clear, we only need two
+# variable names because the incoming option value can be overridden
+# in some situations, e.g., a VARIANT != OPT build.
+
+ADD_GNU_DEBUGLINK = $(ABS_BUILDTOOLBINDIR)/add_gnu_debuglink
+FIX_EMPTY_SEC_HDR_FLAGS = $(ABS_BUILDTOOLBINDIR)/fix_empty_sec_hdr_flags
+
+ifeq ($(VARIANT), OPT)
+  FULL_DEBUG_SYMBOLS ?= 1
+  ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
+else
+  # debug variants always get Full Debug Symbols (if available)
+  ENABLE_FULL_DEBUG_SYMBOLS = 1
+endif
+_JUNK_ := $(shell \
+  echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
+# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
+
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifndef CROSS_COMPILE_ARCH
+    # Default OBJCOPY comes from GNU Binutils on Solaris:
+    DEF_OBJCOPY=/opt/local/bin/objcopy
+  else
+    # Assume objcopy is part of the cross-compilation toolkit
+    DEF_OBJCOPY=$(COMPILER_PATH)/objcopy
+  endif
+  OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+  ifneq ($(ALT_OBJCOPY),)
+    _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
+    # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
+    OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
+  endif
+
+  # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the
+  # JDK build to import .debuginfo or .diz files from the HotSpot build.
+  # However, adding FDS support to the JDK build will occur in phases
+  # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
+  # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a
+  # particular library or program supports FDS.
+
+  ifeq ($(OBJCOPY),)
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
+    ENABLE_FULL_DEBUG_SYMBOLS=0
+  else
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+
+    # Library stripping policies for .debuginfo configs:
+    #   all_strip - strips everything from the library
+    #   min_strip - strips most stuff from the library; leaves minimum symbols
+    #   no_strip  - does not strip the library at all
+    #
+    # Oracle security policy requires "all_strip". A waiver was granted on
+    # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+    #
+    # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled.
+    STRIP_POLICY ?= min_strip
+
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+
+    ZIP_DEBUGINFO_FILES ?= 1
+
+    _JUNK_ := $(shell \
+      echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
+  endif
+endif
+
+#
+# Default optimization
+#
+
+ifndef OPTIMIZATION_LEVEL
+  ifeq ($(PRODUCT), java)
+    OPTIMIZATION_LEVEL = HIGHER
+  else
+    OPTIMIZATION_LEVEL = LOWER
+  endif
+endif
+ifndef FASTDEBUG_OPTIMIZATION_LEVEL
+  FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
+endif
+
+CC_OPT/NONE     = 
+CC_OPT/LOWER    = -O2
+CC_OPT/HIGHER   = -O3
+CC_OPT/HIGHEST  = -O3
+
+CC_OPT          = $(CC_OPT/$(OPTIMIZATION_LEVEL))
+
+# For all platforms, do not omit the frame pointer register usage. 
+#    We need this frame pointer to make it easy to walk the stacks.
+#    This should be the default on X86, but ia64 and amd64 may not have this
+#    as the default.
+CFLAGS_REQUIRED_amd64   += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_amd64    += -m64
+CFLAGS_REQUIRED_i586    += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_i586     += -m32
+CFLAGS_REQUIRED_ia64    += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
+CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
+LDFLAGS_COMMON_sparc    += -m32 -mcpu=v9
+CFLAGS_REQUIRED_arm     += -fsigned-char -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_ppc     += -fsigned-char -D_BIG_ENDIAN
+ifeq ($(ZERO_BUILD), true)
+  CFLAGS_REQUIRED       =  $(ZERO_ARCHFLAG)
+  ifeq ($(ZERO_ENDIANNESS), little)
+    CFLAGS_REQUIRED     += -D_LITTLE_ENDIAN
+  endif
+  LDFLAGS_COMMON        += $(ZERO_ARCHFLAG)
+else
+  CFLAGS_REQUIRED       =  $(CFLAGS_REQUIRED_$(ARCH))
+  LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
+endif
+
+# If this is a --hash-style=gnu system, use --hash-style=both
+#   The gnu .hash section won't work on some Linux systems like SuSE 10.
+_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
+ifneq ($(_HAS_HASH_STYLE_GNU),)
+  LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
+endif
+LDFLAGS_COMMON          += $(LDFLAGS_HASH_STYLE)
+
+#
+# Selection of warning messages
+#
+GCC_INHIBIT	= -Wno-unused -Wno-parentheses
+GCC_STYLE	= 
+GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
+
+#
+# Treat compiler warnings as errors, if warnings not allowed
+#
+ifeq ($(COMPILER_WARNINGS_FATAL),true)
+  GCC_WARNINGS += -Werror
+endif
+
+#
+# Misc compiler options
+#
+ifneq ($(ARCH),ppc)
+  CFLAGS_COMMON   = -fno-strict-aliasing
+endif 
+PIC_CODE_LARGE = -fPIC
+PIC_CODE_SMALL = -fpic
+GLOBAL_KPIC = $(PIC_CODE_LARGE)
+CFLAGS_COMMON   += $(GLOBAL_KPIC) $(GCC_WARNINGS)
+ifeq ($(ARCH), amd64)
+ CFLAGS_COMMON += -pipe
+endif
+
+# Linux 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
+DEBUG_FLAG = -g
+ifeq ($(FASTDEBUG), true)
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    DEBUG_FLAG = -g1
+  endif
+endif
+
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+  DEBUG_FLAG = -g
+  CFLAGS_REQUIRED += $(DEBUG_FLAG)
+endif
+
+# If Full Debug Symbols is enabled, then we want the same debug and
+# optimization flags as used by FASTDEBUG.
+#
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+  ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+    ifeq ($(VARIANT), OPT)
+      CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
+    endif
+  endif
+endif
+
+CFLAGS_OPT      = $(CC_OPT)
+CFLAGS_DBG      = $(DEBUG_FLAG)
+CFLAGS_COMMON += $(CFLAGS_REQUIRED)
+
+CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
+CXXFLAGS_OPT	= $(CC_OPT)
+CXXFLAGS_DBG	= $(DEBUG_FLAG)
+CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
+
+# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
+ifeq ($(FASTDEBUG), true)
+  CFLAGS_DBG    += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
+  CXXFLAGS_DBG	+= $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
+endif
+
+CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
+
+# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
+ifneq ($(ARCH),alpha)
+  CPP_ARCH_FLAGS += -D$(ARCH)
+else
+  CPP_ARCH_FLAGS += -D_$(ARCH)_
+endif
+
+CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D__solaris__ $(VERSION_DEFINES) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
+
+ifeq ($(ARCH_DATA_MODEL), 64)
+CPPFLAGS_COMMON += -D_LP64=1
+endif
+
+CPPFLAGS_OPT    = -DNDEBUG
+CPPFLAGS_DBG    = -DDEBUG
+ifneq ($(PRODUCT), java)
+  CPPFLAGS_DBG    += -DLOGGING 
+endif
+
+ifdef LIBRARY
+  # Libraries need to locate other libraries at runtime, and you can tell
+  #   a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
+  #   buried inside the .so. The $ORIGIN says to look relative to where
+  #   the library itself is and it can be followed with relative paths from
+  #   that. By default we always look in $ORIGIN, optionally we add relative
+  #   paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
+  #   On Linux we add a flag -z origin, not sure if this is necessary, but 
+  #   doesn't seem to hurt.
+  #   The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
+  #   Try: 'readelf -d lib*.so' to see these settings in a library.
+  #
+ifndef USE_GCC
+  Z_ORIGIN_FLAG/sparc = -Xlinker -z -Xlinker origin
+  Z_ORIGIN_FLAG/i586  = -Xlinker -z -Xlinker origin
+  Z_ORIGIN_FLAG/amd64 = -Xlinker -z -Xlinker origin 
+  Z_ORIGIN_FLAG/ia64  = -Xlinker -z -Xlinker origin
+  Z_ORIGIN_FLAG/arm   = 
+  Z_ORIGIN_FLAG/ppc   =
+  Z_ORIGIN_FLAG/zero  = -Xlinker -z -Xlinker origin
+
+  LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
+
+  LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
+  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
+else
+  LDFLAGS_COMMON += -Wl,-R${PREFIX}/lib
+  LDFLAGS_COMMON += -Wl,-R${PREFIX}/java/openjdk7/jre/lib/$(LIBARCH)
+  LDFLAGS_COMMON += -Wl,-R${PREFIX}/java/openjdk7/jre/lib/$(LIBARCH)/jli
+endif # USE_GCC
+endif # LIBRARY
+
+EXTRA_LIBS += -lc
+
+LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
+LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
+
+#
+# -L paths for finding and -ljava
+#
+#LDFLAGS_OPT     = -Xlinker -O1
+LDFLAGS_OPT     = 
+LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
+ifdef LIBRARY
+LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
+endif
+
+#
+# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
+# statically link libgcc but will print a warning with the flag. We don't 
+# want the warning, so check gcc version first.
+#
+ifeq ($(CC_MAJORVER),3)
+  OTHER_LDFLAGS  += -static-libgcc
+endif
+
+# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
+#   (See Rules.gmk) The gcc 5 compiler might have an option for this?
+AUTOMATIC_PCH_OPTION = 
+
+#
+# Post Processing of libraries/executables
+#
+ifeq ($(VARIANT), OPT)
+  ifneq ($(NO_STRIP), true)
+    ifneq ($(DEBUG_BINARIES), true)
+      # Debug 'strip -g' leaves local function Elf symbols (better stack
+      # traces)
+      POST_STRIP_PROCESS = $(STRIP) -g
+    endif
+  endif
+endif
+
+#
+# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
+#
+# actually if linker = illumos
+ifeq ($(CC_VERSION),gcc)
+LD_MAPFILE_FLAG = -Xlinker -M -Xlinker
+else
+LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
+#LD_MAPFILE_FLAG = -M
+endif
+
+#
+# Support for Quantify.
+#
+ifdef QUANTIFY
+QUANTIFY_CMD = quantify
+QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
+LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
+endif
+
+#
+# Path and option to link against the VM, if you have to.  Note that
+# there are libraries that link against only -ljava, but they do get
+# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
+# the library itself should not.
+#
+VM_NAME         = server
+JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -Wl,-R${PREFIX}/java/openjdk7/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+JAVALIB         = -ljava $(JVMLIB)
+
+#
+# We want to privatize JVM symbols on Solaris. This is so the user can
+# write a function called FindClass and this should not override the 
+# FindClass that is inside the JVM. At this point in time we are not
+# concerned with other JNI libraries because we hope that there will
+# not be as many clashes there.
+#
+PRIVATIZE_JVM_SYMBOLS = false
+
+#USE_PTHREADS = true
+#override ALT_CODESET_KEY         = _NL_CTYPE_CODESET_NAME
+override AWT_RUNPATH             =
+#override HAVE_ALTZONE            = false
+#override HAVE_FILIOH             = false
+#override HAVE_GETHRTIME          = false
+#override HAVE_GETHRVTIME         = false
+#override HAVE_SIGIGNORE          = true
+#override LEX_LIBRARY             = -lfl
+ifeq ($(STATIC_CXX),true)
+override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
+else
+override LIBCXX                  = -lstdc++
+endif
+#override LIBPOSIX4               =
+override LIBM                    = /usr/lib$(ISA_DIR)/libm.so.2
+override LIBSOCKET               = -lsocket
+override LIBNSL                  = -lnsl
+override LIBSCF                  = -lscf
+#override LIBTHREAD               =
+override LIBDL                   = -ldl
+#override MOOT_PRIORITIES         = true
+#override NO_INTERRUPTIBLE_IO     = true
+override OPENWIN_HOME            = /opt/local
+override OPENWIN_LIB             = $(OPENWIN_HOME)/lib$(ISA_DIR)
+override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
+#override SUN_CMM_SUBDIR          =
+override THREADS_FLAG            = native
+#override USE_GNU_M4              = true
+override USING_GNU_TAR           = true
+#override WRITE_LIBVERSION        = false
+
+# assuming that solaris && gcc equals a system with modular X11 header location
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(CC_VERSION), gcc)
+    OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+  endif # CC_VERSION
+endif # PLATFORM
+
+# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
+# resulting resolved absolute name of the executable in the environment
+# variable EXECNAME.  That executable name is then used that to locate the
+# installation area.
+#override USE_EXECNAME            = true
+
+# If your platform has DPS, it will have Type1 fonts too, in which case
+# it is best to enable DPS support until such time as 2D's rasteriser
+# can fully handle Type1 fonts in all cases. Default is "yes".
+# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
+# DPS (Displayable PostScript) is available on Solaris machines
+HAVE_DPS = no
+
+SYSTEM_ZLIB = true
+
+#
+# Japanese manpages
+#
+JA_SOURCE_ENCODING = eucJP
+JA_TARGET_ENCODINGS = UTF-8
+
+# Settings for the JDI - Serviceability Agent binding.
+HOTSPOT_SALIB_PATH   = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH)
+SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
+SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
+SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
+
+# The JDI - Serviceability Agent binding is not currently supported
+# on Linux-ia64.
+#ifeq ($(ARCH), ia64)
+#  INCLUDE_SA = false
+#else
+  INCLUDE_SA = true
+#endif
+
+ifdef CROSS_COMPILE_ARCH
+  # X11 headers are not under /usr/include
+  OTHER_CFLAGS += -I$(OPENWIN_HOME)/include
+  OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+  OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Defs-solaris.gmk
$NetBSD: patch-jdk_make_common_Defs-solaris.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/common/Defs-solaris.gmk.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/common/Defs-solaris.gmk
@@ -44,6 +44,10 @@
 # Note: CPPFLAGS are used in C and C++ compiles.
 #
 
+ifdef USE_GCC
+  include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM)-gcc.gmk
+else
+
 # Get shared JDK settings
 include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
 
@@ -799,3 +803,5 @@ SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.
 SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz
 INCLUDE_SA=true
 
+endif # USE_GCC
+
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Mapfile-vers.gmk
$NetBSD: patch-jdk_make_common_Mapfile-vers.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/common/Mapfile-vers.gmk.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/common/Mapfile-vers.gmk
@@ -50,14 +50,16 @@ ifeq ($(VARIANT), OPT)
   ifndef FILES_m
     FILES_m =        mapfile-vers
   endif
-  
+
+ifneq ($(CC_VERSION), gcc)
   # If we are re-ordering functions in this solaris library, we need to make
   # sure that -xF is added to the compile lines. This option is critical and
   # enables the functions to be reordered.
   ifdef FILES_reorder
     CFLAGS_OPT   += -xF
     CXXFLAGS_OPT += -xF
-  endif
+  endif # FILES_reorder
+endif # USE_GCC
 
 INIT += $(TEMPDIR)/mapfile-vers
 
@@ -70,9 +72,15 @@ $(TEMPDIR)/mapfile-vers : $(FILES_m) $(F
 endif # VARIANT
 
 ifndef LDNOMAP
+ifneq ($(CC_VERSION), gcc)
   LDMAPFLAGS_OPT =  -M$(TEMPDIR)/mapfile-vers
   LDMAPFLAGS_DBG =  $(FILES_m:%=-M%)
-endif
+else
+  ## proper passthrough for gcc
+  LDMAPFLAGS_OPT =  -Xlinker -M$(TEMPDIR)/mapfile-vers
+  LDMAPFLAGS_DBG =  $(FILES_m:%=-Xlinker -M%)
+endif # USE_GCC
+endif # LDNOMAP
 
 endif # PLATFORM
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_Program.gmk
$NetBSD: patch-jdk_make_common_Program.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/common/Program.gmk.orig	2013-06-11 09:37:03.843509400 +0000
+++ jdk/make/common/Program.gmk
@@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM)
 ifndef CROSS_COMPILE_ARCH
   # reuse the mapfiles in the launcher's directory, the same should
   # be applicable to the tool launchers as well.
-  FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
+  # Except when the makefile requests a specific mapfile.
+  ifndef FILES_m
+    FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
+  endif # ! FILES_m
   include $(BUILDDIR)/common/Mapfile-vers.gmk
 endif
 
@@ -110,6 +113,7 @@ ifneq (,$(findstring $(PLATFORM), linux
   LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
   OTHER_LDLIBS += -ljli
   ifeq ($(PLATFORM), solaris)
+    LDFLAGS += -R ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/jli
     ifeq ($(ARCH_DATA_MODEL), 32)
       LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
       LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
@@ -124,6 +128,9 @@ ifneq (,$(findstring $(PLATFORM), linux
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
   endif # PLATFORM LINUX
+  ifeq ($(SYSTEM_ZLIB),true)
+    OTHER_LDLIBS += $(ZLIB_LIBS)
+  endif # SYSTEM_ZLIB
 endif # PLATFORM linux solaris
 
 ifeq ($(PLATFORM), windows)
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_shared_Compiler-gcc.gmk
$NetBSD: patch-jdk_make_common_shared_Compiler-gcc.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC needs -shared not -G.

--- jdk/make/common/shared/Compiler-gcc.gmk.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/common/shared/Compiler-gcc.gmk
@@ -80,7 +80,7 @@ ifeq ($(PLATFORM), solaris)
   CXX            = $(COMPILER_PATH)g++
 
   # Option used to create a shared library
-  SHARED_LIBRARY_FLAG = -G
+  SHARED_LIBRARY_FLAG = -shared
   
 endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_shared_Defs-utils.gmk
$NetBSD: patch-jdk_make_common_shared_Defs-utils.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Use pkgsrc zip commands.

--- jdk/make/common/shared/Defs-utils.gmk.orig	2013-03-10 22:22:12.950670029 +0000
+++ jdk/make/common/shared/Defs-utils.gmk
@@ -254,3 +254,7 @@ ifeq ($(PLATFORM), macosx)
   # Builtin shell command, no -e option needed
   ECHO         = echo
 endif
+
+ZIPEXE     = $(PKGSRC_ZIPEXE)
+UNZIP      = $(PKGSRC_UNZIP)
+UNZIPSFX   = $(PKGSRC_UNZIPSFX)
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_common_shared_Defs-versions.gmk
$NetBSD: patch-jdk_make_common_shared_Defs-versions.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Add GCC support.

--- jdk/make/common/shared/Defs-versions.gmk.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/common/shared/Defs-versions.gmk
@@ -36,7 +36,11 @@ endif
 
 # Solaris uses Sun Studio compilers by default
 ifeq ($(PLATFORM), solaris)
-  override CC_VERSION = sun
+  ifdef USE_GCC
+    override CC_VERSION = gcc
+  else
+    override CC_VERSION = sun
+  endif
 endif
 
 # Linux uses GNU compilers by default
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_instrument_Makefile
$NetBSD: patch-jdk_make_java_instrument_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Need libiconv.

--- jdk/make/java/instrument/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/java/instrument/Makefile
@@ -119,6 +119,9 @@ else
   OTHER_LDLIBS += -ldl 
   ifeq ($(PLATFORM), solaris)
     LDFLAGS += -R \$$ORIGIN/jli
+    ifeq ($(CC_VERSION), gcc)
+      OTHER_LDLIBS += -liconv
+    endif
   endif
   ifeq ($(PLATFORM), linux)
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_nio_Makefile
$NetBSD: patch-jdk_make_java_nio_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Ensure we pick up the main flags.

--- jdk/make/java/nio/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/java/nio/Makefile
@@ -34,6 +34,9 @@ PRODUCT = java
 OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
 include $(BUILDDIR)/common/Defs.gmk
 
+LDDFLAGS += $(LDFLAGS_COMMON_$(ARCH))
+CPPFLAGS += $(CFLAGS_REQUIRED_$(ARCH))
+
 NIO_SRC = $(SHARE_SRC)/classes/java/nio
 NIO_GEN = $(GENSRCDIR)/java/nio
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_java_npt_Makefile
$NetBSD: patch-jdk_make_java_npt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC needs libiconv.

--- jdk/make/java/npt/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/java/npt/Makefile
@@ -38,6 +38,12 @@ FILES_m = mapfile-vers
 
 include $(BUILDDIR)/common/Defs.gmk
 
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(CC_VERSION), gcc)
+    OTHER_LDLIBS += -liconv
+  endif # CC_VERSION
+endif # PLATFORM
+
 SRCDIR=$(SHARE_SRC)/npt
 PSRCDIR=$(PLATFORM_SRC)/npt
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_sun_awt_Makefile
$NetBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/sun/awt/Makefile.orig	2013-06-11 14:02:41.501545894 +0000
+++ jdk/make/sun/awt/Makefile
@@ -94,6 +94,7 @@ ifeq  ($(PLATFORM), solaris)
 FILES_c = $(FILES_2D_c)
 FILES_c += awt_LoadLibrary.c
 OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
+ifneq ($(CC_VERSION), gcc)
 ifeq ($(CC_VER), 5.8)
   ifndef REMOVE_ALL_WORKAROUNDS
     ifeq ($(ARCH_FAMILY), i586)
@@ -114,6 +115,7 @@ ifeq ($(CC_VER), 5.8)
     endif
   endif
 endif
+endif # ! CC_VERSION
 endif
 
 ifeq  ($(PLATFORM), linux)
@@ -427,7 +429,15 @@ FONTCONFIGS_SRC	= $(PLATFORM_SRC)/classe
 _FONTCONFIGS	= \
 	fontconfig.properties
 
-FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+ifndef DISTRO
+  DISTRO=$(PLATFORM)
+endif # DISTRO
+
+ifeq ($(DISTRO), pkgsrc)
+  FONTCONFIGS_SRC_PREFIX = pkgsrc.
+else
+  FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+endif # DISTRO
 
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
 endif # PLATFORM
@@ -543,12 +553,7 @@ ifneq ($(PLATFORM), windows)
 # Other extra flags needed for compiling.
 #
 
-ifeq ($(PLATFORM), linux)
-CPPFLAGS += -I$(OPENWIN_HOME)/include \
-            -I$(OPENWIN_HOME)/include/X11/extensions \
-            -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
-endif
-ifeq ($(PLATFORM), bsd)
+ifneq (,$(findstring $(PLATFORM), linux bsd solaris))
 CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
 endif
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
@@ -573,13 +578,10 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGD
 	    $(EVENT_MODEL)
 
 # include these last so we don't pick up unintentional includes
-ifeq ($(PLATFORM), bsd)
+ifneq (,$(findstring $(PLATFORM), linux bsd solaris))
 CPPFLAGS += -I$(OPENWIN_HOME)/include \
-	    -I$(OPENWIN_HOME)/include/X11/extensions
-endif
-
-ifneq (,$(findstring $(PLATFORM), linux bsd))
-LDFLAGS += -L$(OPENWIN_LIB)
+            -I$(OPENWIN_HOME)/include/X11/extensions
+LDFLAGS += -L$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB)
 endif
 
 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_sun_awt_mawt.gmk
$NetBSD: patch-jdk_make_sun_awt_mawt.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Fix "Extraneous text after `ifeq' directive".

--- jdk/make/sun/awt/mawt.gmk.orig	2013-06-14 12:22:13.564220901 +0000
+++ jdk/make/sun/awt/mawt.gmk
@@ -193,7 +193,7 @@ endif
 #
 # Other extra flags needed for compiling.
 #
-ifneq ($(PLATFORM), bsd))
+ifneq ($(PLATFORM), bsd)
 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
 
 ifndef HEADLESS
@@ -245,13 +245,13 @@ ifeq ($(PLATFORM), linux)
                         $(wildcard /usr/include/X11/extensions))
 endif
 
-ifeq ($(PLATFORM), bsd))
+ifeq ($(PLATFORM), bsd)
   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
               -I$(OPENWIN_HOME)/include \
               -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
 endif
 
-ifeq ($(PLATFORM), macosx))
+ifeq ($(PLATFORM), macosx)
   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
               -I$(OPENWIN_HOME)/include 
 endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_sun_security_ec_Makefile
$NetBSD: patch-jdk_make_sun_security_ec_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC compatability.

--- jdk/make/sun/security/ec/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/make/sun/security/ec/Makefile
@@ -187,6 +187,15 @@ ifeq ($(NATIVE_ECC_AVAILABLE), true)
   #
   OTHER_CFLAGS += -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B
 
+  # gcc on solaris seems to define _POSIX_C_SOURCE or _XOPEN
+  # g++, on the otherhand, does not define either.
+  # It causes problems with g++: _B_FALSE instead of B_FALSE
+  ifeq ($(PLATFORM), solaris)
+    ifeq ($(CC_VERSION), gcc)
+      OTHER_CFLAGS += -D_XOPEN_SOURCE -D_XOPEN_VERSION=4 -D__EXTENSIONS__
+    endif # CC_VERSION
+  endif # PLATFORM
+
   #
   # Libraries to link
   #
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_sun_splashscreen_Makefile
$NetBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/sun/splashscreen/Makefile.orig	2013-06-11 09:37:03.893407544 +0000
+++ jdk/make/sun/splashscreen/Makefile
@@ -91,6 +91,11 @@ else ifneq ($(PLATFORM), windows)
       OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
     endif
   endif
+  ifeq ($(PLATFORM), solaris)
+    ifeq ($(CC_VERSION), gcc)
+      OTHER_LDLIBS += -liconv
+    endif
+  endif
   CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
   OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
 else # PLATFORM
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_make_sun_xawt_Makefile
$NetBSD: patch-jdk_make_sun_xawt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/sun/xawt/Makefile.orig	2013-06-11 09:37:03.894233474 +0000
+++ jdk/make/sun/xawt/Makefile
@@ -58,7 +58,7 @@ endif
 
 # For Xrender extension.
 ifeq ($(PLATFORM), solaris)
-LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR)
+LDFLAGS += -Wl,-R$(OPENWIN_LIB)
 endif
 
 ifeq ($(PLATFORM), linux)
@@ -170,6 +170,9 @@ endif
 # we will set a flag indicating this mismatch and the JDK source file
 # will interpret it to resolve the problem.
 ifeq ($(PLATFORM), solaris)
+  ifeq ($(CC_VERSION), gcc)
+    CPPFLAGS += -I$(OPENWIN_HOME)/include
+  endif # CC_VERSION
   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
   OS_VERSION := $(shell uname -r)
   XRENDER_H := $(OPENWIN_HOME)/share/include/X11/extensions/Xrender.h
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h
$NetBSD: patch-jdk_src_share_native_com_sun_java_util_jar_pack_defines.h,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Avoid uLong conflicts on !BSD.

--- jdk/src/share/native/com/sun/java/util/jar/pack/defines.h.orig	2013-06-14 21:08:03.030278224 +0000
+++ jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
@@ -93,7 +93,7 @@ extern int assert_failed(const char*);
 // bytes and byte arrays
 
 typedef unsigned int uint;
-#if !defined(_ALLBSD_SOURCE) || (defined(_ALLBSD_SOURCE) && defined(NO_ZLIB))
+#if defined(NO_ZLIB)
 #ifdef _LP64
 typedef unsigned int uLong; // Historical zlib, should be 32-bit.
 #else
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Ensure we use the bundled jpeg.

--- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
@@ -50,7 +50,7 @@
 #include "com_sun_imageio_plugins_jpeg_JPEGImageWriter.h"
 
 /* headers from the JPEG library */
-#include <jpeglib.h>
+#include "jpeglib.h"
 #include "jerror.h"
 
 #undef MAX
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c
$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Ensure we use the bundled jpeg.

--- jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
@@ -44,7 +44,7 @@
 /* undo "system_boolean" hack and undef FAR since we don't use it anyway */
 #undef boolean
 #undef FAR
-#include <jpeglib.h>
+#include "jpeglib.h"
 #include "jerror.h"
 
 /* The method IDs we cache. Note that the last two belongs to the
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h
$NetBSD: patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC compatability.

--- jdk/src/share/native/sun/security/ec/impl/ecc_impl.h.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
@@ -38,12 +38,13 @@
 
 #ifndef _ECC_IMPL_H
 #define _ECC_IMPL_H
+  
+#include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <sys/types.h>
 #include "ecl-exp.h"
 
 /*
@@ -57,6 +58,11 @@ typedef unsigned long ulong_t;
 typedef enum { B_FALSE, B_TRUE } boolean_t;
 #endif /* __linux__ */
 
+#if defined(__solaris__) && defined(_GNU_SOURCE)
+#define B_FALSE _B_FALSE
+#define B_TRUE _B_TRUE
+#endif /* __solaris__ && _GNU_SOURCE */
+
 #ifdef _ALLBSD_SOURCE
 #include <stdint.h>
 #define B_FALSE FALSE
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_solaris_bin_ergo__i586.c
$NetBSD: patch-jdk_src_solaris_bin_ergo__i586.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC compatability.

--- jdk/src/solaris/bin/ergo_i586.c.orig	2013-06-12 00:28:04.421609606 +0000
+++ jdk/src/solaris/bin/ergo_i586.c
@@ -27,7 +27,7 @@
 
 static unsigned long physical_processors(void);
 
-#ifdef __solaris__
+#if defined(__solaris__) && !defined(_GNU_SOURCE)
 
 /*
  * A utility method for asking the CPU about itself.
@@ -76,7 +76,9 @@ get_cpuid(uint32_t arg,
   asm(" popl    %ebx");
 #endif /* LP64 */
 }
+#endif /* __solaris__ && !_GNU_SOURCE */
 
+#ifdef __solaris__
 /* The definition of a server-class machine for solaris-i586/amd64 */
 jboolean
 ServerClassMachineImpl(void) {
@@ -106,7 +108,7 @@ ServerClassMachineImpl(void) {
 
 #endif /* __solaris__ */
 
-#if !defined(MACOSX) && (defined(__linux__) || defined(_ALLBSD_SOURCE))
+#if !defined(MACOSX) && (defined(__linux__) || defined(_ALLBSD_SOURCE)) || (defined(__solaris__) && defined(_GNU_SOURCE))
 
 /*
  * A utility method for asking the CPU about itself.
@@ -177,6 +179,7 @@ get_cpuid(uint32_t arg,
 #define OSNAMEPREFIX "bsd_"
 #endif
 
+#ifndef __solaris__
 /* The definition of a server-class machine for linux-i586 */
 jboolean
 ServerClassMachineImpl(void) {
@@ -203,6 +206,7 @@ ServerClassMachineImpl(void) {
            (result == JNI_TRUE ? "true" : "false"));
   return result;
 }
+#endif /* !__solaris__ */
 #endif /* !MACOSX && (__linux__ || _ALLBSD_SOURCE) */
 
 /*
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Zones support.

--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/src/solaris/native/java/net/NetworkInterface.c
@@ -43,6 +43,7 @@
 #include <fcntl.h>
 #include <stropts.h>
 #include <sys/sockio.h>
+#include <zone.h>
 #endif
 
 #ifdef __linux__
@@ -1525,7 +1526,8 @@ static short getSubnet(JNIEnv *env, int
 
 
 
-#define DEV_PREFIX  "/dev/"
+#define NET_DEV_PREFIX  "/dev/"
+#define ZONE_NET_DEV_PREFIX  "/dev/net/"
 
 /**
  * Solaris specific DLPI code to get hardware address from a device.
@@ -1542,11 +1544,18 @@ static int getMacFromDevice(JNIEnv *env,
     int flags = 0;
 
    /**
-    * Device is in /dev
+    * Device is in /dev in global zone / standalone
     * e.g.: /dev/bge0
+    * Device is in /dev/net in a zone
+    * e.g.: /dev/net/net0
     */
-    strcpy(style1dev, DEV_PREFIX);
+    if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) {
+        strcpy(style1dev, NET_DEV_PREFIX);
+    } else {
+        strcpy(style1dev, ZONE_NET_DEV_PREFIX);
+    }
     strcat(style1dev, ifname);
+
     if ((fd = open(style1dev, O_RDWR)) < 0) {
         /*
          * Can't open it. We probably are missing the privilege.
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_src_solaris_native_sun_awt_X11Color.c
$NetBSD: patch-jdk_src_solaris_native_sun_awt_X11Color.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Casting.

--- jdk/src/solaris/native/sun/awt/X11Color.c.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/src/solaris/native/sun/awt/X11Color.c
@@ -119,7 +119,7 @@ int getVirtCubeSize() {
         return LOOKUPSIZE;
     }
 
-    for (i = 0; i < MACHMAPSIZE; i++) {
+    for (i = 0; i < (int)MACHMAPSIZE; i++) {
         if (strcmp(name.machine, machinemap[i].machine) == 0) {
 #ifdef DEBUG
             if (debug_colormap) {
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_test_Makefile
$NetBSD: patch-jdk_test_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Use tools from pkgsrc.

--- jdk/test/Makefile.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/Makefile
@@ -54,6 +54,8 @@ UNAME     = uname
 UNIQ      = uniq
 WC        = wc
 ZIP       = zip
+UNZIP     = unzip
+WHICH     = which
 
 # Get OS name from uname
 UNAME_S := $(shell $(UNAME) -s)
@@ -376,6 +378,12 @@ else
   JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 endif
 
+# carry over XAUTHORITY
+JTREG_TEST_OPTIONS += -e:XAUTHORITY
+
+# some tests expect to find zip and unzip on the path
+JTREG_TEST_OPTIONS += -e:PATH=/bin:/usr/bin:$(dir $(shell $(WHICH) $(ZIP))):$(dir $(shell $(WHICH) $(UNZIP)))
+
 ifdef CONCURRENCY
   EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
 endif
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java
$NetBSD: patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Test fixes.

--- jdk/test/java/beans/Introspector/4168475/Test4168475.java.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/java/beans/Introspector/4168475/Test4168475.java
@@ -41,6 +41,8 @@ public class Test4168475 {
     private static final String[] PATH = {"infos"};
 
     public static void main(String[] args) throws IntrospectionException {
+        // running under jtreg -agentvm: system classloader can't find this class (separate classloader?)
+        Thread.currentThread().setContextClassLoader(Test4168475.class.getClassLoader());
         Introspector.setBeanInfoSearchPath(PATH);
         BeanInfo info = Introspector.getBeanInfo(Component.class);
         PropertyDescriptor[] pds = info.getPropertyDescriptors();
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java
$NetBSD: patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Test fixes.

--- jdk/test/java/beans/Introspector/4520754/Test4520754.java.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/java/beans/Introspector/4520754/Test4520754.java
@@ -56,6 +56,8 @@ public class Test4520754 {
     };
 
     public static void main(String[] args) {
+        // running under jtreg -agentvm: system classloader can't find this class (separate classloader?)
+        Thread.currentThread().setContextClassLoader(Test4520754.class.getClassLoader());
         // ensure that 4168475 does not regress
         test4168475(Component.class);
         // AWT classes (com.sun.beans.infos.ComponentBeanInfo)
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_test_java_beans_Introspector_Test4144543.java
$NetBSD: patch-jdk_test_java_beans_Introspector_Test4144543.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Test fixes.

--- jdk/test/java/beans/Introspector/Test4144543.java.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/java/beans/Introspector/Test4144543.java
@@ -34,7 +34,8 @@ import java.beans.PropertyDescriptor;
 
 public class Test4144543 {
     public static void main(String[] args) throws Exception {
-        Class type = Beans.instantiate(null, "Test4144543").getClass();
+        // running under jtreg -agentvm: system classloader can't find this class (separate classloader?)
+        Class type = Beans.instantiate(Test4144543.class.getClassLoader(), "Test4144543").getClass();
 
         // try all the various places that this would break before
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java
$NetBSD: patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Test fixes.

--- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
@@ -103,6 +103,8 @@ public class GetSystemLoadAverage {
                 ? output.split(" ")
                 : output.split(",");
         double expected = Double.parseDouble(lavg[0]);
+        // round to value to two decimals; some OSes report more (SmartOS at least)
+        expected = 0.01D * Math.round(expected / 0.01D);
         double lowRange = expected * (1 - DELTA);
         double highRange = expected * (1 + DELTA);
File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-jdk_test_sun_security_ec_TestEC.java
$NetBSD: patch-jdk_test_sun_security_ec_TestEC.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $

Test fixes.

--- jdk/test/sun/security/ec/TestEC.java.orig	2013-02-20 17:07:30.000000000 +0000
+++ jdk/test/sun/security/ec/TestEC.java
@@ -82,7 +82,7 @@ public class TestEC {
         // ClientJSSEServerJSSE fails on Solaris 11 when both SunEC and
         // SunPKCS11-Solaris providers are enabled.
         // Workaround:
-        // Security.removeProvider("SunPKCS11-Solaris");
+        Security.removeProvider("SunPKCS11-Solaris");
         new ClientJSSEServerJSSE().main(p);
 
         long stop = System.currentTimeMillis();