Date: Fri, 15 Mar 2019 06:02:17 +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: r495770 - in head/java: . openjdk11 openjdk11/files Message-ID: <201903150602.x2F62H3Z004139@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Mar 15 06:02:17 2019 New Revision: 495770 URL: https://svnweb.freebsd.org/changeset/ports/495770 Log: Add a port of OpenJDK 11 Added: head/java/openjdk11/ - copied from r495765, head/java/openjdk8/ head/java/openjdk11/files/patch-make-autoconf-build-performance.m4 (contents, props changed) Deleted: head/java/openjdk11/files/bsd.fontconfig.properties.in head/java/openjdk11/files/fontconfig.patch head/java/openjdk11/files/fpuhack.patch head/java/openjdk11/files/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg head/java/openjdk11/files/nashorn-test-script-jfx-flyingimage-golden-bsd.png head/java/openjdk11/files/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png head/java/openjdk11/files/nashorn-test-script-jfx-spread-golden-bsd.png head/java/openjdk11/files/patch-bsd head/java/openjdk11/files/patch-bsd-test head/java/openjdk11/files/patch-common-autoconf-toolchain.m4 head/java/openjdk11/files/patch-common_autoconf_build-performance.m4 head/java/openjdk11/files/patch-common_autoconf_generated-configure.sh head/java/openjdk11/files/patch-hotspot-agent-src-share-classes-sun-jvm-hotspot-debugger-bsd-BsdThread.java head/java/openjdk11/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp head/java/openjdk11/files/patch-hotspot-src_cpu_zero_vm_methodHandles__zero.cpp head/java/openjdk11/files/patch-hotspot_make_bsd_makefiles_gcc.make head/java/openjdk11/files/patch-hotspot_src_cpu_ppc_vm_vm_version_ppc.cpp head/java/openjdk11/files/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp head/java/openjdk11/files/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp head/java/openjdk11/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp head/java/openjdk11/files/patch-hotspot_src_os_bsd_vm_globals__bsd.hpp head/java/openjdk11/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp head/java/openjdk11/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp head/java/openjdk11/files/patch-hotspot_src_share_vm_runtime_arguments.cpp head/java/openjdk11/files/patch-jdk-make-CompileJavaClasses.gmk head/java/openjdk11/files/patch-jdk-make-lib-Awt2dLibraries.gmk head/java/openjdk11/files/patch-jdk-make-lib-CoreLibraries.gmk head/java/openjdk11/files/patch-jdk-make-lib-NioLibraries.gmk head/java/openjdk11/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk head/java/openjdk11/files/patch-jdk-make-mapfiles-libnio-mapfile-bsd head/java/openjdk11/files/patch-jdk-src-bsd-doc-man-javadoc.1 head/java/openjdk11/files/patch-jdk-src-share-classes-com-sun-java-swing-plaf-gtk-Metacity.java head/java/openjdk11/files/patch-jdk-src-share-classes-sun-applet-AppletPanel.java head/java/openjdk11/files/patch-jdk-src-share-classes-sun-applet-AppletViewerPanel.java head/java/openjdk11/files/patch-jdk-src-share-classes-sun-print-PSPrinterJob.java head/java/openjdk11/files/patch-jdk-src-share-native-sun-font-freetypeScaler.c head/java/openjdk11/files/patch-jdk-src-solaris-classes-native-java-net-NetworkInterface.c head/java/openjdk11/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystem.java head/java/openjdk11/files/patch-jdk-src-solaris-classes-sun-nio-fs-BsdFileSystemProvider.java head/java/openjdk11/files/patch-jdk-src-solaris-classes-sun-nio-fs-DefaultFileSystemProvider.java head/java/openjdk11/files/patch-jdk-src-solaris-native-java-io-UnixFileSystem_md.c head/java/openjdk11/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c head/java/openjdk11/files/patch-jdk-src-solaris-native-sun-nio-fs-UnixNativeDispatcher.c head/java/openjdk11/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c Modified: head/java/Makefile head/java/openjdk11/Makefile head/java/openjdk11/distinfo head/java/openjdk11/files/cacerts head/java/openjdk11/files/patch-configure head/java/openjdk11/pkg-descr Modified: head/java/Makefile ============================================================================== --- head/java/Makefile Fri Mar 15 05:56:34 2019 (r495769) +++ head/java/Makefile Fri Mar 15 06:02:17 2019 (r495770) @@ -110,6 +110,7 @@ SUBDIR += openjdk7-jre SUBDIR += openjdk8 SUBDIR += openjdk8-jre + SUBDIR += openjdk11 SUBDIR += openjfx8-devel SUBDIR += openjfx8-scenebuilder SUBDIR += phpeclipse Modified: head/java/openjdk11/Makefile ============================================================================== --- head/java/openjdk8/Makefile Fri Mar 15 05:10:32 2019 (r495765) +++ head/java/openjdk11/Makefile Fri Mar 15 06:02:17 2019 (r495770) @@ -1,323 +1,101 @@ # $FreeBSD$ PORTNAME= openjdk -PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} +PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} CATEGORIES= java devel -MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ - https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ - LOCAL/jkim:jdk,jtreg +MASTER_SITES= https://github.com/battleblow/openjdk-jdk11u/archive/ PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} -DISTNAME= ${PORTNAME}-${JDK_MAJOR_VERSION}-src-b${DIST_BUILD_NUMBER}-03_mar_2014 -DISTFILES= ${DISTNAME}.zip:jdk +DISTNAME= jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PATCH_SITES= LOCAL/glewis/openjdk8 -PATCHFILES= patch-8u05-b13.xz \ - patch-8u11-b13.xz \ - patch-8u20-b26.xz \ - patch-8u25-b17.xz \ - patch-8u31-b13.xz \ - patch-8u40-b25.xz \ - patch-8u45-b14.xz \ - patch-8u51-b16.xz \ - patch-8u60-b23.xz \ - patch-8u66-b17-1.xz \ - patch-8u72-b15.xz \ - patch-8u74-b02.xz \ - patch-8u77-b03.xz \ - patch-8u92-b14.xz \ - patch-8u102-b14.xz \ - patch-8u112-b16.xz \ - patch-8u121-b13.xz \ - patch-8u131-b11.xz \ - patch-8u144-b01.xz \ - patch-8u152-b16.xz \ - patch-8u162-b12.xz \ - patch-8u172-b11.xz \ - patch-8u181-b13.xz \ - patch-8u192-b26.xz \ - patch-8u202-b08.xz - MAINTAINER= java@FreeBSD.org -COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} +COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 +ONLY_FOR_ARCHS= amd64 + 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 \ - libinotify.so:devel/libinotify -RUN_DEPENDS= javavm:java/javavmwrapper \ - dejavu>0:x11-fonts/dejavu + libfontconfig.so:x11-fonts/fontconfig \ + liblcms2.so:graphics/lcms2 \ + libgif.so:graphics/giflib \ + libpng16.so:graphics/png -USES= compiler:features dos2unix gmake iconv pkgconfig \ - shebangfix +USES= compiler:features gmake iconv jpeg +USE_XORG= xext x11 xrender xtst xi xt -.if !exists(/usr/bin/unzip) -BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip -.endif +WRKSRC= ${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 -WRKSRC= ${WRKDIR}/${PORTNAME} - -DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \ - jdk/src/bsd/doc/man/extcheck.1 \ - jdk/src/bsd/doc/man/idlj.1 \ - jdk/src/bsd/doc/man/jar.1 \ - jdk/src/bsd/doc/man/jarsigner.1 \ - jdk/src/bsd/doc/man/java.1 \ - jdk/src/bsd/doc/man/javac.1 \ - jdk/src/bsd/doc/man/javadoc.1 \ - jdk/src/bsd/doc/man/javah.1 \ - jdk/src/bsd/doc/man/javap.1 \ - jdk/src/bsd/doc/man/jcmd.1 \ - jdk/src/bsd/doc/man/jconsole.1 \ - jdk/src/bsd/doc/man/jdb.1 \ - jdk/src/bsd/doc/man/jdeps.1 \ - jdk/src/bsd/doc/man/jhat.1 \ - jdk/src/bsd/doc/man/jinfo.1 \ - jdk/src/bsd/doc/man/jjs.1 \ - jdk/src/bsd/doc/man/jmap.1 \ - jdk/src/bsd/doc/man/jps.1 \ - jdk/src/bsd/doc/man/jrunscript.1 \ - jdk/src/bsd/doc/man/jsadebugd.1 \ - jdk/src/bsd/doc/man/jstack.1 \ - jdk/src/bsd/doc/man/jstat.1 \ - jdk/src/bsd/doc/man/jstatd.1 \ - jdk/src/bsd/doc/man/keytool.1 \ - jdk/src/bsd/doc/man/native2ascii.1 \ - jdk/src/bsd/doc/man/orbd.1 \ - jdk/src/bsd/doc/man/pack200.1 \ - jdk/src/bsd/doc/man/policytool.1 \ - jdk/src/bsd/doc/man/rmic.1 \ - jdk/src/bsd/doc/man/rmid.1 \ - jdk/src/bsd/doc/man/rmiregistry.1 \ - jdk/src/bsd/doc/man/schemagen.1 \ - jdk/src/bsd/doc/man/serialver.1 \ - jdk/src/bsd/doc/man/servertool.1 \ - jdk/src/bsd/doc/man/tnameserv.1 \ - jdk/src/bsd/doc/man/unpack200.1 \ - jdk/src/bsd/doc/man/wsgen.1 \ - jdk/src/bsd/doc/man/wsimport.1 \ - jdk/src/bsd/doc/man/xjc.1 \ - jdk/src/linux/doc/man/appletviewer.1 \ - jdk/src/linux/doc/man/extcheck.1 \ - jdk/src/linux/doc/man/idlj.1 \ - jdk/src/linux/doc/man/jar.1 \ - jdk/src/linux/doc/man/jarsigner.1 \ - jdk/src/linux/doc/man/java.1 \ - jdk/src/linux/doc/man/javac.1 \ - jdk/src/linux/doc/man/javadoc.1 \ - jdk/src/linux/doc/man/javah.1 \ - jdk/src/linux/doc/man/javap.1 \ - jdk/src/linux/doc/man/jcmd.1 \ - jdk/src/linux/doc/man/jconsole.1 \ - jdk/src/linux/doc/man/jdb.1 \ - jdk/src/linux/doc/man/jdeps.1 \ - jdk/src/linux/doc/man/jhat.1 \ - jdk/src/linux/doc/man/jinfo.1 \ - jdk/src/linux/doc/man/jjs.1 \ - jdk/src/linux/doc/man/jmap.1 \ - jdk/src/linux/doc/man/jps.1 \ - jdk/src/linux/doc/man/jrunscript.1 \ - jdk/src/linux/doc/man/jsadebugd.1 \ - jdk/src/linux/doc/man/jstack.1 \ - jdk/src/linux/doc/man/jstat.1 \ - jdk/src/linux/doc/man/jstatd.1 \ - jdk/src/linux/doc/man/keytool.1 \ - jdk/src/linux/doc/man/native2ascii.1 \ - jdk/src/linux/doc/man/orbd.1 \ - jdk/src/linux/doc/man/pack200.1 \ - jdk/src/linux/doc/man/policytool.1 \ - jdk/src/linux/doc/man/rmic.1 \ - jdk/src/linux/doc/man/rmid.1 \ - jdk/src/linux/doc/man/rmiregistry.1 \ - jdk/src/linux/doc/man/schemagen.1 \ - jdk/src/linux/doc/man/serialver.1 \ - jdk/src/linux/doc/man/servertool.1 \ - jdk/src/linux/doc/man/tnameserv.1 \ - jdk/src/linux/doc/man/unpack200.1 \ - jdk/src/linux/doc/man/wsgen.1 \ - jdk/src/linux/doc/man/wsimport.1 \ - jdk/src/linux/doc/man/xjc.1 \ - jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \ - jdk/src/solaris/doc/sun/man/man1/appletviewer.1 \ - jdk/src/solaris/doc/sun/man/man1/extcheck.1 \ - jdk/src/solaris/doc/sun/man/man1/idlj.1 \ - jdk/src/solaris/doc/sun/man/man1/jar.1 \ - jdk/src/solaris/doc/sun/man/man1/jarsigner.1 \ - jdk/src/solaris/doc/sun/man/man1/java.1 \ - jdk/src/solaris/doc/sun/man/man1/javac.1 \ - jdk/src/solaris/doc/sun/man/man1/javadoc.1 \ - jdk/src/solaris/doc/sun/man/man1/javah.1 \ - jdk/src/solaris/doc/sun/man/man1/javap.1 \ - jdk/src/solaris/doc/sun/man/man1/jcmd.1 \ - jdk/src/solaris/doc/sun/man/man1/jconsole.1 \ - jdk/src/solaris/doc/sun/man/man1/jdb.1 \ - jdk/src/solaris/doc/sun/man/man1/jdeps.1 \ - jdk/src/solaris/doc/sun/man/man1/jhat.1 \ - jdk/src/solaris/doc/sun/man/man1/jinfo.1 \ - jdk/src/solaris/doc/sun/man/man1/jjs.1 \ - jdk/src/solaris/doc/sun/man/man1/jmap.1 \ - jdk/src/solaris/doc/sun/man/man1/jps.1 \ - jdk/src/solaris/doc/sun/man/man1/jrunscript.1 \ - jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 \ - jdk/src/solaris/doc/sun/man/man1/jstack.1 \ - jdk/src/solaris/doc/sun/man/man1/jstat.1 \ - jdk/src/solaris/doc/sun/man/man1/jstatd.1 \ - jdk/src/solaris/doc/sun/man/man1/keytool.1 \ - jdk/src/solaris/doc/sun/man/man1/native2ascii.1 \ - jdk/src/solaris/doc/sun/man/man1/orbd.1 \ - jdk/src/solaris/doc/sun/man/man1/pack200.1 \ - jdk/src/solaris/doc/sun/man/man1/policytool.1 \ - jdk/src/solaris/doc/sun/man/man1/rmic.1 \ - jdk/src/solaris/doc/sun/man/man1/rmid.1 \ - jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 \ - jdk/src/solaris/doc/sun/man/man1/schemagen.1 \ - jdk/src/solaris/doc/sun/man/man1/serialver.1 \ - jdk/src/solaris/doc/sun/man/man1/servertool.1 \ - jdk/src/solaris/doc/sun/man/man1/tnameserv.1 \ - jdk/src/solaris/doc/sun/man/man1/unpack200.1 \ - jdk/src/solaris/doc/sun/man/man1/wsgen.1 \ - jdk/src/solaris/doc/sun/man/man1/wsimport.1 \ - jdk/src/solaris/doc/sun/man/man1/xjc.1 \ - nashorn/test/script/jfx.js \ - nashorn/test/script/jfx/kaleidoscope.js \ - nashorn/test/script/jfx/spread.js -SHEBANG_FILES= configure - _MAKE_JOBS= # CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH="" -MAKE_ENV+= IGNORE_OLD_CONFIG=true -MAKE_ENV+= COMPILER_WARNINGS_FATAL="false" +MAKE_ENV= LANG="C" \ + LC_ALL="C" \ + CLASSPATH="" \ + JAVA_HOME="" \ + LD_LIBRARY_PATH="" \ + LDFLAGS=-L${LOCALBASE}/lib \ + CC=/usr/bin/cc \ + CXX=/usr/bin/c++ \ + MAKEFLAGS="" \ + USE_CLANG=true +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} -.if !defined(BUILD_JRE) -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image -JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2sdk-image/jre -.else -JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image -.endif -JDK_JVMDIR= lib/${ARCH:C/armv.*/arm/:S/powerpc64/ppc64/} -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/} +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes -JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 202 -JDK_BUILD_NUMBER= 08 -DIST_BUILD_NUMBER= 132 -JTREG_VERSION= 4.1 -JTREG_BUILD_NUMBER= b08 -JTREG_JENKINS_BUILD= 77 +JDK_MAJOR_VERSION= 11 +JDK_MINOR_VERSION= 0 +JDK_PATCH_VERSION= 2 +JDK_BUILD_NUMBER= 9 +BSD_JDK_VERSION= 1 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} -CONFIGURE_ARGS+= --with-build-number="b${JDK_BUILD_NUMBER}" -.if ${JDK_UPDATE_VERSION} > 0 -CONFIGURE_ARGS+= --with-update-version=${JDK_UPDATE_VERSION} -.endif -.if defined(NO_CCACHE) -CONFIGURE_ARGS+= --disable-ccache -.endif -CONFIGURE_ARGS+= --disable-freetype-bundling \ - --disable-zip-debug-info \ - --with-cacerts-file=${FILESDIR}/cacerts \ - --with-cups=${LOCALBASE} \ - --with-debug-level=${JDK_BUILD_TYPE} \ - --with-freetype=${LOCALBASE} \ - --with-freetype-include=${LOCALBASE}/include/freetype2 \ - --with-jobs=${MAKE_JOBS_NUMBER} \ - --with-jvm-variants=${JDK_BUILD_JVM} \ - --with-milestone=fcs \ - --with-package-path=${LOCALBASE} \ - --with-zlib=system -CONFIGURE_SCRIPT= ../../configure -CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf +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} \ + --with-cups=${LOCALBASE} \ + --with-fontconfig=${LOCALBASE} \ + --with-freetype=system \ + --with-freetype-include=${LOCALBASE}/include/freetype2 \ + --with-freetype-lib=${LOCALBASE}/lib \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-libpng=system \ + --with-zlib=system \ + --with-lcms=system \ + --with-extra-cflags=-I${LOCALBASE}/include \ + --with-extra-cxxflags=-I${LOCALBASE}/include \ + --with-extra-ldflags=-L${LOCALBASE}/lib \ + --with-toolchain-type=clang \ + --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib \ + --with-package-path=${LOCALBASE} \ + --with-cacerts-file=${FILESDIR}/cacerts \ + --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ + --with-native-debug-symbols=none \ + --with-debug-level=release -OPTIONS_DEFINE= ALSA POLICY TZUPDATE X11 FONTCONFIG -OPTIONS_DEFINE_armv6= FPUHACK -OPTIONS_DEFINE_armv7= FPUHACK -OPTIONS_DEFAULT= ALSA POLICY TZUPDATE X11 -OPTIONS_DEFAULT_armv6= FPUHACK -OPTIONS_DEFAULT_armv7= FPUHACK -FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode -POLICY_DESC= Install the Unlimited Strength Policy Files -TZUPDATE_DESC= Update the time zone data - -ALSA_CONFIGURE_ENV_OFF= ALSA_NOT_NEEDED=yes -ALSA_CONFIGURE_ON= --with-alsa=${LOCALBASE} -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -FPUHACK_EXTRA_PATCHES= ${PATCHDIR}/fpuhack.patch -POLICY_CONFIGURE_ENABLE= unlimited-crypto -TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo -X11_BUILD_DEPENDS_OFF= ${LOCALBASE}/include/X11/Xlib.h:x11/libX11 \ - ${LOCALBASE}/include/X11/extensions/Xdbe.h:x11/libXext \ - ${LOCALBASE}/include/X11/extensions/Xrender.h:x11/libXrender \ - ${LOCALBASE}/include/X11/Intrinsic.h:x11-toolkits/libXt -X11_CONFIGURE_OFF= --disable-headful -X11_CONFIGURE_ON= --with-giflib=system \ - --x-includes=${LOCALBASE}/include \ - --x-libraries=${LOCALBASE}/lib -X11_LIB_DEPENDS= libgif.so:graphics/giflib \ - libfontconfig.so:x11-fonts/fontconfig -X11_MAKE_ENV_OFF= BUILD_HEADLESS_ONLY=1 \ - MAKEFLAGS=X_CFLAGS="-I${LOCALBASE}/include" -X11_MAKE_ENV_ON= MAKEFLAGS="" -X11_USE= XORG=x11,xext,xi,xrender,xt,xtst -FONTCONFIG_IMPLIES= X11 - JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} -.if !defined(BUILD_JRE) -OPTIONS_DEFINE+= TEST -OPTIONS_DEFAULT+= RELEASE -OPTIONS_SINGLE= BUILD -OPTIONS_SINGLE_BUILD= DEBUG DEBUGFAST RELEASE -BUILD_DESC= Select OpenJDK build type -DEBUG_DESC= Build for debugging (without optimizations) -DEBUGFAST_DESC= Build for debugging (with optimizations) -RELEASE_DESC= Build for release (default) -TEST_DESC= Run regression tests - -DEBUG_VARS= JDK_BUILD_TYPE=slowdebug -DEBUGFAST_VARS= JDK_BUILD_TYPE=fastdebug -RELEASE_BUILD_DEPENDS_OFF= ${LOCALBASE}/bin/objcopy:devel/binutils -RELEASE_CONFIGURE_ON= --disable-debug-symbols -RELEASE_VARS= JDK_BUILD_TYPE=release -RELEASE_VARS_OFF= OBJCOPY=${LOCALBASE}/bin/objcopy -TEST_ALL_TARGET= test -TEST_ALL_TARGET_OFF= images -TEST_CONFIGURE_ON= --with-jtreg=${WRKDIR}/jtreg -TEST_DISTFILES= jtreg${JTREG_VERSION}-${JTREG_BUILD_NUMBER}${EXTRACT_SUFX}:jtreg -.else ALL_TARGET= images -CONFIGURE_ARGS+= --disable-debug-symbols -JAVAVMS_COMMENT+= JRE JDK_BUILD_TYPE= release -.endif -# XXX configure script rejects CC/CPP/CXX with absolute paths. -.for t in CC CPP CXX -.if defined(${t}) && ${${t}:M/*} -BUILD_${t}= ${${t}:C|.*/||g} -CONFIGURE_ENV+= ${t}="${BUILD_${t}}" -TOOLS_DIR+= ${${t}:S|/${BUILD_${t}}$||} -.endif -.endfor -.if defined(TOOLS_DIR) -CONFIGURE_ARGS+= --with-tools-dir="${TOOLS_DIR:u:S/ /:/g}" -.endif - .include <bsd.port.pre.mk> -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ - ${LOCALBASE}/openjdk7 \ - ${LOCALBASE}/bootstrap-openjdk8 +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ + ${LOCALBASE}/bootstrap-openjdk11 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} @@ -328,49 +106,12 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) -BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk8 -BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8 +BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .endif -.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 -# XXX We must limit max heap size for 32-bit targets. -CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m" -MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m" -.endif - -.if ${ARCH} == i386 -# Fix the build for i386 when WITH_LLD_IS_LD is set -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 -MAKE_ENV+= LFLAGS="-Wl,-z,notext" -.endif - -.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64 JDK_BUILD_JVM= server -.else -JDK_BUILD_JVM= zero -LIB_DEPENDS+= libffi.so:devel/libffi -.endif -.if ${COMPILER_TYPE} == clang -.if ${COMPILER_VERSION} >= 35 -MAKE_ENV+= COMPILER_WARNINGS_FATAL=false -.endif -MAKE_ENV+= USE_CLANG=true -.if ${COMPILER_FEATURES:Mlibc++} -CONFIGURE_ENV+= LIBCXX="-lc++" -.endif -.endif - -# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html -.if ${COMPILER_TYPE} == gcc -CONFIGURE_ARGS+= --with-toolchain-type=gcc -.if ${ARCH} == "powerpc64" -MAKE_ARGS+= USE_PRECOMPILED_HEADER=1 -.else -MAKE_ARGS+= USE_PRECOMPILED_HEADER=0 -.endif -.endif - .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else @@ -378,92 +119,18 @@ ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .endif -post-extract: - @${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \ - ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg - @${CP} ${FILESDIR}/nashorn-test-script-jfx-flyingimage-golden-bsd.png \ - ${WRKSRC}/nashorn/test/script/jfx/flyingimage/golden/bsd.png - @${CP} ${FILESDIR}/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png \ - ${WRKSRC}/nashorn/test/script/jfx/kaleidoscope/golden/bsd.png - @${CP} ${FILESDIR}/nashorn-test-script-jfx-spread-golden-bsd.png \ - ${WRKSRC}/nashorn/test/script/jfx/spread/golden/bsd.png - -post-extract-TEST-on: - @${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/ - -do-patch-FONTCONFIG-on: - @${PATCH} -d ${PATCH_WRKSRC} < ${PATCHDIR}/fontconfig.patch - post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete - @${RMDIR} ${WRKSRC}/jdk/src/macosx/classes/java/net \ - ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch \ - ${WRKSRC}/jdk/src/macosx/native/sun/nio - @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${FILESDIR}/bsd.fontconfig.properties.in > \ - ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - -e 's|%%OBJCOPY%%|${OBJCOPY}|' \ - ${WRKSRC}/configure \ - ${WRKSRC}/common/autoconf/toolchain.m4 \ - ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \ - ${WRKSRC}/jdk/make/lib/NioLibraries.gmk \ - ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ - ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \ - ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java - @${REINPLACE_CMD} -e 's|/usr/local/share/java/classes|${LOCALBASE}/share/java/classes|' \ - ${WRKSRC}/jdk/src/bsd/doc/man/*.1 - @${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \ - -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ - ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \ - ${WRKSRC}/jdk/make/lib/CoreLibraries.gmk \ - ${WRKSRC}/jdk/make/lib/ServiceabilityLibraries.gmk -.if defined(BUILD_JRE) - @${REINPLACE_CMD} -e 's|-f Images.gmk$$|& jre-image|' \ - -e 's|-f Images.gmk overlay-images$$|-f Images.gmk jre-overlay-image|' \ - ${WRKSRC}/jdk/make/BuildJdk.gmk -.endif @${CHMOD} 755 ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/configure -post-patch-ALSA-off: - @${REINPLACE_CMD} '/EXTRA_SOUND_JNI_LIBS += jsoundalsa/d' \ - ${WRKSRC}/jdk/make/lib/SoundLibraries.gmk - -post-build: -.if !defined(BUILD_JRE) - @${BOOTSTRAPJDKDIR}/bin/jar cfe \ - ${JRE_IMAGEDIR}/lib/compilefontconfig.jar \ - build.tools.compilefontconfig.CompileFontConfig \ - -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/compilefontconfig - @${BOOTSTRAPJDKDIR}/bin/jar cfe \ - ${JRE_IMAGEDIR}/lib/javazic.jar \ - build.tools.tzdb.TzdbZoneRulesCompiler \ - -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb -.endif - -post-build-TZUPDATE-on: - @# Update time zones - @${RM} -r ${JRE_IMAGEDIR}/lib/zi - @${LN} -sf ${LOCALBASE}/share/java/zi ${JRE_IMAGEDIR}/lib - do-install: @${MKDIR} ${STAGEDIR}${INSTALLDIR} -.if !defined(BUILD_JRE) @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} @cd ${STAGEDIR}${INSTALLDIR} && \ - ${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \ - ${CHMOD} ${BINMODE} jre/${JDK_JVMDIR}/jexec \ - jre/${JDK_JVMDIR}/jspawnhelper ${JDK_JVMDIR}/jexec - @${ECHO} "@dir ${INSTALLDIR}/jre/lib/applet" >> ${TMPPLIST} -.else - @cd ${JRE_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} - @cd ${STAGEDIR}${INSTALLDIR} && \ - ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \ - ${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper - @${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST} -.endif - @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ - ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} + ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} .include <bsd.port.post.mk> Modified: head/java/openjdk11/distinfo ============================================================================== --- head/java/openjdk8/distinfo Fri Mar 15 05:10:32 2019 (r495765) +++ head/java/openjdk11/distinfo Fri Mar 15 06:02:17 2019 (r495770) @@ -1,55 +1,3 @@ -TIMESTAMP = 1549756797 -SHA256 (openjdk-8-src-b132-03_mar_2014.zip) = ba651f9aa68fdc823b2ef55510710a013ab9f78fff291d5dc1c4d166f3e1e589 -SIZE (openjdk-8-src-b132-03_mar_2014.zip) = 124099402 -SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c -SIZE (jtreg4.1-b08.tar.gz) = 6834252 -SHA256 (patch-8u05-b13.xz) = 0fd6dfa17769a92d94a710e330d411fcbd49a8142d4cb8826b96b42d3c007a63 -SIZE (patch-8u05-b13.xz) = 88636 -SHA256 (patch-8u11-b13.xz) = 68ead09e1841fc43a4fec2c386acc70e3edab99e116923befa0d83960c4a1f85 -SIZE (patch-8u11-b13.xz) = 48852 -SHA256 (patch-8u20-b26.xz) = 23c704ed10f0e081e956755e22049b3ef7897b3bc5a7a6450a4d1856351f55a8 -SIZE (patch-8u20-b26.xz) = 1898392 -SHA256 (patch-8u25-b17.xz) = beb9ef5ca12660da57f5a8409de4576aef4a55dd9de7bdc14a3d64f706cee6e8 -SIZE (patch-8u25-b17.xz) = 45968 -SHA256 (patch-8u31-b13.xz) = c77ca4137a95e45a377c31f2c7a2d0280b64f5d411089cda7380c04c7a70685a -SIZE (patch-8u31-b13.xz) = 204032 -SHA256 (patch-8u40-b25.xz) = 178fd0737235ebef61e39cc06e6d1fdd5079b727b0d23f9326cd39b97036c0d1 -SIZE (patch-8u40-b25.xz) = 1662812 -SHA256 (patch-8u45-b14.xz) = 4a2e7c5e3275db6a7aebe15c7dcc9abe9125b25e490c015367ca8ebcf8c65bac -SIZE (patch-8u45-b14.xz) = 285564 -SHA256 (patch-8u51-b16.xz) = 146e8ffa75911a2bc53099ea07625db259f88cbac2e678f965f55c483a01050f -SIZE (patch-8u51-b16.xz) = 71144 -SHA256 (patch-8u60-b23.xz) = 8ebe80e8add9e61dcb43e9be756ccc6d566a39748e7726f265df73af2d082798 -SIZE (patch-8u60-b23.xz) = 1043720 -SHA256 (patch-8u66-b17-1.xz) = 8d11cf62d9b70857d1008dea0cdcf9d5b4ba30320696cb2568a8bc13f202bb2e -SIZE (patch-8u66-b17-1.xz) = 351328 -SHA256 (patch-8u72-b15.xz) = 42f774b72f3dbdbfadc63d0b8fb7d94c51c3062d80aedec86f59d295823136d1 -SIZE (patch-8u72-b15.xz) = 282984 -SHA256 (patch-8u74-b02.xz) = c21a08d00d8417369837fe82d68bb4f30bcf8c1c93aef85581761e328c58fccd -SIZE (patch-8u74-b02.xz) = 2056 -SHA256 (patch-8u77-b03.xz) = d6469852d556ff9e379852e5a64cc104faf0545804c7f18f65b9840a8cb3a1c1 -SIZE (patch-8u77-b03.xz) = 4404 -SHA256 (patch-8u92-b14.xz) = c3c8e607048c61c8b425849c6bb73add59ba9887e4a9d4f6147ab51ad11c8d17 -SIZE (patch-8u92-b14.xz) = 172836 -SHA256 (patch-8u102-b14.xz) = 02ae897c1bfbb137339fe00f0672af268b94beee88f44c818a6060dc207d72c3 -SIZE (patch-8u102-b14.xz) = 411024 -SHA256 (patch-8u112-b16.xz) = adbca9b317d599a3ee2e8ac6efb47b0576bdb1ebf0a8b9a0d0d7742db499b921 -SIZE (patch-8u112-b16.xz) = 217492 -SHA256 (patch-8u121-b13.xz) = ef48cad21bb0ccadb3968147ab4d4d0b9ae024bf42a0fccf5714584f43df9ed4 -SIZE (patch-8u121-b13.xz) = 135520 -SHA256 (patch-8u131-b11.xz) = c0953d79f7e1b02ed75e6757ff170a144527af9b44f44cb36f2ddb484437d4d6 -SIZE (patch-8u131-b11.xz) = 88068 -SHA256 (patch-8u144-b01.xz) = 4b4b73a345bc69085b712213ff55831e739cf43c9d0b87e77da91283e7c3520f -SIZE (patch-8u144-b01.xz) = 239460 -SHA256 (patch-8u152-b16.xz) = 51c57b8d60b8f71758fe03c45c70ab60d0423bf4699e71b21ba4148f80497852 -SIZE (patch-8u152-b16.xz) = 454236 -SHA256 (patch-8u162-b12.xz) = 9f083cde406ead14e38f5423a6dcc0f0b0a3f7ef69fdc4c83a32b8fea4c3ddcb -SIZE (patch-8u162-b12.xz) = 337248 -SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b882d78c7c559934 -SIZE (patch-8u172-b11.xz) = 146716 -SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839 -SIZE (patch-8u181-b13.xz) = 69096 -SHA256 (patch-8u192-b26.xz) = 5bfa782ec2af8ddc6aed3e8de81cc37c7f375ebad650341d1ce74956c82a411e -SIZE (patch-8u192-b26.xz) = 284164 -SHA256 (patch-8u202-b08.xz) = 16195793d00b1fbe18e4d3a4cab2db1e5a28722e43d3466d03283ab01d9524d0 -SIZE (patch-8u202-b08.xz) = 202660 +TIMESTAMP = 1552339500 +SHA256 (jdk-11.0.2+9-1.tar.gz) = 013e7bc9e74f23b901a1ba295aedc85ddc2ee3dd115728a0178b637a45c4133f +SIZE (jdk-11.0.2+9-1.tar.gz) = 116710015 Modified: head/java/openjdk11/files/cacerts ============================================================================== Binary file (source and/or target). No diff available. Modified: head/java/openjdk11/files/patch-configure ============================================================================== --- head/java/openjdk8/files/patch-configure Fri Mar 15 05:10:32 2019 (r495765) +++ head/java/openjdk11/files/patch-configure Fri Mar 15 06:02:17 2019 (r495770) @@ -1,14 +1,14 @@ ---- configure.orig 2018-12-02 13:45:44.142931000 -0800 -+++ configure 2018-12-02 15:16:05.112400000 -0800 -@@ -29,6 +29,10 @@ - this_script_dir=`dirname $0` - this_script_dir=`cd $this_script_dir > /dev/null && pwd` - -+export CONFIG_SHELL=%%LOCALBASE%%/bin/bash -+export MAKE=%%LOCALBASE%%/bin/gmake -+export OBJCOPY=%%OBJCOPY%% -+ +--- configure.orig 2019-03-12 12:38:39.648907000 -0700 ++++ configure 2019-03-12 12:39:04.275572000 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # + # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@@ -32,4 +32,4 @@ # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c. # This trick is needed to get autoconf to co-operate properly. --bash -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" -+%%LOCALBASE%%/bin/bash -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" + # The ${-:+-$-} construction passes on bash options. +-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" ++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" Added: head/java/openjdk11/files/patch-make-autoconf-build-performance.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk11/files/patch-make-autoconf-build-performance.m4 Fri Mar 15 06:02:17 2019 (r495770) @@ -0,0 +1,13 @@ +--- make/autoconf/build-performance.m4 ++++ make/autoconf/build-performance.m4 +@@ -41,6 +41,10 @@ AC_DEFUN([BPERF_CHECK_CORES], + # Looks like a MacOSX system + NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu` + FOUND_CORES=yes ++ elif test -x /sbin/sysctl; then ++ # Looks like a BSD system ++ NUM_CORES=`/sbin/sysctl -n hw.ncpu` ++ FOUND_CORES=yes + elif test "x$OPENJDK_BUILD_OS" = xaix ; then + NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` + FOUND_CORES=yes Modified: head/java/openjdk11/pkg-descr ============================================================================== --- head/java/openjdk8/pkg-descr Fri Mar 15 05:10:32 2019 (r495765) +++ head/java/openjdk11/pkg-descr Fri Mar 15 06:02:17 2019 (r495770) @@ -1,3 +1,3 @@ An open-source implementation of the Java Platform, Standard Edition, -WWW: https://openjdk.java.net/ +WWW: http://openjdk.java.net/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903150602.x2F62H3Z004139>