Date: Sun, 8 Mar 2020 16:52:58 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528057 - in head/java/openjdk7: . files Message-ID: <202003081652.028Gqwcq053446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Mar 8 16:52:57 2020 New Revision: 528057 URL: https://svnweb.freebsd.org/changeset/ports/528057 Log: Update to 7u251 Added: head/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile (contents, props changed) head/java/openjdk7/files/patch-jdk_make_java_npt_Makefile (contents, props changed) head/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile (contents, props changed) head/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java (contents, props changed) Deleted: head/java/openjdk7/files/patch-bsd head/java/openjdk7/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp head/java/openjdk7/files/patch-hotspot_make_bsd_makefiles_gcc.make head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp head/java/openjdk7/files/patch-jdk_make_common_Defs-bsd.gmk head/java/openjdk7/files/patch-jdk_make_tools_freetypecheck_freetypecheck.c head/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp head/java/openjdk7/files/patch-src-share-classes-sun-print-PSPrinterJob.java head/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c head/java/openjdk7/files/patch-src-solaris-classes-sun-awt-X11-XWM.java head/java/openjdk7/files/patch-src-solaris-classes-sun-print-UnixPrintServiceLookup.java Modified: head/java/openjdk7/Makefile head/java/openjdk7/distinfo head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Sun Mar 8 16:47:26 2020 (r528056) +++ head/java/openjdk7/Makefile Sun Mar 8 16:52:57 2020 (r528057) @@ -2,49 +2,23 @@ # $FreeBSD$ PORTNAME= openjdk -PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} +PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} PORTEPOCH= 1 CATEGORIES= java devel -MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ - http://download.java.net/jaxp/1.4.5/:jaxp \ - http://icedtea.classpath.org/download/drops/:jaxp \ - http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws \ - http://icedtea.classpath.org/download/drops/:jaxws \ - https://java.net/downloads/jax-ws/JDK7/:jaf \ - http://icedtea.classpath.org/download/drops/:jaf \ - APACHE/ant/binaries/:ant -PATCH_SITES= LOCAL/glewis/openjdk7 -DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ - ${ANT_DISTFILE}${EXTRACT_SUFX}:ant -EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ - ${ANT_DISTFILE}${EXTRACT_SUFX} -PATCHFILES= patch-7u45-b30.xz \ - patch-7u51-b30.xz \ - patch-7u55-b31.xz \ - patch-7u60-b30.xz \ - patch-7u65-b31.xz \ - patch-7u71-b14.xz \ - patch-7u76-b31.xz \ - patch-7u80-b32.xz \ - patch-7u85-b02.xz \ - patch-7u91-b02.xz \ - patch-7u95-b00.xz \ - patch-7u101-b00.xz \ - patch-7u111-b01.xz \ - patch-7u121-b00.xz \ - patch-7u131-b00.xz \ - patch-7u141-b02.xz \ - patch-7u151-b01.xz \ - patch-7u161-b01.xz +MASTER_SITES= APACHE/ant/binaries/:ant +DISTFILES= ${ANT_DISTFILE}${EXTRACT_SUFX}:ant -MAINTAINER?= glewis@FreeBSD.org -COMMENT?= Java Development Kit 7 +MAINTAINER= glewis@FreeBSD.org +COMMENT= Java Development Kit 7 LICENSE= GPLv2 -WRKSRC= ${WRKDIR}/${PORTNAME} +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= jdk7u +GH_TAGNAME= jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -USES= compiler dos2unix iconv gmake zip +USES= compiler dos2unix iconv gmake # Even when not building with X11 support, openjdk7 requires Xrender, X11, and # Xt headers. X11_BUILD_DEPENDS_OFF+= ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 @@ -78,16 +52,15 @@ JAVAVMS_COMMENT+= JRE INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre .endif -PORT_MINOR_VERSION= 161 -PORT_BUILD_NUMBER= 01 JDK_MAJOR_VERSION= 7 -JDK_MINOR_VERSION= 40 -JDK_BUILD_NUMBER= 43 -JDK_BUILD_DATE= 26_aug_2013 -JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} +JDK_UPDATE_VERSION= 251 +JDK_BUILD_NUMBER= 02 +BSD_JDK_VERSION= 1 -# Use our own version of ant to avoid circular dependencies -ANT_VERSION= 1.9.7 +# Use our own version of ant because +# a) this allows us to avoid circular dependencies +# b) ant 10.x requires jdk 8+ +ANT_VERSION= 1.9.14 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin LIB_DEPENDS+= libasound.so:audio/alsa-lib \ @@ -130,9 +103,9 @@ MAKE_ENV+= JAVA_HOME="" \ SKIP_DEBUG_BUILD="true" \ ZIP_DEBUGINFO_FILES=0 \ ENABLE_FULL_DEBUG_SYMBOLS=0 \ - PTHREAD_LIBS="-lpthread" \ + PTHREAD_LIBS="-pthread" \ MILESTONE="fcs" \ - JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \ + JDK_MICRO_VERSION="0_${JDK_UPDATE_VERSION}" \ BUILD_NUMBER="b${PORT_BUILD_NUMBER}" MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER} @@ -173,20 +146,21 @@ MAKE_ENV+= USE_PRECOMPILED_HEADER=0 .endif .if empty(ICONV_LIB) -MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG +ICONV_CPPFLAGS= -DLIBICONV_PLUG +.else +ICONV_CPPFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif post-patch: @${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \ ${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \ - ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java -.if empty(ICONV_LIB) - @${REINPLACE_CMD} 's| -liconv||' \ - ${WRKSRC}/Makefile \ + ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java + @${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile \ ${WRKSRC}/jdk/make/java/npt/Makefile \ ${WRKSRC}/jdk/make/java/instrument/Makefile -.endif .if ${PORT_OPTIONS:MTZUPDATE} pre-install: Modified: head/java/openjdk7/distinfo ============================================================================== --- head/java/openjdk7/distinfo Sun Mar 8 16:47:26 2020 (r528056) +++ head/java/openjdk7/distinfo Sun Mar 8 16:52:57 2020 (r528057) @@ -1,41 +1,5 @@ -TIMESTAMP = 1518019203 -SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596 -SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196 -SHA256 (apache-ant-1.9.7-bin.zip) = b28c5ea0b5ea90bb4ad6bab229b6a56ac4461760a251a12567803a69259cd9de -SIZE (apache-ant-1.9.7-bin.zip) = 8317465 -SHA256 (patch-7u45-b30.xz) = f0ab28db8819a72b82236d98c6780a0fa063cf4d2f45f26105545559e630a1b3 -SIZE (patch-7u45-b30.xz) = 156968 -SHA256 (patch-7u51-b30.xz) = af1143952a0f67535c2bdf586b7089af1d525f544974e989fe7b273a925b8359 -SIZE (patch-7u51-b30.xz) = 170476 -SHA256 (patch-7u55-b31.xz) = 30d4ae0e98e639dca060f7dc8289fe8af345e93258c8642cad1378725330afa9 -SIZE (patch-7u55-b31.xz) = 109908 -SHA256 (patch-7u60-b30.xz) = 1132c6c32f515b735b7b3f78670ec81c3161b7afe8a10f21f68f851c2e776a4c -SIZE (patch-7u60-b30.xz) = 324180 -SHA256 (patch-7u65-b31.xz) = acde33caa1691a6a1bcb4cab71ea01ce73df616d02d023bda053e3f728850d72 -SIZE (patch-7u65-b31.xz) = 87776 -SHA256 (patch-7u71-b14.xz) = 2fa4622c55d55e27679ef99ce5d528210d66982abdfae53bf7fa9850e160db27 -SIZE (patch-7u71-b14.xz) = 66484 -SHA256 (patch-7u76-b31.xz) = a9ddaf7ee121b29bff9cd0300e7939640f6933223d81a484fa2db575cbb7f3de -SIZE (patch-7u76-b31.xz) = 315184 -SHA256 (patch-7u80-b32.xz) = 095e2f074125a3804710b7276fd96b743befb0472c3a3b5fd3a695511a10ff23 -SIZE (patch-7u80-b32.xz) = 674268 -SHA256 (patch-7u85-b02.xz) = 87699747b28ae80cb168f1e2af3dcff65cc0ef9a74decebcf4ee1868b117f971 -SIZE (patch-7u85-b02.xz) = 78796 -SHA256 (patch-7u91-b02.xz) = b18c3843d656340fcca0e9b0eb0410a598dbce9c53c84fc6fde53d189bf44829 -SIZE (patch-7u91-b02.xz) = 152344 -SHA256 (patch-7u95-b00.xz) = bb522469cedcd31ff15fde745ab5717bd012c52ce2e25d1180b3338b90f755a3 -SIZE (patch-7u95-b00.xz) = 91612 -SHA256 (patch-7u101-b00.xz) = 8406d9f453b91c4e31e5a6a0a1769c3da87e3e3bf7a4c567024f7f929f555702 -SIZE (patch-7u101-b00.xz) = 121752 -SHA256 (patch-7u111-b01.xz) = d46ffd30a6fa6d8ce40231e6dadcabf491a347e2afea87302f38bab5e2bee523 -SIZE (patch-7u111-b01.xz) = 273552 -SHA256 (patch-7u121-b00.xz) = e8cba92ab639210471db536fb316593eef300d67bbf36146922eef0a41b6e86b -SIZE (patch-7u121-b00.xz) = 670484 -SHA256 (patch-7u131-b00.xz) = 5c7b4f9be1d7bc3336ba19c288c882ff5cbd1b1b0ee403f84229cd8807452024 -SIZE (patch-7u131-b00.xz) = 769172 -SHA256 (patch-7u141-b02.xz) = 721db525f519417c30d37bcfa80ff715a1e2858e0882e75759b4eaedd6a20510 -SIZE (patch-7u141-b02.xz) = 165488 -SHA256 (patch-7u151-b01.xz) = 90f1f83528825290f2183f4122e8cef8e1bac4814a826f449271cc7635ca197c -SIZE (patch-7u151-b01.xz) = 217872 -SHA256 (patch-7u161-b01.xz) = 9c466a4a39a77fab96798ce120dd1dc7446d6930bd25ae5390ce3e9e9a4b8dc2 -SIZE (patch-7u161-b01.xz) = 364440 +TIMESTAMP = 1583113236 +SHA256 (apache-ant-1.9.14-bin.tar.gz) = ad6b296a76f0ad433bc6b4ebda41c3275e0dc03f0e9a6c8c299f787a5e4c3fe4 +SIZE (apache-ant-1.9.14-bin.tar.gz) = 5837539 +SHA256 (battleblow-jdk7u-7.251.02.1-jdk7u251-b02.1_GH0.tar.gz) = b709d9e344c4ebbc5bb71646a7e78137ad47f2e17fb61739c7be0420ececc707 +SIZE (battleblow-jdk7u-7.251.02.1-jdk7u251-b02.1_GH0.tar.gz) = 69828420 Added: head/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_make_java_instrument_Makefile Sun Mar 8 16:52:57 2020 (r528057) @@ -0,0 +1,13 @@ +--- jdk/make/java/instrument/Makefile.orig 2020-03-01 17:52:15.797379000 -0800 ++++ jdk/make/java/instrument/Makefile 2020-03-01 18:45:55.324964000 -0800 +@@ -117,8 +117,8 @@ + LDFLAGS += -Wl,--no-whole-archive + ifneq ($(OS_NAME), netbsd) + # Use CPPFLAGS instead of OTHER_INCLUDES to force this last +- CPPFLAGS += -I$(PACKAGE_PATH)/include +- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv ++ CPPFLAGS += %%ICONV_CPPFLAGS%% ++ OTHER_LDLIBS += %%ICONV_LDFLAGS%% + endif + endif + Added: head/java/openjdk7/files/patch-jdk_make_java_npt_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_make_java_npt_Makefile Sun Mar 8 16:52:57 2020 (r528057) @@ -0,0 +1,13 @@ +--- jdk/make/java/npt/Makefile.orig 2020-03-01 18:39:54.449760000 -0800 ++++ jdk/make/java/npt/Makefile 2020-03-01 18:46:01.524983000 -0800 +@@ -77,8 +77,8 @@ + # Add location of iconv headers + ifeq ($(PLATFORM), bsd) + ifneq ($(OS_NAME), netbsd) +- CPPFLAGS += -I$(PACKAGE_PATH)/include +- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv ++ CPPFLAGS += %%ICONV_CPPFLAGS%% ++ OTHER_LDLIBS += %%ICONV_LDFLAGS%% + endif + endif + Added: head/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_make_sun_splashscreen_Makefile Sun Mar 8 16:52:57 2020 (r528057) @@ -0,0 +1,13 @@ +--- jdk/make/sun/splashscreen/Makefile.orig 2020-03-01 18:41:52.052960000 -0800 ++++ jdk/make/sun/splashscreen/Makefile 2020-03-01 18:46:07.203955000 -0800 +@@ -93,8 +93,8 @@ + ifeq ($(OS_NAME), netbsd) + OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) + else +- CPPFLAGS += -I$(PACKAGE_PATH)/include +- OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv ++ CPPFLAGS += %%ICONV_CPPFLAGS%% ++ OTHER_LDLIBS += %%ICONV_LDFLAGS%% + endif + CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions + OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread Added: head/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_src_share_classes_com_sun_java_swing_plaf_gtk_Metacity.java Sun Mar 8 16:52:57 2020 (r528057) @@ -0,0 +1,15 @@ +--- jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java ++++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java +@@ -477,10 +477,8 @@ + String[] dirs = new String[] { + userHome + sep + ".themes", + System.getProperty("swing.metacitythemedir"), +- "/usr/X11R6/share/themes", +- "/usr/X11R6/share/gnome/themes", +- "/usr/local/share/themes", +- "/usr/local/share/gnome/themes", ++ "%%LOCALBASE%%/share/themes", ++ "%%LOCALBASE%%/share/gnome/themes", + "/usr/share/themes", + "/usr/gnome/share/themes", // Debian/Redhat/Solaris + "/opt/gnome2/share/themes" // SuSE Modified: head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp ============================================================================== --- head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp Sun Mar 8 16:47:26 2020 (r528056) +++ head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp Sun Mar 8 16:52:57 2020 (r528057) @@ -4,35 +4,8 @@ * 7: The default directories, normally /lib and /usr/lib. */ #ifndef DEFAULT_LIBPATH --#define DEFAULT_LIBPATH "/lib:/usr/lib" +-#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib" +#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib" #endif #define EXTENSIONS_DIR "/lib/ext" -@@ -2947,7 +2947,7 @@ - if (::write(fd, "", 1) == 1) { - mmap(base, size, - PROT_READ|PROT_WRITE|PROT_EXEC, -- MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE, fd, 0); -+ MAP_PRIVATE|MAP_FIXED, fd, 0); - } - } - ::close(fd); -@@ -3196,7 +3196,7 @@ - return ::mprotect(addr, size, PROT_NONE) == 0; - #else - uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE, -- MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0); -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); - return res != (uintptr_t) MAP_FAILED; - #endif - } -@@ -3223,7 +3223,7 @@ - char * addr; - int flags; - -- flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS; -+ flags = MAP_PRIVATE | MAP_ANONYMOUS; - if (fixed) { - assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address"); - flags |= MAP_FIXED;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003081652.028Gqwcq053446>