diff --git a/devel/jdk/1.6/Makefile b/devel/jdk/1.6/Makefile index 4677b8fb887..1a26fe20905 100644 --- a/devel/jdk/1.6/Makefile +++ b/devel/jdk/1.6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2013/03/19 19:26:45 kurt Exp $ +# $OpenBSD: Makefile,v 1.46 2013/04/10 02:47:10 kurt Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= amd64 i386 @@ -10,9 +10,9 @@ UPDATE= 32 BUILD= b27 PKGNAME= jdk-${VERSION} PKGNAME-main= jdk-${VERSION} -REVISION-main= 2 +REVISION-main= 3 PKGNAME-jre= jre-${VERSION} -REVISION-jre= 2 +REVISION-jre= 3 # see jaxp/jaxp.properties & jaxws/jaxws.properties # in ${WRKDIR} for names and download locations of extra distfiles @@ -74,6 +74,11 @@ BUILD_DEPENDS= archivers/zip \ MODULES= converters/libiconv WANTLIB= X11 Xext Xi Xtst c freetype m pthread sndio stdc++ z +APACHE_ANT= apache-ant-1.8.4-bin.tar.gz +SUPDISTFILES+= openjdk6-bootjdk-amd64-20130409.tar.gz:1 \ + openjdk6-bootjdk-i386-20130409.tar.gz:1 \ + ${APACHE_ANT}:5 + .if ${FLAVOR:Mnative_bootstrap} INSTALLED!= (pkg_info -e "jdk->=1.6,<1.7" -q && echo yes) || echo no .if ${INSTALLED:L} != "yes" @@ -83,14 +88,12 @@ BUILD_DEPENDS+= jdk->=1.6,<1.7:devel/jdk/1.6 \ devel/apache-ant>=1.8.2 ALT_BOOTDIR= ${LOCALBASE}/${JDKHOME} .else -BOOT_JDK= openjdk6-bootjdk-${ARCH}-20130128.tar.gz -APACHE_ANT= apache-ant-1.8.4-bin.tar.gz +BOOT_JDK= openjdk6-bootjdk-${ARCH}-20130409.tar.gz .include .if (${ARCH}==amd64) || (${ARCH}==i386) DISTFILES+= ${BOOT_JDK}:1 .endif DISTFILES+= ${APACHE_ANT}:5 -SUPDISTFILES+= openjdk6-bootjdk-amd64-20130128.tar.gz:1 openjdk6-bootjdk-i386-20130128.tar.gz:1 EXTRACT_ONLY+= ${BOOT_JDK} ${APACHE_ANT} MAKE_ENV+= ANT_HOME=${WRKDIST}/apache-ant-1.8.4 \ LD_LIBRARY_PATH=${WRKDIST}/bootjdk-libs @@ -230,9 +233,12 @@ build-bootjdk: ${_BUILD_COOKIE} @mkdir -p ${WRKDIR}/tmp/bootjdk-libs @cd ${JDKIMAGEDIR} && tar -cf - * | tar -C ${WRKDIR}/tmp/bootjdk -xf - @cd ${WRKDIR}/tmp/bootjdk/bin && rm appletviewer policytool - @cd ${WRKDIR}/tmp/bootjdk/jre/lib/${ARCH} && rm libnpt.so libinstrument.so libsplashscreen.so xawt/libmawt.so libfontmanager.so + @cd ${WRKDIR}/tmp/bootjdk/jre/lib/${ARCH} && rm libnpt.so libinstrument.so libsplashscreen.so xawt/libmawt.so @ldd ${WRKDIR}/tmp/bootjdk/bin/unpack200 | \ grep rlib | cut -d"/" -f 2-20 | \ xargs -I % cp /% ${WRKDIR}/tmp/bootjdk-libs + @objdump -p ${WRKDIR}/tmp/bootjdk/jre/lib/${ARCH}/libfontmanager.so | \ + grep NEEDED | grep libfreetype | sed -e 's/[[:blank:]]*NEEDED[[:blank:]]*//' | \ + xargs -I % cp ${X11BASE}/lib/% ${WRKDIR}/tmp/bootjdk-libs @cd ${WRKDIR}/tmp && tar czf openjdk6-bootjdk-${ARCH}-$$(date +%Y%m%d).tar.gz bootjdk* @echo "New bootjdk is located at ${WRKDIR}/tmp/openjdk6-bootjdk-${ARCH}-$$(date +%Y%m%d).tar.gz" diff --git a/devel/jdk/1.6/distinfo b/devel/jdk/1.6/distinfo index e92ad772b9e..7d11a2f0d65 100644 --- a/devel/jdk/1.6/distinfo +++ b/devel/jdk/1.6/distinfo @@ -4,13 +4,13 @@ SHA256 (jdk/jdk6-jaf-b20.zip) = eMe1ydYnHojuRqut0BimHx6WRfiTbMjfFhfl9PUHQBI= SHA256 (jdk/jdk6-jaxws2_1_6-2011_06_13.zip) = IpBAVE55H0SQbo57b2+vUDxzCl2FQnUTXzklSQ1cO+M= SHA256 (jdk/openjdk-6-src-b27-26_oct_2012.tar.gz) = BEw4d7FZQP8E+KqBczfyh4oAzIlnSFRVfxoC8VsYAqA= SHA256 (jdk/openjdk-6u32-patch-set-20130113.zip) = Vz6NNneua+6oXPxULBDIp3Mm20KS5l+JQsAVbTaKAqE= -SHA256 (jdk/openjdk6-bootjdk-amd64-20130128.tar.gz) = aXuScEcLClXQxOt8FG1jFbScLSuiAwPJxX19+5Yy9x0= -SHA256 (jdk/openjdk6-bootjdk-i386-20130128.tar.gz) = IXeXaXshyig8bKN1U9yOG7qOTMk7Hm4XGHuvx0kGCDg= +SHA256 (jdk/openjdk6-bootjdk-amd64-20130409.tar.gz) = Fk+/Sf/n4v4RYWGA/JqZ7+TJDlFtyNRuHnB1Tz31PV0= +SHA256 (jdk/openjdk6-bootjdk-i386-20130409.tar.gz) = Og9nenWMTZRRW8YfTc6oWX+TWKYJcG9f0bJCAtLTcW4= SIZE (jdk/apache-ant-1.8.4-bin.tar.gz) = 5425171 SIZE (jdk/jaxp144_04.zip) = 5976385 SIZE (jdk/jdk6-jaf-b20.zip) = 71243 SIZE (jdk/jdk6-jaxws2_1_6-2011_06_13.zip) = 5512710 SIZE (jdk/openjdk-6-src-b27-26_oct_2012.tar.gz) = 45789350 SIZE (jdk/openjdk-6u32-patch-set-20130113.zip) = 155544 -SIZE (jdk/openjdk6-bootjdk-amd64-20130128.tar.gz) = 64124771 -SIZE (jdk/openjdk6-bootjdk-i386-20130128.tar.gz) = 65882637 +SIZE (jdk/openjdk6-bootjdk-amd64-20130409.tar.gz) = 65157477 +SIZE (jdk/openjdk6-bootjdk-i386-20130409.tar.gz) = 66016173 diff --git a/devel/jdk/1.6/patches/patch-hotspot_src_share_vm_runtime_os_cpp b/devel/jdk/1.6/patches/patch-hotspot_src_share_vm_runtime_os_cpp deleted file mode 100644 index 7931fb29579..00000000000 --- a/devel/jdk/1.6/patches/patch-hotspot_src_share_vm_runtime_os_cpp +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.1 2013/02/01 15:34:35 kurt Exp $ ---- hotspot/src/share/vm/runtime/os.cpp.orig Tue Jan 29 11:01:19 2013 -+++ hotspot/src/share/vm/runtime/os.cpp Tue Jan 29 11:02:27 2013 -@@ -391,6 +391,13 @@ void* os::native_java_library() { - if (_native_java_library == NULL) { - vm_exit_during_initialization("Unable to load native library", ebuf); - } -+ -+#if defined(__OpenBSD__) -+ // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so -+ // ignore errors -+ dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net"); -+ dll_load(buffer, ebuf, sizeof(ebuf)); -+#endif - } - static jboolean onLoaded = JNI_FALSE; - if (onLoaded) { diff --git a/devel/jdk/1.6/patches/patch-jdk_make_sun_awt_mawt_gmk b/devel/jdk/1.6/patches/patch-jdk_make_sun_awt_mawt_gmk new file mode 100644 index 00000000000..88cff49c1eb --- /dev/null +++ b/devel/jdk/1.6/patches/patch-jdk_make_sun_awt_mawt_gmk @@ -0,0 +1,19 @@ +$OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.1 2013/04/10 02:47:10 kurt Exp $ +--- jdk/make/sun/awt/mawt.gmk.orig Tue Apr 9 15:31:27 2013 ++++ jdk/make/sun/awt/mawt.gmk Tue Apr 9 15:34:43 2013 +@@ -202,15 +202,6 @@ endif + # + # Other extra flags needed for compiling. + # +-CPPFLAGS += -I$(CUPS_HEADERS_PATH) +- +-ifndef HEADLESS +-CPPFLAGS += -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include +-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) +- +-endif # !HEADLESS +- + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ + -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \