diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2019-09-07 04:56:57 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2019-09-07 04:56:57 +0800 |
| commit | f44e2881c913e6863249652cf73fca4a93296a47 (patch) | |
| tree | d3daee8b4a2fbf1025d4c02c3aebedd4d67df52e /java | |
| parent | 9fcef473288365748d276dbf967c46d8c3698aaf (diff) | |
| parent | 8a91d63da840b97569719c1cff6c0a39401c9c04 (diff) | |
| download | freebsd-ports-gnome-f44e2881c913e6863249652cf73fca4a93296a47.tar.gz freebsd-ports-gnome-f44e2881c913e6863249652cf73fca4a93296a47.tar.zst freebsd-ports-gnome-f44e2881c913e6863249652cf73fca4a93296a47.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'java')
27 files changed, 348 insertions, 110 deletions
diff --git a/java/bootstrap-openjdk11/Makefile b/java/bootstrap-openjdk11/Makefile index 33ebeea61f4e..bdde6df54b57 100644 --- a/java/bootstrap-openjdk11/Makefile +++ b/java/bootstrap-openjdk11/Makefile @@ -2,6 +2,7 @@ PORTNAME= openjdk11 PORTVERSION= 11.0.2.9.2 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= LOCAL/glewis/bootstrap-openjdk11 PKGNAMEPREFIX= bootstrap- @@ -12,7 +13,7 @@ COMMENT= Java Development Kit 11 LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 USES= tar:xz @@ -26,8 +27,23 @@ JDK_ARCH= ${ARCH} INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_ROOT} +.include <bsd.port.pre.mk> + +# Support aarch64 on FreeBSD 12 and up +.if ${OSVERSION} >= 1200500 +ONLY_FOR_ARCHS+=aarch64 +.endif + +.if ${ARCH} == aarch64 +DISTNAME= ${JDK_PORT}-${JDK_ARCH}-12-${PORTVERSION} +.endif + +post-extract: + -${MV} ${WRKSRC}/include/bsd ${WRKSRC}/include/freebsd + do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} @cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR} + @${CHMOD} a+x ${INSTALLDIR}/lib/jspawnhelper -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/java/bootstrap-openjdk11/distinfo b/java/bootstrap-openjdk11/distinfo index 1fca75da60c3..e46dcb09cb39 100644 --- a/java/bootstrap-openjdk11/distinfo +++ b/java/bootstrap-openjdk11/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1553143931 +TIMESTAMP = 1567191227 +SHA256 (bootstrap-openjdk11-aarch64-12-11.0.2.9.2.tar.xz) = 03b15627aeda4ca1e2350c713323191728468110bf6c0f2eb233e08985d590c2 +SIZE (bootstrap-openjdk11-aarch64-12-11.0.2.9.2.tar.xz) = 99517364 SHA256 (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = e53f16a33fca82db960b68ea200b6146eaf8b3ec8b09f5fe1c7711d926d94ffa SIZE (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = 102199460 SHA256 (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 68b84741d7b8a7241fb30614881f15db3c174d973f999d34e0f53aca6190e00f SIZE (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 96936056 +SHA256 (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 4ac1cfc66da594d981dc8d953f818bd6a83f69567e562212f2507e342c583aac +SIZE (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 102988560 diff --git a/java/bootstrap-openjdk11/pkg-plist b/java/bootstrap-openjdk11/pkg-plist index 383ebc671f5d..386c93641add 100644 --- a/java/bootstrap-openjdk11/pkg-plist +++ b/java/bootstrap-openjdk11/pkg-plist @@ -36,16 +36,16 @@ %%JDK_ROOT%%/conf/net.properties %%JDK_ROOT%%/conf/security/java.policy %%JDK_ROOT%%/conf/security/java.security -%%JDK_ROOT%%/conf/security/policy/limited/default_local.policy +%%JDK_ROOT%%/conf/security/policy/README.txt %%JDK_ROOT%%/conf/security/policy/limited/default_US_export.policy +%%JDK_ROOT%%/conf/security/policy/limited/default_local.policy %%JDK_ROOT%%/conf/security/policy/limited/exempt_local.policy -%%JDK_ROOT%%/conf/security/policy/README.txt -%%JDK_ROOT%%/conf/security/policy/unlimited/default_local.policy %%JDK_ROOT%%/conf/security/policy/unlimited/default_US_export.policy +%%JDK_ROOT%%/conf/security/policy/unlimited/default_local.policy %%JDK_ROOT%%/conf/sound.properties -%%JDK_ROOT%%/include/bsd/jawt_md.h -%%JDK_ROOT%%/include/bsd/jni_md.h %%JDK_ROOT%%/include/classfile_constants.h +%%JDK_ROOT%%/include/freebsd/jawt_md.h +%%JDK_ROOT%%/include/freebsd/jni_md.h %%JDK_ROOT%%/include/jawt.h %%JDK_ROOT%%/include/jdwpTransport.h %%JDK_ROOT%%/include/jni.h @@ -118,13 +118,13 @@ %%JDK_ROOT%%/jmods/jdk.xml.dom.jmod %%JDK_ROOT%%/jmods/jdk.zipfs.jmod %%JDK_ROOT%%/legal/java.base/ADDITIONAL_LICENSE_INFO +%%JDK_ROOT%%/legal/java.base/ASSEMBLY_EXCEPTION +%%JDK_ROOT%%/legal/java.base/LICENSE %%JDK_ROOT%%/legal/java.base/aes.md %%JDK_ROOT%%/legal/java.base/asm.md -%%JDK_ROOT%%/legal/java.base/ASSEMBLY_EXCEPTION %%JDK_ROOT%%/legal/java.base/c-libutl.md %%JDK_ROOT%%/legal/java.base/cldr.md %%JDK_ROOT%%/legal/java.base/icu.md -%%JDK_ROOT%%/legal/java.base/LICENSE %%JDK_ROOT%%/legal/java.base/public_suffix.md %%JDK_ROOT%%/legal/java.base/unicode.md %%JDK_ROOT%%/legal/java.compiler/ADDITIONAL_LICENSE_INFO @@ -135,9 +135,9 @@ %%JDK_ROOT%%/legal/java.datatransfer/LICENSE %%JDK_ROOT%%/legal/java.desktop/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/java.desktop/ASSEMBLY_EXCEPTION +%%JDK_ROOT%%/legal/java.desktop/LICENSE %%JDK_ROOT%%/legal/java.desktop/colorimaging.md %%JDK_ROOT%%/legal/java.desktop/harfbuzz.md -%%JDK_ROOT%%/legal/java.desktop/LICENSE %%JDK_ROOT%%/legal/java.desktop/mesa3d.md %%JDK_ROOT%%/legal/java.desktop/opengl.md %%JDK_ROOT%%/legal/java.desktop/xwindows.md @@ -196,10 +196,10 @@ %%JDK_ROOT%%/legal/java.xml.crypto/santuario.md %%JDK_ROOT%%/legal/java.xml/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/java.xml/ASSEMBLY_EXCEPTION +%%JDK_ROOT%%/legal/java.xml/LICENSE %%JDK_ROOT%%/legal/java.xml/bcel.md %%JDK_ROOT%%/legal/java.xml/dom.md %%JDK_ROOT%%/legal/java.xml/jcup.md -%%JDK_ROOT%%/legal/java.xml/LICENSE %%JDK_ROOT%%/legal/java.xml/xalan.md %%JDK_ROOT%%/legal/java.xml/xerces.md %%JDK_ROOT%%/legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO @@ -221,12 +221,12 @@ %%JDK_ROOT%%/legal/jdk.crypto.cryptoki/pkcs11wrapper.md %%JDK_ROOT%%/legal/jdk.crypto.ec/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.crypto.ec/ASSEMBLY_EXCEPTION -%%JDK_ROOT%%/legal/jdk.crypto.ec/ecc.md %%JDK_ROOT%%/legal/jdk.crypto.ec/LICENSE +%%JDK_ROOT%%/legal/jdk.crypto.ec/ecc.md %%JDK_ROOT%%/legal/jdk.dynalink/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.dynalink/ASSEMBLY_EXCEPTION -%%JDK_ROOT%%/legal/jdk.dynalink/dynalink.md %%JDK_ROOT%%/legal/jdk.dynalink/LICENSE +%%JDK_ROOT%%/legal/jdk.dynalink/dynalink.md %%JDK_ROOT%%/legal/jdk.editpad/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.editpad/ASSEMBLY_EXCEPTION %%JDK_ROOT%%/legal/jdk.editpad/LICENSE @@ -244,22 +244,22 @@ %%JDK_ROOT%%/legal/jdk.internal.jvmstat/LICENSE %%JDK_ROOT%%/legal/jdk.internal.le/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.internal.le/ASSEMBLY_EXCEPTION -%%JDK_ROOT%%/legal/jdk.internal.le/jline.md %%JDK_ROOT%%/legal/jdk.internal.le/LICENSE +%%JDK_ROOT%%/legal/jdk.internal.le/jline.md %%JDK_ROOT%%/legal/jdk.internal.opt/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION -%%JDK_ROOT%%/legal/jdk.internal.opt/jopt-simple.md %%JDK_ROOT%%/legal/jdk.internal.opt/LICENSE +%%JDK_ROOT%%/legal/jdk.internal.opt/jopt-simple.md %%JDK_ROOT%%/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.jartool/ASSEMBLY_EXCEPTION %%JDK_ROOT%%/legal/jdk.jartool/LICENSE %%JDK_ROOT%%/legal/jdk.javadoc/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.javadoc/ASSEMBLY_EXCEPTION +%%JDK_ROOT%%/legal/jdk.javadoc/LICENSE %%JDK_ROOT%%/legal/jdk.javadoc/jquery-migrate.md %%JDK_ROOT%%/legal/jdk.javadoc/jquery.md %%JDK_ROOT%%/legal/jdk.javadoc/jqueryUI.md %%JDK_ROOT%%/legal/jdk.javadoc/jszip.md -%%JDK_ROOT%%/legal/jdk.javadoc/LICENSE %%JDK_ROOT%%/legal/jdk.javadoc/pako.md %%JDK_ROOT%%/legal/jdk.jcmd/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.jcmd/ASSEMBLY_EXCEPTION @@ -293,8 +293,8 @@ %%JDK_ROOT%%/legal/jdk.jstatd/LICENSE %%JDK_ROOT%%/legal/jdk.localedata/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.localedata/ASSEMBLY_EXCEPTION -%%JDK_ROOT%%/legal/jdk.localedata/cldr.md %%JDK_ROOT%%/legal/jdk.localedata/LICENSE +%%JDK_ROOT%%/legal/jdk.localedata/cldr.md %%JDK_ROOT%%/legal/jdk.localedata/thaidict.md %%JDK_ROOT%%/legal/jdk.management.agent/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.management.agent/ASSEMBLY_EXCEPTION @@ -325,9 +325,9 @@ %%JDK_ROOT%%/legal/jdk.scripting.nashorn.shell/LICENSE %%JDK_ROOT%%/legal/jdk.scripting.nashorn/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.scripting.nashorn/ASSEMBLY_EXCEPTION +%%JDK_ROOT%%/legal/jdk.scripting.nashorn/LICENSE %%JDK_ROOT%%/legal/jdk.scripting.nashorn/double-conversion.md %%JDK_ROOT%%/legal/jdk.scripting.nashorn/joni.md -%%JDK_ROOT%%/legal/jdk.scripting.nashorn/LICENSE %%JDK_ROOT%%/legal/jdk.sctp/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.sctp/ASSEMBLY_EXCEPTION %%JDK_ROOT%%/legal/jdk.sctp/LICENSE @@ -360,9 +360,9 @@ %%JDK_ROOT%%/lib/jspawnhelper %%JDK_ROOT%%/lib/jvm.cfg %%JDK_ROOT%%/lib/libattach.so +%%JDK_ROOT%%/lib/libawt.so %%JDK_ROOT%%/lib/libawt_headless.so %%JDK_ROOT%%/lib/libawt_xawt.so -%%JDK_ROOT%%/lib/libawt.so %%JDK_ROOT%%/lib/libdt_socket.so %%JDK_ROOT%%/lib/libextnet.so %%JDK_ROOT%%/lib/libfontmanager.so @@ -379,9 +379,9 @@ %%JDK_ROOT%%/lib/libjsig.so %%JDK_ROOT%%/lib/libjsound.so %%JDK_ROOT%%/lib/liblcms.so +%%JDK_ROOT%%/lib/libmanagement.so %%JDK_ROOT%%/lib/libmanagement_agent.so %%JDK_ROOT%%/lib/libmanagement_ext.so -%%JDK_ROOT%%/lib/libmanagement.so %%JDK_ROOT%%/lib/libmlib_image.so %%JDK_ROOT%%/lib/libnet.so %%JDK_ROOT%%/lib/libnio.so @@ -400,8 +400,8 @@ %%JDK_ROOT%%/lib/security/cacerts %%JDK_ROOT%%/lib/security/default.policy %%JDK_ROOT%%/lib/security/public_suffix_list.dat +%%JDK_ROOT%%/lib/server/Xusage.txt %%JDK_ROOT%%/lib/server/libjsig.so %%JDK_ROOT%%/lib/server/libjvm.so -%%JDK_ROOT%%/lib/server/Xusage.txt %%JDK_ROOT%%/lib/tzdb.dat %%JDK_ROOT%%/release diff --git a/java/intellij/Makefile b/java/intellij/Makefile index b0ec6983c2d7..16306e451882 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -5,7 +5,7 @@ # Vadim Zhukov <zhuk@openbsd.org> PORTNAME= intellij -PORTVERSION= 2019.2 +PORTVERSION= 2019.2.1 CATEGORIES= java devel MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIC-${PORTVERSION}-no-jbr @@ -16,24 +16,22 @@ COMMENT= IntelliJ IDEA Community Edition LICENSE= APACHE20 -RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ - intellij-pty4j>0:java/intellij-pty4j +RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier USES= python:run shebangfix USE_JAVA= yes -JAVA_VERSION= 1.8+ +JAVA_VERSION= 8+ SHEBANG_FILES= bin/printenv.py bin/restart.py NO_ARCH= yes +NO_ARCH_IGNORE= libjansi.so NO_BUILD= yes -INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/idea-IC-192.5728.98 +WRKSRC= ${WRKDIR}/idea-IC-192.6262.58 SUB_FILES= idea idea.desktop pkg-message -SUB_LIST= DATADIR=${DATADIR} CONFLICTS= intellij-ultimate-* do-install: @@ -41,23 +39,29 @@ do-install: @${RM} -r ${WRKSRC}/bin/fsnotifier \ ${WRKSRC}/bin/fsnotifier-arm \ ${WRKSRC}/bin/fsnotifier64 \ - ${WRKSRC}/plugins/android/lib/libwebp \ - ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native \ - ${WRKSRC}/plugins/performanceTesting/bin -# Remove the bundled native Pty4J support libraries, they are replaced -# by java/intellij-pty4j - @${RM} -r ${WRKSRC}/lib/pty4j-native -# Remove bundled linux JetBrains Runtime and OpenJDK - @${RM} -r ${WRKSRC}/jbr ${WRKSRC}/jre64 + ${WRKSRC}/lib/pty4j-native/ \ + ${WRKSRC}/plugins/android/lib/libwebp/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/linux32/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/linux64/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/osx/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/windows32/ \ + ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/windows64/ \ + ${WRKSRC}/plugins/performanceTesting/bin/ ${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ "! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh") @(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh") + ${INSTALL_LIB} ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/libjansi.so \ + ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/ + ${INSTALL_LIB} ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/libjansi.so \ + ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/ ${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea ${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/ # Use fsnotifier replacement provided by java/intellij-fsnotifier ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties +# Fix "Typeahead timeout is exceeded" error + ${ECHO} "action.aware.typeAhead=false" >> ${STAGEDIR}${DATADIR}/bin/idea.properties # Fix slow render ${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea.vmoptions ${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea64.vmoptions diff --git a/java/intellij/distinfo b/java/intellij/distinfo index abdec2193e6d..702790fd811f 100644 --- a/java/intellij/distinfo +++ b/java/intellij/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565566115 -SHA256 (jetbrains/ideaIC-2019.2-no-jbr.tar.gz) = 7ab6ad4b54b32425cd7e5a8554cb34443e37611b230b94c559f878b1e68030f5 -SIZE (jetbrains/ideaIC-2019.2-no-jbr.tar.gz) = 531207945 +TIMESTAMP = 1566671924 +SHA256 (jetbrains/ideaIC-2019.2.1-no-jbr.tar.gz) = ee8fb4cdb6c29d75b1987225f1f92517319c429c9bb6a0dfc3e0c23cb6688e98 +SIZE (jetbrains/ideaIC-2019.2.1-no-jbr.tar.gz) = 593703673 diff --git a/java/intellij/files/pkg-message.in b/java/intellij/files/pkg-message.in index ce5fe8305128..230fd8e38005 100644 --- a/java/intellij/files/pkg-message.in +++ b/java/intellij/files/pkg-message.in @@ -3,8 +3,8 @@ message: <<EOM There is a native (faster) file watching support backed by kqueue which is enabled by default. If you encounter problems with watching large -trees, you can disable it by appending the following property into -%%DATADIR%%/bin/idea.properties: +trees, you can disable it by adding the following property via the menu +entry Help -> Edit Custom Properties... idea.filewatcher.disabled=true diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist index e8ceafd4a670..dea6f5d72b0e 100644 --- a/java/intellij/pkg-plist +++ b/java/intellij/pkg-plist @@ -100,8 +100,8 @@ share/applications/idea.desktop %%DATADIR%%/lib/batik-transcoder-1.12.0-8.jar %%DATADIR%%/lib/batik-util-1.12.0-8.jar %%DATADIR%%/lib/batik-xml-1.12.0-8.jar -%%DATADIR%%/lib/bcpkix-jdk15on-1.61.jar -%%DATADIR%%/lib/bcprov-jdk15on-1.61.jar +%%DATADIR%%/lib/bcpkix-jdk15on-1.62.jar +%%DATADIR%%/lib/bcprov-jdk15on-1.62.jar %%DATADIR%%/lib/bootstrap.jar %%DATADIR%%/lib/built-in-server.jar %%DATADIR%%/lib/cglib-nodep-3.2.4.jar @@ -109,7 +109,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/common-image-3.4.1.jar %%DATADIR%%/lib/common-io-3.4.1.jar %%DATADIR%%/lib/common-lang-3.4.1.jar -%%DATADIR%%/lib/commons-codec-1.12.jar +%%DATADIR%%/lib/commons-codec-1.13.jar %%DATADIR%%/lib/commons-collections-3.2.2.jar %%DATADIR%%/lib/commons-compress-1.18.jar %%DATADIR%%/lib/commons-httpclient-3.1-patched.jar @@ -118,9 +118,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/commons-lang-2.4.jar %%DATADIR%%/lib/commons-logging-1.2.jar %%DATADIR%%/lib/commons-net-3.6.jar -%%DATADIR%%/lib/completion-ranking-java-0.0.7.jar -%%DATADIR%%/lib/completion-ranking-kotlin-0.0.2.jar -%%DATADIR%%/lib/completion-ranking-python-0.0.4.jar %%DATADIR%%/lib/configuration-store-impl.jar %%DATADIR%%/lib/credential-store.jar %%DATADIR%%/lib/cucumber-core-1.2.4.jar @@ -132,7 +129,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/exception-analyzer-api-1.0.1.jar %%DATADIR%%/lib/extensions.jar %%DATADIR%%/lib/external-system-rt.jar -%%DATADIR%%/lib/fluent-hc-4.5.8.jar +%%DATADIR%%/lib/fluent-hc-4.5.9.jar %%DATADIR%%/lib/forms-1.1-preview.jar %%DATADIR%%/lib/forms_rt.jar %%DATADIR%%/lib/gherkin-2.12.2.jar @@ -140,9 +137,9 @@ share/applications/idea.desktop %%DATADIR%%/lib/gson-2.8.5.jar %%DATADIR%%/lib/guava-25.1-jre.jar %%DATADIR%%/lib/hamcrest-core-1.3.jar -%%DATADIR%%/lib/httpclient-4.5.8.jar +%%DATADIR%%/lib/httpclient-4.5.9.jar %%DATADIR%%/lib/httpcore-4.4.11.jar -%%DATADIR%%/lib/httpmime-4.5.8.jar +%%DATADIR%%/lib/httpmime-4.5.9.jar %%DATADIR%%/lib/icons.jar %%DATADIR%%/lib/idea.jar %%DATADIR%%/lib/idea_rt.jar @@ -174,7 +171,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/jcip-annotations-1.0.jar %%DATADIR%%/lib/jdkAnnotations.jar %%DATADIR%%/lib/jdom.jar -%%DATADIR%%/lib/jediterm-pty-2.19.jar +%%DATADIR%%/lib/jediterm-pty-2.20.jar %%DATADIR%%/lib/jetCheck-0.2.1.jar %%DATADIR%%/lib/jing-20030619.jar %%DATADIR%%/lib/jna-platform.jar @@ -196,6 +193,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/kotlin-test-common-1.3.31.jar %%DATADIR%%/lib/kotlinx-coroutines-core-1.2.1.jar %%DATADIR%%/lib/kotlinx-coroutines-jdk8-1.2.1.jar +%%DATADIR%%/lib/layoutlib.jar %%DATADIR%%/lib/log4j.jar %%DATADIR%%/lib/lz4-java-1.6.0.jar %%DATADIR%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar @@ -204,16 +202,16 @@ share/applications/idea.desktop %%DATADIR%%/lib/miglayout-swing-5.2.jar %%DATADIR%%/lib/nanoxml-2.2.3.jar %%DATADIR%%/lib/nekohtml-1.9.22.jar -%%DATADIR%%/lib/netty-buffer-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-http-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-http2-4.1.36.Final.jar -%%DATADIR%%/lib/netty-codec-socks-4.1.36.Final.jar -%%DATADIR%%/lib/netty-common-4.1.36.Final.jar -%%DATADIR%%/lib/netty-handler-4.1.36.Final.jar -%%DATADIR%%/lib/netty-handler-proxy-4.1.36.Final.jar -%%DATADIR%%/lib/netty-resolver-4.1.36.Final.jar -%%DATADIR%%/lib/netty-transport-4.1.36.Final.jar +%%DATADIR%%/lib/netty-buffer-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-http-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-http2-4.1.38.Final.jar +%%DATADIR%%/lib/netty-codec-socks-4.1.38.Final.jar +%%DATADIR%%/lib/netty-common-4.1.38.Final.jar +%%DATADIR%%/lib/netty-handler-4.1.38.Final.jar +%%DATADIR%%/lib/netty-handler-proxy-4.1.38.Final.jar +%%DATADIR%%/lib/netty-resolver-4.1.38.Final.jar +%%DATADIR%%/lib/netty-transport-4.1.38.Final.jar %%DATADIR%%/lib/objenesis-3.0.1.jar %%DATADIR%%/lib/openapi.jar %%DATADIR%%/lib/org.eclipse.xtend.lib-2.14.0.jar @@ -236,12 +234,12 @@ share/applications/idea.desktop %%DATADIR%%/lib/pty4j-0.9.4.jar %%DATADIR%%/lib/purejavacomm-0.0.11.1.jar %%DATADIR%%/lib/randomForestRegressor-0.0.11.jar -%%DATADIR%%/lib/rd-core-0.191.46.jar -%%DATADIR%%/lib/rd-swing-0.191.46.jar +%%DATADIR%%/lib/rd-core-0.191.63.jar +%%DATADIR%%/lib/rd-swing-0.191.63.jar %%DATADIR%%/lib/reactive-streams-1.0.2.jar %%DATADIR%%/lib/resources.jar %%DATADIR%%/lib/resources_en.jar -%%DATADIR%%/lib/rhino-1.7.10.jar +%%DATADIR%%/lib/rhino-1.7.11.jar %%DATADIR%%/lib/rngom-20051226-patched.jar %%DATADIR%%/lib/rxjava-2.2.8.jar %%DATADIR%%/lib/sa-jdwp-1.12.jar @@ -674,13 +672,14 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/java-lib-model-3.3.0.jar %%DATADIR%%/plugins/android/lib/java-lib-model-builder-3.3.0.jar %%DATADIR%%/plugins/android/lib/javawriter-2.2.1.jar +%%DATADIR%%/plugins/android/lib/jdk11/layoutlib.jar +%%DATADIR%%/plugins/android/lib/jdk8/layoutlib.jar %%DATADIR%%/plugins/android/lib/jgraphx-3.4.1.3.jar %%DATADIR%%/plugins/android/lib/jps/android-jps-plugin.jar %%DATADIR%%/plugins/android/lib/kxml2-2.3.0.jar %%DATADIR%%/plugins/android/lib/layoutInspector-26.3.0.jar -%%DATADIR%%/plugins/android/lib/layoutlib-api-26.3.0.jar +%%DATADIR%%/plugins/android/lib/layoutlib-api-26.3.0-sp1.jar %%DATADIR%%/plugins/android/lib/layoutlib-loader.jar -%%DATADIR%%/plugins/android/lib/layoutlib.jar %%DATADIR%%/plugins/android/lib/layoutlib/build.prop %%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/AndroidClock.ttf %%DATADIR%%/plugins/android/lib/layoutlib/data/fonts/CarroisGothicSC-Regular.ttf @@ -9778,6 +9777,9 @@ share/applications/idea.desktop %%DATADIR%%/plugins/maven/lib/maven3/lib/guice-4.2.1-no_aop.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/j2objc-annotations-1.1.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-1.17.1.jar +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/README.txt +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/libjansi.so +%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/libjansi.so %%DATADIR%%/plugins/maven/lib/maven3/lib/javax.inject-1.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j-1.7.25.jar %%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j.license @@ -9830,6 +9832,14 @@ share/applications/idea.desktop %%DATADIR%%/plugins/sh/lib/resources_en.jar %%DATADIR%%/plugins/sh/lib/sh.jar %%DATADIR%%/plugins/smali/lib/smali.jar +%%DATADIR%%/plugins/stats-collector/lib/completion-ranking-java-0.0.7.jar +%%DATADIR%%/plugins/stats-collector/lib/completion-ranking-kotlin-0.0.2.jar +%%DATADIR%%/plugins/stats-collector/lib/completion-ranking-python-0.0.4.jar +%%DATADIR%%/plugins/stats-collector/lib/features.jar +%%DATADIR%%/plugins/stats-collector/lib/log-events.jar +%%DATADIR%%/plugins/stats-collector/lib/resources_en.jar +%%DATADIR%%/plugins/stats-collector/lib/stats-collector.jar +%%DATADIR%%/plugins/stats-collector/lib/statsCollector-completionRanker.jar %%DATADIR%%/plugins/stream-debugger/lib/resources_en.jar %%DATADIR%%/plugins/stream-debugger/lib/stream-debugger.jar %%DATADIR%%/plugins/svn4idea/lib/resources_en.jar diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile index 6762cb9e0a8c..b9833a992b76 100644 --- a/java/jdk11-doc/Makefile +++ b/java/jdk11-doc/Makefile @@ -18,7 +18,7 @@ RESTRICTED= This documentation is under license and export control. WRKSRC= ${WRKDIR}/docs JDK_VERSION= 11 JDK_UPDATE_VERSION= 0 -JDK_PATCH_VERSION= 3 +JDK_PATCH_VERSION= 4 DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html NO_BUILD= yes diff --git a/java/jdk11-doc/distinfo b/java/jdk11-doc/distinfo index f0dcf87e3caa..7a1e2b6168f1 100644 --- a/java/jdk11-doc/distinfo +++ b/java/jdk11-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555978118 -SHA256 (jdk-11.0.3_doc-all.zip) = ad20c79a5e087f70fdc5a994cc0a07d01a05e9372045b85363356ca1ff235c14 -SIZE (jdk-11.0.3_doc-all.zip) = 51580899 +TIMESTAMP = 1567000517 +SHA256 (jdk-11.0.4_doc-all.zip) = b92ba775afd52b95fd8062d4129dd11f26e9a80bee60b12a0096447f8f300571 +SIZE (jdk-11.0.4_doc-all.zip) = 51579103 diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile index 8ed8fc3e0c92..1a894ab8a0f4 100644 --- a/java/jdk12-doc/Makefile +++ b/java/jdk12-doc/Makefile @@ -18,7 +18,7 @@ RESTRICTED= This documentation is under license and export control. WRKSRC= ${WRKDIR}/docs JDK_VERSION= 12 JDK_UPDATE_VERSION= 0 -JDK_PATCH_VERSION= 1 +JDK_PATCH_VERSION= 2 DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html NO_BUILD= yes diff --git a/java/jdk12-doc/distinfo b/java/jdk12-doc/distinfo index acea840d35b8..0b26d5547c37 100644 --- a/java/jdk12-doc/distinfo +++ b/java/jdk12-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555978519 -SHA256 (jdk-12.0.1_doc-all.zip) = d77c9d9b38da262dbef88424d6d7e138a27efa26522313ec762126fde560d63f -SIZE (jdk-12.0.1_doc-all.zip) = 51088741 +TIMESTAMP = 1567000674 +SHA256 (jdk-12.0.2_doc-all.zip) = 8541ec6ff1d78f7e36ea6b5cfcf8cf84b8431ebe67d0f68a1f29fd00debd12aa +SIZE (jdk-12.0.2_doc-all.zip) = 51094535 diff --git a/java/jdk8-doc/Makefile b/java/jdk8-doc/Makefile index f3e974e00638..80edf3fd745c 100644 --- a/java/jdk8-doc/Makefile +++ b/java/jdk8-doc/Makefile @@ -10,15 +10,16 @@ DISTNAME= jdk-${JDK_VERSION}u${JDK_UPDATE_VER}-docs-all MAINTAINER= java@FreeBSD.org COMMENT= Java Development Kit ${JDK_VERSION} Documentation +USES= zip + DOCSDIR?= ${PREFIX}/share/doc/jdk${JDK_VERSION} RESTRICTED= This documentation is under license and export control. WRKSRC= ${WRKDIR}/docs JDK_VERSION= 8 -JDK_UPDATE_VER= 212 +JDK_UPDATE_VER= 221 DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html -USES= zip NO_BUILD= yes NO_ARCH= yes PORTDOCS= * diff --git a/java/jdk8-doc/distinfo b/java/jdk8-doc/distinfo index 2f650261612f..d55770b19a0b 100644 --- a/java/jdk8-doc/distinfo +++ b/java/jdk8-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555977370 -SHA256 (jdk-8u212-docs-all.zip) = b45cb1e670598edfa6b4ff13c942d359c37f28a06cf7e2b0b3d5a4c32c3e1302 -SIZE (jdk-8u212-docs-all.zip) = 93779925 +TIMESTAMP = 1567000010 +SHA256 (jdk-8u221-docs-all.zip) = 94a5d90bad7d8f845d2a6a61db4340e42b614ce671a3fb10a44169ebffa215f2 +SIZE (jdk-8u221-docs-all.zip) = 93813538 diff --git a/java/linux-oracle-jdk10/Makefile b/java/linux-oracle-jdk10/Makefile index df44a37a7f10..2d3a22b9342a 100644 --- a/java/linux-oracle-jdk10/Makefile +++ b/java/linux-oracle-jdk10/Makefile @@ -11,17 +11,21 @@ DISTNAME= jdk-${JDK_VERSION}.${JDK_UPDATE_VERSION}.${JDK_PATCH_VERSION}_linux-x6 MAINTAINER= java@FreeBSD.org COMMENT= Oracle Java ${JDK_VERSION} Development Kit for Linux +DEPRECATED= No longer maintained upstream, please migrate to openjdk11 +EXPIRATION_DATE=2019-09-28 + ONLY_FOR_ARCHS= amd64 RUN_DEPENDS= javavm:java/javavmwrapper +USES= linux:c7 shebangfix +USE_LINUX= xorglibs + RESTRICTED= Redistribution of repackaged binaries not permitted WRKSRC= ${WRKDIR}/jdk-${DL_JDK_VERSION} PLIST_SUB= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} NO_BUILD= yes -USES= linux:c7 shebangfix -USE_LINUX= xorglibs JDK_VENDOR= oracle JDK_VERSION= 10 diff --git a/java/linux-oracle-jdk9/Makefile b/java/linux-oracle-jdk9/Makefile index 18ed982b1cfe..7d76cea742ca 100644 --- a/java/linux-oracle-jdk9/Makefile +++ b/java/linux-oracle-jdk9/Makefile @@ -11,17 +11,21 @@ DISTNAME= jdk-${JDK_VERSION}.${JDK_UPDATE_VERSION}.${JDK_PATCH_VERSION}_linux-x6 MAINTAINER= java@FreeBSD.org COMMENT= Oracle Java ${JDK_VERSION} Development Kit for Linux +DEPRECATED= No longer maintained upstream, please migrate to openjdk11 +EXPIRATION_DATE=2019-09-28 + ONLY_FOR_ARCHS= amd64 RUN_DEPENDS= javavm:java/javavmwrapper +USES= linux shebangfix +USE_LINUX= xorglibs + RESTRICTED= Redistribution of repackaged binaries not permitted WRKSRC= ${WRKDIR}/jdk-${DL_JDK_VERSION} PLIST_SUB= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} NO_BUILD= yes -USES= linux shebangfix -USE_LINUX= xorglibs JDK_VENDOR= oracle JDK_VERSION= 9 diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 54c9c668587e..480d0d62ed77 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -12,7 +12,7 @@ COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ @@ -94,6 +94,11 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> +# Support aarch64 on FreeBSD 12 and up +.if ${OSVERSION} >= 1200500 +ONLY_FOR_ARCHS+=aarch64 +.endif + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 @@ -117,15 +122,18 @@ CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} .if ${COMPILER_TYPE} == gcc USE_GCC= yes -CONFIGURE_ARGS+= --disable-warnings-as-errors \ - --disable-dtrace \ - --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ +CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else MAKE_ENV+= USE_CLANG=true .endif +.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 +CONFIGURE_ARGS+= --disable-warnings-as-errors \ + --disable-dtrace +.endif + .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else diff --git a/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp new file mode 100644 index 000000000000..43d30609a667 --- /dev/null +++ b/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp @@ -0,0 +1,13 @@ +--- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp ++++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +@@ -45,6 +45,10 @@ + #define getauxval(hwcap) 0 + #endif + ++#ifndef HWCAP_ASIMD ++#define HWCAP_ASIMD (1<<1) ++#endif ++ + #ifndef HWCAP_AES + #define HWCAP_AES (1<<3) + #endif diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp new file mode 100644 index 000000000000..49ccc99bb889 --- /dev/null +++ b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp @@ -0,0 +1,61 @@ +--- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp ++++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp +@@ -32,6 +32,50 @@ + #include <machine/elf.h> + #endif + ++#ifndef HWCAP_ASIMD ++#define HWCAP_ASIMD (1<<1) ++#endif ++ ++#ifndef HWCAP_AES ++#define HWCAP_AES (1<<3) ++#endif ++ ++#ifndef HWCAP_PMULL ++#define HWCAP_PMULL (1<<4) ++#endif ++ ++#ifndef HWCAP_SHA1 ++#define HWCAP_SHA1 (1<<5) ++#endif ++ ++#ifndef HWCAP_SHA2 ++#define HWCAP_SHA2 (1<<6) ++#endif ++ ++#ifndef HWCAP_CRC32 ++#define HWCAP_CRC32 (1<<7) ++#endif ++ ++#ifndef HWCAP_ATOMICS ++#define HWCAP_ATOMICS (1<<8) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_SHIFT ++#define ID_AA64PFR0_AdvSIMD_SHIFT 20 ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD ++#define ID_AA64PFR0_AdvSIMD(x) ((x) & (UL(0xf) << ID_AA64PFR0_AdvSIMD_SHIFT)) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_IMPL ++#define ID_AA64PFR0_AdvSIMD_IMPL (UL(0x0) << ID_AA64PFR0_AdvSIMD_SHIFT) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_HP ++#define ID_AA64PFR0_AdvSIMD_HP (UL(0x1) << ID_AA64PFR0_AdvSIMD_SHIFT) ++#endif ++ + #define CPU_IMPL_ARM 0x41 + #define CPU_IMPL_BROADCOM 0x42 + #define CPU_IMPL_CAVIUM 0x43 +@@ -113,6 +157,7 @@ + #define CPU_PART(midr) (((midr) >> 4) & 0xfff) + #define CPU_VAR(midr) (((midr) >> 20) & 0xf) + #define CPU_REV(midr) (((midr) >> 0) & 0xf) ++#define UL(x) UINT64_C(x) + + struct cpu_desc { + u_int cpu_impl; diff --git a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c new file mode 100644 index 000000000000..545081d1f3f0 --- /dev/null +++ b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c @@ -0,0 +1,12 @@ +--- src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c +@@ -27,8 +27,8 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include <sys/sysctl.h> + #include <sys/types.h> ++#include <sys/sysctl.h> + #include <sys/wait.h> + #include <sys/ptrace.h> + #include <sys/param.h> diff --git a/java/openjdk11/pkg-message b/java/openjdk11/pkg-message index 2ea3d87d89c8..c3388e69a9e6 100644 --- a/java/openjdk11/pkg-message +++ b/java/openjdk11/pkg-message @@ -1,18 +1,15 @@ [ { type: install message: <<EOM -This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and -procfs(5) mounted on /proc. +This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd If you have not done it yet, please do the following: mount -t fdescfs fdesc /dev/fd - mount -t procfs proc /proc To make it permanent, you need the following lines in /etc/fstab: fdesc /dev/fd fdescfs rw 0 0 - proc /proc procfs rw 0 0 EOM } ] diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index cd860ddc1cc8..88a1dcf44a1c 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -12,7 +12,7 @@ COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ @@ -41,12 +41,12 @@ MAKE_ENV= LANG="C" \ CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ - CC=/usr/bin/cc \ - CXX=/usr/bin/c++ \ - MAKEFLAGS="" \ - USE_CLANG=true + CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} \ + MAKEFLAGS="" -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/} +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} @@ -60,8 +60,9 @@ JDK_BUILD_NUMBER= 10 BSD_JDK_VERSION= 2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CC=/usr/bin/cc \ - CXX=/usr/bin/c++ +CONFIGURE_ENV= CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-ccache \ --disable-javac-server \ @@ -79,7 +80,6 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ - --with-toolchain-type=clang \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-cacerts-file=${FILESDIR}/cacerts \ @@ -94,6 +94,11 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> +# Support aarch64 on FreeBSD 12 and up +.if ${OSVERSION} >= 1200500 +ONLY_FOR_ARCHS+=aarch64 +.endif + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk12 \ ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 @@ -113,6 +118,25 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 JDK_BUILD_JVM= server +MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} + +.if ${COMPILER_TYPE} == gcc +USE_GCC= yes +CONFIGURE_ARGS+= --disable-warnings-as-errors \ + --disable-dtrace \ + --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" +.else +MAKE_ENV+= USE_CLANG=true +.endif + +.if ${ARCH} == aarch64 +CONFIGURE_ARGS+= --disable-warnings-as-errors \ + --disable-dtrace +.endif + .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else diff --git a/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp new file mode 100644 index 000000000000..43d30609a667 --- /dev/null +++ b/java/openjdk12/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp @@ -0,0 +1,13 @@ +--- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp ++++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +@@ -45,6 +45,10 @@ + #define getauxval(hwcap) 0 + #endif + ++#ifndef HWCAP_ASIMD ++#define HWCAP_ASIMD (1<<1) ++#endif ++ + #ifndef HWCAP_AES + #define HWCAP_AES (1<<3) + #endif diff --git a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp new file mode 100644 index 000000000000..49ccc99bb889 --- /dev/null +++ b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp @@ -0,0 +1,61 @@ +--- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp ++++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp +@@ -32,6 +32,50 @@ + #include <machine/elf.h> + #endif + ++#ifndef HWCAP_ASIMD ++#define HWCAP_ASIMD (1<<1) ++#endif ++ ++#ifndef HWCAP_AES ++#define HWCAP_AES (1<<3) ++#endif ++ ++#ifndef HWCAP_PMULL ++#define HWCAP_PMULL (1<<4) ++#endif ++ ++#ifndef HWCAP_SHA1 ++#define HWCAP_SHA1 (1<<5) ++#endif ++ ++#ifndef HWCAP_SHA2 ++#define HWCAP_SHA2 (1<<6) ++#endif ++ ++#ifndef HWCAP_CRC32 ++#define HWCAP_CRC32 (1<<7) ++#endif ++ ++#ifndef HWCAP_ATOMICS ++#define HWCAP_ATOMICS (1<<8) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_SHIFT ++#define ID_AA64PFR0_AdvSIMD_SHIFT 20 ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD ++#define ID_AA64PFR0_AdvSIMD(x) ((x) & (UL(0xf) << ID_AA64PFR0_AdvSIMD_SHIFT)) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_IMPL ++#define ID_AA64PFR0_AdvSIMD_IMPL (UL(0x0) << ID_AA64PFR0_AdvSIMD_SHIFT) ++#endif ++ ++#ifndef ID_AA64PFR0_AdvSIMD_HP ++#define ID_AA64PFR0_AdvSIMD_HP (UL(0x1) << ID_AA64PFR0_AdvSIMD_SHIFT) ++#endif ++ + #define CPU_IMPL_ARM 0x41 + #define CPU_IMPL_BROADCOM 0x42 + #define CPU_IMPL_CAVIUM 0x43 +@@ -113,6 +157,7 @@ + #define CPU_PART(midr) (((midr) >> 4) & 0xfff) + #define CPU_VAR(midr) (((midr) >> 20) & 0xf) + #define CPU_REV(midr) (((midr) >> 0) & 0xf) ++#define UL(x) UINT64_C(x) + + struct cpu_desc { + u_int cpu_impl; diff --git a/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c b/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c new file mode 100644 index 000000000000..545081d1f3f0 --- /dev/null +++ b/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c @@ -0,0 +1,12 @@ +--- src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c +@@ -27,8 +27,8 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include <sys/sysctl.h> + #include <sys/types.h> ++#include <sys/sysctl.h> + #include <sys/wait.h> + #include <sys/ptrace.h> + #include <sys/param.h> diff --git a/java/openjdk12/pkg-message b/java/openjdk12/pkg-message index 2ea3d87d89c8..c3388e69a9e6 100644 --- a/java/openjdk12/pkg-message +++ b/java/openjdk12/pkg-message @@ -1,18 +1,15 @@ [ { type: install message: <<EOM -This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and -procfs(5) mounted on /proc. +This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd If you have not done it yet, please do the following: mount -t fdescfs fdesc /dev/fd - mount -t procfs proc /proc To make it permanent, you need the following lines in /etc/fstab: fdesc /dev/fd fdescfs rw 0 0 - proc /proc procfs rw 0 0 EOM } ] diff --git a/java/openjdk8/pkg-message b/java/openjdk8/pkg-message index 2ea3d87d89c8..c3388e69a9e6 100644 --- a/java/openjdk8/pkg-message +++ b/java/openjdk8/pkg-message @@ -1,18 +1,15 @@ [ { type: install message: <<EOM -This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and -procfs(5) mounted on /proc. +This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd If you have not done it yet, please do the following: mount -t fdescfs fdesc /dev/fd - mount -t procfs proc /proc To make it permanent, you need the following lines in /etc/fstab: fdesc /dev/fd fdescfs rw 0 0 - proc /proc procfs rw 0 0 EOM } ] diff --git a/java/wildfly90/pkg-descr b/java/wildfly90/pkg-descr index d1324700d245..24bf8a3b960b 100644 --- a/java/wildfly90/pkg-descr +++ b/java/wildfly90/pkg-descr @@ -9,4 +9,4 @@ Unified Configuration and Management And of course Java EE! -WWW: http://wildfly.org +WWW: https://wildfly.org/ |