pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang adoptopenjdk11-bin, openjdk-bin, openjdk11: Updat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cfef76dab31
branches:  trunk
changeset: 450083:6cfef76dab31
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Apr 10 18:21:44 2021 +0000

description:
adoptopenjdk11-bin, openjdk-bin, openjdk11: Update wrappers

Fix PR pkg/56093.
Bump PKGREVISIONs.
And update openjdk-bin to 16.

diffstat:

 lang/adoptopenjdk11-bin/Makefile            |    9 +-
 lang/adoptopenjdk11-bin/PLIST.darwin-x86_64 |   23 ++-
 lang/adoptopenjdk11-bin/PLIST.linux-x86_64  |   23 ++-
 lang/openjdk-bin/Makefile                   |   12 +-
 lang/openjdk-bin/PLIST.linux-x86_64         |   51 ++++----
 lang/openjdk-bin/distinfo                   |   10 +-
 lang/openjdk11/Makefile                     |   10 +-
 lang/openjdk11/PLIST                        |  157 ++++++++++++++-------------
 8 files changed, 164 insertions(+), 131 deletions(-)

diffs (truncated from 586 to 300 lines):

diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/adoptopenjdk11-bin/Makefile
--- a/lang/adoptopenjdk11-bin/Makefile  Sat Apr 10 13:14:39 2021 +0000
+++ b/lang/adoptopenjdk11-bin/Makefile  Sat Apr 10 18:21:44 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/02/02 11:57:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2021/04/10 18:21:44 ryoon Exp $
 
 PKGNAME=       adoptopenjdk11-bin-${GITHUB_RELEASE:S/jdk-//:S/+/./}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdoptOpenJDK/}
 GITHUB_PROJECT=        openjdk11-binaries
@@ -40,8 +41,10 @@
 JAVA_HOME=             ${PREFIX}/java/${JAVA_NAME}
 INSTALLATION_DIRS+=    ${JAVA_HOME}
 
-JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jmap jps jstack \
-               keytool orbd policytool rmid rmiregistry servertool tnameserv
+JAVA_WRAPPERS= jar jarsigner java javac javadoc javap jcmd jconsole jdb \
+               jdeprscan jdeps jfr jimage jinfo jlink jmap jmod jps \
+               jrunscript jshell jstack jstat jstatd keytool rmid \
+               rmiregistry serialver
 
 do-install:
        cd ${WRKSRC} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/adoptopenjdk11-bin/PLIST.darwin-x86_64
--- a/lang/adoptopenjdk11-bin/PLIST.darwin-x86_64       Sat Apr 10 13:14:39 2021 +0000
+++ b/lang/adoptopenjdk11-bin/PLIST.darwin-x86_64       Sat Apr 10 18:21:44 2021 +0000
@@ -1,22 +1,31 @@
-@comment $NetBSD: PLIST.darwin-x86_64,v 1.2 2021/02/02 11:57:40 ryoon Exp $
+@comment $NetBSD: PLIST.darwin-x86_64,v 1.3 2021/04/10 18:21:44 ryoon Exp $
 bin/adoptopenjdk11-bin-jar
+bin/adoptopenjdk11-bin-jarsigner
 bin/adoptopenjdk11-bin-java
 bin/adoptopenjdk11-bin-javac
 bin/adoptopenjdk11-bin-javadoc
-bin/adoptopenjdk11-bin-javah
 bin/adoptopenjdk11-bin-javap
 bin/adoptopenjdk11-bin-jcmd
-bin/adoptopenjdk11-bin-jhat
+bin/adoptopenjdk11-bin-jconsole
+bin/adoptopenjdk11-bin-jdb
+bin/adoptopenjdk11-bin-jdeprscan
+bin/adoptopenjdk11-bin-jdeps
+bin/adoptopenjdk11-bin-jfr
+bin/adoptopenjdk11-bin-jimage
+bin/adoptopenjdk11-bin-jinfo
+bin/adoptopenjdk11-bin-jlink
 bin/adoptopenjdk11-bin-jmap
+bin/adoptopenjdk11-bin-jmod
 bin/adoptopenjdk11-bin-jps
+bin/adoptopenjdk11-bin-jrunscript
+bin/adoptopenjdk11-bin-jshell
 bin/adoptopenjdk11-bin-jstack
+bin/adoptopenjdk11-bin-jstat
+bin/adoptopenjdk11-bin-jstatd
 bin/adoptopenjdk11-bin-keytool
-bin/adoptopenjdk11-bin-orbd
-bin/adoptopenjdk11-bin-policytool
 bin/adoptopenjdk11-bin-rmid
 bin/adoptopenjdk11-bin-rmiregistry
-bin/adoptopenjdk11-bin-servertool
-bin/adoptopenjdk11-bin-tnameserv
+bin/adoptopenjdk11-bin-serialver
 java/adoptopenjdk11-bin/bin/jaotc
 java/adoptopenjdk11-bin/bin/jar
 java/adoptopenjdk11-bin/bin/jarsigner
diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/adoptopenjdk11-bin/PLIST.linux-x86_64
--- a/lang/adoptopenjdk11-bin/PLIST.linux-x86_64        Sat Apr 10 13:14:39 2021 +0000
+++ b/lang/adoptopenjdk11-bin/PLIST.linux-x86_64        Sat Apr 10 18:21:44 2021 +0000
@@ -1,22 +1,31 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.4 2021/02/25 09:51:51 ryoon Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.5 2021/04/10 18:21:44 ryoon Exp $
 bin/adoptopenjdk11-bin-jar
+bin/adoptopenjdk11-bin-jarsigner
 bin/adoptopenjdk11-bin-java
 bin/adoptopenjdk11-bin-javac
 bin/adoptopenjdk11-bin-javadoc
-bin/adoptopenjdk11-bin-javah
 bin/adoptopenjdk11-bin-javap
 bin/adoptopenjdk11-bin-jcmd
-bin/adoptopenjdk11-bin-jhat
+bin/adoptopenjdk11-bin-jconsole
+bin/adoptopenjdk11-bin-jdb
+bin/adoptopenjdk11-bin-jdeprscan
+bin/adoptopenjdk11-bin-jdeps
+bin/adoptopenjdk11-bin-jfr
+bin/adoptopenjdk11-bin-jimage
+bin/adoptopenjdk11-bin-jinfo
+bin/adoptopenjdk11-bin-jlink
 bin/adoptopenjdk11-bin-jmap
+bin/adoptopenjdk11-bin-jmod
 bin/adoptopenjdk11-bin-jps
+bin/adoptopenjdk11-bin-jrunscript
+bin/adoptopenjdk11-bin-jshell
 bin/adoptopenjdk11-bin-jstack
+bin/adoptopenjdk11-bin-jstat
+bin/adoptopenjdk11-bin-jstatd
 bin/adoptopenjdk11-bin-keytool
-bin/adoptopenjdk11-bin-orbd
-bin/adoptopenjdk11-bin-policytool
 bin/adoptopenjdk11-bin-rmid
 bin/adoptopenjdk11-bin-rmiregistry
-bin/adoptopenjdk11-bin-servertool
-bin/adoptopenjdk11-bin-tnameserv
+bin/adoptopenjdk11-bin-serialver
 java/adoptopenjdk11-bin/bin/jaotc
 java/adoptopenjdk11-bin/bin/jar
 java/adoptopenjdk11-bin/bin/jarsigner
diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/openjdk-bin/Makefile
--- a/lang/openjdk-bin/Makefile Sat Apr 10 13:14:39 2021 +0000
+++ b/lang/openjdk-bin/Makefile Sat Apr 10 18:21:44 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2020/09/15 20:09:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2021/04/10 18:21:44 ryoon Exp $
 
-DISTNAME=      openjdk-15_linux-x64_bin
+DISTNAME=      openjdk-16_linux-x64_bin
 PKGNAME=       ${DISTNAME:S/_linux-x64_bin//:S/openjdk-/openjdk-bin-/}
 CATEGORIES=    lang
-MASTER_SITES=  https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/
+MASTER_SITES=  https://download.java.net/java/GA/jdk16/7863447f0ab643c585b9bdebf67c69db/36/GPL/
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://jdk.java.net/
@@ -29,8 +29,10 @@
 JAVA_HOME=             ${PREFIX}/java/${JAVA_NAME}
 INSTALLATION_DIRS+=    ${JAVA_HOME}
 
-JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jmap jps jstack \
-               keytool orbd policytool rmid rmiregistry servertool tnameserv
+JAVA_WRAPPERS= jar jarsigner java javac javadoc javap jcmd jconsole jdb \
+               jdeprscan jdeps jfr jimage jinfo jlink jmap jmod jps \
+               jrunscript jshell jstack jstat jstatd keytool rmid \
+               rmiregistry serialver
 
 do-install:
        cd ${WRKSRC} && pax -rwp ma . ${DESTDIR}${JAVA_HOME}
diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/openjdk-bin/PLIST.linux-x86_64
--- a/lang/openjdk-bin/PLIST.linux-x86_64       Sat Apr 10 13:14:39 2021 +0000
+++ b/lang/openjdk-bin/PLIST.linux-x86_64       Sat Apr 10 18:21:44 2021 +0000
@@ -1,23 +1,31 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.4 2020/09/15 20:09:00 ryoon Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.5 2021/04/10 18:21:44 ryoon Exp $
 bin/openjdk-bin-jar
+bin/openjdk-bin-jarsigner
 bin/openjdk-bin-java
 bin/openjdk-bin-javac
 bin/openjdk-bin-javadoc
-bin/openjdk-bin-javah
 bin/openjdk-bin-javap
 bin/openjdk-bin-jcmd
-bin/openjdk-bin-jhat
+bin/openjdk-bin-jconsole
+bin/openjdk-bin-jdb
+bin/openjdk-bin-jdeprscan
+bin/openjdk-bin-jdeps
+bin/openjdk-bin-jfr
+bin/openjdk-bin-jimage
+bin/openjdk-bin-jinfo
+bin/openjdk-bin-jlink
 bin/openjdk-bin-jmap
+bin/openjdk-bin-jmod
 bin/openjdk-bin-jps
+bin/openjdk-bin-jrunscript
+bin/openjdk-bin-jshell
 bin/openjdk-bin-jstack
+bin/openjdk-bin-jstat
+bin/openjdk-bin-jstatd
 bin/openjdk-bin-keytool
-bin/openjdk-bin-orbd
-bin/openjdk-bin-policytool
 bin/openjdk-bin-rmid
 bin/openjdk-bin-rmiregistry
-bin/openjdk-bin-servertool
-bin/openjdk-bin-tnameserv
-java/openjdk-bin/bin/jaotc
+bin/openjdk-bin-serialver
 java/openjdk-bin/bin/jar
 java/openjdk-bin/bin/jarsigner
 java/openjdk-bin/bin/java
@@ -93,7 +101,6 @@
 java/openjdk-bin/jmods/java.xml.crypto.jmod
 java/openjdk-bin/jmods/java.xml.jmod
 java/openjdk-bin/jmods/jdk.accessibility.jmod
-java/openjdk-bin/jmods/jdk.aot.jmod
 java/openjdk-bin/jmods/jdk.attach.jmod
 java/openjdk-bin/jmods/jdk.charsets.jmod
 java/openjdk-bin/jmods/jdk.compiler.jmod
@@ -104,14 +111,12 @@
 java/openjdk-bin/jmods/jdk.hotspot.agent.jmod
 java/openjdk-bin/jmods/jdk.httpserver.jmod
 java/openjdk-bin/jmods/jdk.incubator.foreign.jmod
-java/openjdk-bin/jmods/jdk.incubator.jpackage.jmod
+java/openjdk-bin/jmods/jdk.incubator.vector.jmod
 java/openjdk-bin/jmods/jdk.internal.ed.jmod
 java/openjdk-bin/jmods/jdk.internal.jvmstat.jmod
 java/openjdk-bin/jmods/jdk.internal.le.jmod
 java/openjdk-bin/jmods/jdk.internal.opt.jmod
 java/openjdk-bin/jmods/jdk.internal.vm.ci.jmod
-java/openjdk-bin/jmods/jdk.internal.vm.compiler.jmod
-java/openjdk-bin/jmods/jdk.internal.vm.compiler.management.jmod
 java/openjdk-bin/jmods/jdk.jartool.jmod
 java/openjdk-bin/jmods/jdk.javadoc.jmod
 java/openjdk-bin/jmods/jdk.jcmd.jmod
@@ -121,6 +126,7 @@
 java/openjdk-bin/jmods/jdk.jdwp.agent.jmod
 java/openjdk-bin/jmods/jdk.jfr.jmod
 java/openjdk-bin/jmods/jdk.jlink.jmod
+java/openjdk-bin/jmods/jdk.jpackage.jmod
 java/openjdk-bin/jmods/jdk.jshell.jmod
 java/openjdk-bin/jmods/jdk.jsobject.jmod
 java/openjdk-bin/jmods/jdk.jstatd.jmod
@@ -230,9 +236,6 @@
 java/openjdk-bin/legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.accessibility/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.accessibility/LICENSE
-java/openjdk-bin/legal/jdk.aot/ADDITIONAL_LICENSE_INFO
-java/openjdk-bin/legal/jdk.aot/ASSEMBLY_EXCEPTION
-java/openjdk-bin/legal/jdk.aot/LICENSE
 java/openjdk-bin/legal/jdk.attach/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.attach/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.attach/LICENSE
@@ -250,7 +253,6 @@
 java/openjdk-bin/legal/jdk.crypto.ec/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.crypto.ec/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.crypto.ec/LICENSE
-java/openjdk-bin/legal/jdk.crypto.ec/ecc.md
 java/openjdk-bin/legal/jdk.dynalink/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.dynalink/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.dynalink/LICENSE
@@ -267,9 +269,9 @@
 java/openjdk-bin/legal/jdk.incubator.foreign/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.incubator.foreign/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.incubator.foreign/LICENSE
-java/openjdk-bin/legal/jdk.incubator.jpackage/ADDITIONAL_LICENSE_INFO
-java/openjdk-bin/legal/jdk.incubator.jpackage/ASSEMBLY_EXCEPTION
-java/openjdk-bin/legal/jdk.incubator.jpackage/LICENSE
+java/openjdk-bin/legal/jdk.incubator.vector/ADDITIONAL_LICENSE_INFO
+java/openjdk-bin/legal/jdk.incubator.vector/ASSEMBLY_EXCEPTION
+java/openjdk-bin/legal/jdk.incubator.vector/LICENSE
 java/openjdk-bin/legal/jdk.internal.ed/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.internal.ed/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.internal.ed/LICENSE
@@ -287,12 +289,6 @@
 java/openjdk-bin/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.internal.vm.ci/LICENSE
-java/openjdk-bin/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
-java/openjdk-bin/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-java/openjdk-bin/legal/jdk.internal.vm.compiler.management/LICENSE
-java/openjdk-bin/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-java/openjdk-bin/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-java/openjdk-bin/legal/jdk.internal.vm.compiler/LICENSE
 java/openjdk-bin/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.jartool/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.jartool/LICENSE
@@ -322,6 +318,9 @@
 java/openjdk-bin/legal/jdk.jlink/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.jlink/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.jlink/LICENSE
+java/openjdk-bin/legal/jdk.jpackage/ADDITIONAL_LICENSE_INFO
+java/openjdk-bin/legal/jdk.jpackage/ASSEMBLY_EXCEPTION
+java/openjdk-bin/legal/jdk.jpackage/LICENSE
 java/openjdk-bin/legal/jdk.jshell/ADDITIONAL_LICENSE_INFO
 java/openjdk-bin/legal/jdk.jshell/ASSEMBLY_EXCEPTION
 java/openjdk-bin/legal/jdk.jshell/LICENSE
@@ -393,6 +392,7 @@
 java/openjdk-bin/lib/libdt_socket.so
 java/openjdk-bin/lib/libextnet.so
 java/openjdk-bin/lib/libfontmanager.so
+java/openjdk-bin/lib/libharfbuzz.so
 java/openjdk-bin/lib/libinstrument.so
 java/openjdk-bin/lib/libj2gss.so
 java/openjdk-bin/lib/libj2pcsc.so
@@ -418,7 +418,6 @@
 java/openjdk-bin/lib/libsaproc.so
 java/openjdk-bin/lib/libsctp.so
 java/openjdk-bin/lib/libsplashscreen.so
-java/openjdk-bin/lib/libsunec.so
 java/openjdk-bin/lib/libverify.so
 java/openjdk-bin/lib/libzip.so
 java/openjdk-bin/lib/modules
diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/openjdk-bin/distinfo
--- a/lang/openjdk-bin/distinfo Sat Apr 10 13:14:39 2021 +0000
+++ b/lang/openjdk-bin/distinfo Sat Apr 10 18:21:44 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/09/15 20:09:00 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2021/04/10 18:21:44 ryoon Exp $
 
-SHA1 (openjdk-15_linux-x64_bin.tar.gz) = ad0f3fb8a3ca22311fe343cf469f3c47bdcbf4f1
-RMD160 (openjdk-15_linux-x64_bin.tar.gz) = 7561b25f2c181c012543d99972e5b8f8f52e7821
-SHA512 (openjdk-15_linux-x64_bin.tar.gz) = 600391d1f1e4e87b8f6c37313435814a9576d6f436142bde8131b786149c6fafeb3a650ed0e1cda2c4690bb0e4246ec3d50d002931bd50810c1f0997458c52f3
-Size (openjdk-15_linux-x64_bin.tar.gz) = 195313679 bytes
+SHA1 (openjdk-16_linux-x64_bin.tar.gz) = 55fc4d9e00e44031fe7884dff93acdf315c448d5
+RMD160 (openjdk-16_linux-x64_bin.tar.gz) = 92cf4d2c812564e059084704ea631d9e2da06476
+SHA512 (openjdk-16_linux-x64_bin.tar.gz) = 6a4fb63377965870e7d225b07cc448db5dbe6f7ead547c41ede5a247c3569185d9468a37a112828eac431cb6f8ef6915739ed592bf3961b793602309ff755bd1
+Size (openjdk-16_linux-x64_bin.tar.gz) = 184303539 bytes
diff -r 46ebf52dc6f2 -r 6cfef76dab31 lang/openjdk11/Makefile
--- a/lang/openjdk11/Makefile   Sat Apr 10 13:14:39 2021 +0000



Home | Main Index | Thread Index | Old Index