Date: Sun, 14 Feb 2021 17:33:14 +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: r565254 - in head/java: . openjdk16 openjdk16/files Message-ID: <202102141733.11EHXE1P013541@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Feb 14 17:33:14 2021 New Revision: 565254 URL: https://svnweb.freebsd.org/changeset/ports/565254 Log: Add a port of OpenJDK 16 Added: head/java/openjdk16/ - copied from r565185, head/java/openjdk15/ Modified: head/java/Makefile head/java/openjdk16/Makefile head/java/openjdk16/distinfo head/java/openjdk16/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk Modified: head/java/Makefile ============================================================================== --- head/java/Makefile Sun Feb 14 17:17:25 2021 (r565253) +++ head/java/Makefile Sun Feb 14 17:33:14 2021 (r565254) @@ -96,6 +96,7 @@ SUBDIR += openjdk13 SUBDIR += openjdk14 SUBDIR += openjdk15 + SUBDIR += openjdk16 SUBDIR += openjdk7 SUBDIR += openjdk7-jre SUBDIR += openjdk8 Modified: head/java/openjdk16/Makefile ============================================================================== --- head/java/openjdk15/Makefile Sat Feb 13 23:00:46 2021 (r565185) +++ head/java/openjdk16/Makefile Sun Feb 14 17:33:14 2021 (r565254) @@ -2,7 +2,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -22,6 +22,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ + libharfbuzz.so:print/harfbuzz \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png RUN_DEPENDS= javavm:java/javavmwrapper \ @@ -32,7 +33,7 @@ USE_XORG= x11 xext xi xrandr xrender xt xtst USE_GITHUB= yes GH_ACCOUNT= battleblow -GH_PROJECT= jdk15u +GH_PROJECT= jdk16 NO_CCACHE= yes @@ -54,10 +55,10 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes -JDK_MAJOR_VERSION= 15 +JDK_MAJOR_VERSION= 16 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 2 -JDK_BUILD_NUMBER= 7 +JDK_PATCH_VERSION= 0 +JDK_BUILD_NUMBER= 36 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 @@ -81,6 +82,7 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-giflib=system \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ + --with-harfbuzz=system \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ @@ -107,8 +109,8 @@ JDK_BUILD_TYPE= release ONLY_FOR_ARCHS+=aarch64 .endif -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk15 \ - ${LOCALBASE}/openjdk14 +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk16 \ + ${LOCALBASE}/openjdk15 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} @@ -119,8 +121,8 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) -BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk14 -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk14 +BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk15 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk15 .endif JDK_BUILD_JVM= server Modified: head/java/openjdk16/distinfo ============================================================================== --- head/java/openjdk15/distinfo Sat Feb 13 23:00:46 2021 (r565185) +++ head/java/openjdk16/distinfo Sun Feb 14 17:33:14 2021 (r565254) @@ -1,3 +1,3 @@ -TIMESTAMP = 1611282896 -SHA256 (battleblow-jdk15u-jdk-15.0.2+7-1_GH0.tar.gz) = 52b9804f89c2b4d597a485450b145b7f033731147d0c75ec14f8e940f88decd1 -SIZE (battleblow-jdk15u-jdk-15.0.2+7-1_GH0.tar.gz) = 101982613 +TIMESTAMP = 1613315672 +SHA256 (battleblow-jdk16-jdk-16+36-1_GH0.tar.gz) = 5f70f83c658a815b0230988ec959754eb6fbfec0d9727a8c9804a9b28b35a2fc +SIZE (battleblow-jdk16-jdk-16+36-1_GH0.tar.gz) = 104445168 Modified: head/java/openjdk16/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk ============================================================================== --- head/java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk Sat Feb 13 23:00:46 2021 (r565185) +++ head/java/openjdk16/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk Sun Feb 14 17:33:14 2021 (r565254) @@ -1,11 +1,11 @@ --- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC +++ make/modules/java.desktop/lib/Awt2dLibraries.gmk -@@ -631,7 +631,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ +@@ -579,7 +579,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ - -framework CoreGraphics, \ + LIBS_macosx := -lawt_lwawt, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + $(WIN_AWT_LIB), \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102141733.11EHXE1P013541>