Date: Fri, 29 Mar 2019 01:05:26 +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: r497064 - in head/java/openjdk11: . files Message-ID: <201903290105.x2T15Qe5021698@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Mar 29 01:05:26 2019 New Revision: 497064 URL: https://svnweb.freebsd.org/changeset/ports/497064 Log: . Update to 11.0.2.9.4 . Sort LIB_DEPENDS and USE_XORG . Add a dependency in alsa-lib now that sound is supported on FreeBSD. . Don't disable dtrace now that it is supported on FreeBSD. . Less intrusive iconv change. Deleted: head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 head/java/openjdk11/files/patch-make_autoconf_lib-bundled.m4 head/java/openjdk11/files/patch-make_autoconf_lib-cups.m4 head/java/openjdk11/files/patch-make_autoconf_platform.m4 head/java/openjdk11/files/patch-make_autoconf_spec.gmk.in head/java/openjdk11/files/patch-make_autoconf_toolchain.m4 head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk head/java/openjdk11/files/patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c Modified: head/java/openjdk11/Makefile head/java/openjdk11/distinfo head/java/openjdk11/files/patch-make_autoconf_libraries.m4 head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp Modified: head/java/openjdk11/Makefile ============================================================================== --- head/java/openjdk11/Makefile Thu Mar 28 23:58:18 2019 (r497063) +++ head/java/openjdk11/Makefile Fri Mar 29 01:05:26 2019 (r497064) @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= https://github.com/battleblow/openjdk-jdk11u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -19,14 +18,15 @@ BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash -LIB_DEPENDS= libfreetype.so:print/freetype2 \ +LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ - liblcms2.so:graphics/lcms2 \ + libfreetype.so:print/freetype2 \ libgif.so:graphics/giflib \ + liblcms2.so:graphics/lcms2 \ libpng16.so:graphics/png USES= compiler:features gmake iconv jpeg pkgconfig -USE_XORG= xext x11 xrender xtst xi xt +USE_XORG= x11 xext xi xrender xt xtst WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} @@ -54,14 +54,13 @@ JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 2 JDK_BUILD_NUMBER= 9 -BSD_JDK_VERSION= 2 +BSD_JDK_VERSION= 4 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=/usr/bin/cc \ CXX=/usr/bin/c++ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-ccache \ - --disable-dtrace \ --disable-javac-server \ --disable-hotspot-gtest \ --with-alsa=${LOCALBASE} \ Modified: head/java/openjdk11/distinfo ============================================================================== --- head/java/openjdk11/distinfo Thu Mar 28 23:58:18 2019 (r497063) +++ head/java/openjdk11/distinfo Fri Mar 29 01:05:26 2019 (r497064) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553112684 -SHA256 (jdk-11.0.2+9-2.tar.gz) = 00dbb8e268b9ce2311d5ce95ec18f11524e1ffc5f80d3859bd9a3d6f6b652379 -SIZE (jdk-11.0.2+9-2.tar.gz) = 116739508 +TIMESTAMP = 1553815308 +SHA256 (jdk-11.0.2+9-4.tar.gz) = abaa01c2996eb6e8491c37c400e82658d2305fa2590b157d24095099f1542dec +SIZE (jdk-11.0.2+9-4.tar.gz) = 116770351 Modified: head/java/openjdk11/files/patch-make_autoconf_libraries.m4 ============================================================================== --- head/java/openjdk11/files/patch-make_autoconf_libraries.m4 Thu Mar 28 23:58:18 2019 (r497063) +++ head/java/openjdk11/files/patch-make_autoconf_libraries.m4 Fri Mar 29 01:05:26 2019 (r497064) @@ -1,19 +1,15 @@ ---- make/autoconf/libraries.m4 -+++ make/autoconf/libraries.m4 -@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], - LIBS="$save_LIBS" - - if test "x$OPENJDK_TARGET_OS" = "xbsd"; then -- if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then -- ICONV_CFLAGS="-I$PACKAGE_PATH/include" -- ICONV_LDFLAGS="-L$PACKAGE_PATH/lib" -+ if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +--- make/autoconf/libraries.m4.orig 2019-03-28 16:54:58.823145000 -0700 ++++ make/autoconf/libraries.m4 2019-03-28 16:55:45.533206000 -0700 +@@ -186,9 +186,9 @@ + ICONV_LDFLAGS="-L/usr/local/lib" + ICONV_LIBS=-liconv + else +- ICONV_CFLAGS= +- ICONV_LDFLAGS= +- ICONV_LIBS= + ICONV_CFLAGS=%%ICONV_CFLAGS%% + ICONV_LDFLAGS=%%ICONV_LDFLAGS%% + ICONV_LIBS=%%ICONV_LIBS%% -+ elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then -+ ICONV_CFLAGS="-I/usr/local/include" -+ ICONV_LDFLAGS="-L/usr/local/lib" - ICONV_LIBS=-liconv - else - ICONV_CFLAGS= + fi + else + ICONV_CFLAGS= Modified: head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp ============================================================================== --- head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp Thu Mar 28 23:58:18 2019 (r497063) +++ head/java/openjdk11/files/patch-src_hotspot_os_bsd_os__bsd.cpp Fri Mar 29 01:05:26 2019 (r497064) @@ -1,13 +1,10 @@ ---- src/hotspot/os/bsd/os_bsd.cpp -+++ src/hotspot/os/bsd/os_bsd.cpp -@@ -377,8 +377,10 @@ void os::init_system_properties_values() { - #ifndef DEFAULT_LIBPATH - #ifdef __APPLE__ - #define DEFAULT_LIBPATH "/lib:/usr/lib" -+#elif defined(__NetBSD__) -+ #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" +--- src/hotspot/os/bsd/os_bsd.cpp.orig 2019-03-27 13:28:54.000000000 -0700 ++++ src/hotspot/os/bsd/os_bsd.cpp 2019-03-28 16:46:31.000797000 -0700 +@@ -380,7 +380,7 @@ + #elif defined(__NetBSD__) + #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" #else -- #define DEFAULT_LIBPATH "/usr/lib:" PACKAGE_PATH "/lib" +- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib" + #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib" #endif #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903290105.x2T15Qe5021698>