pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Now the package finally works :-)
Module Name: pkgsrc-wip
Committed By: Christos Zoulas <christos%zoulas.com@localhost>
Pushed By: christos
Date: Fri Nov 5 17:44:39 2021 -0400
Changeset: 48c8c569c6613f9c57428c43e0518a5b9697c040
Modified Files:
openjdk16/Makefile
openjdk16/PLIST
Log Message:
Now the package finally works :-)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=48c8c569c6613f9c57428c43e0518a5b9697c040
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openjdk16/Makefile | 2 +-
openjdk16/PLIST | 116 +++++++++++++++++++++--------------------------------
2 files changed, 47 insertions(+), 71 deletions(-)
diffs:
diff --git a/openjdk16/Makefile b/openjdk16/Makefile
index 9073a0699b..ce440806a8 100644
--- a/openjdk16/Makefile
+++ b/openjdk16/Makefile
@@ -81,7 +81,7 @@ ALL_ENV+= SED="sed -g"
BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/}
BUILD_ARCH= ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
-BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
+BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib
BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/lib/server
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/openjdk16/PLIST b/openjdk16/PLIST
index e60ceba26f..6066176da5 100644
--- a/openjdk16/PLIST
+++ b/openjdk16/PLIST
@@ -1,4 +1,26 @@
@comment $NetBSD: PLIST,v 1.9 2021/04/10 18:21:44 ryoon Exp $
+${PLIST.aot}java/openjdk16/bin/jaotc
+${PLIST.aot}java/openjdk16/bin/jaotc${DBGEXT}
+${PLIST.aot}java/openjdk16/jmods/jdk.aot.jmod
+${PLIST.aot}java/openjdk16/legal/jdk.aot/ADDITIONAL_LICENSE_INFO
+${PLIST.aot}java/openjdk16/legal/jdk.aot/ASSEMBLY_EXCEPTION
+${PLIST.aot}java/openjdk16/legal/jdk.aot/LICENSE
+${PLIST.internal_vm_compiler}java/openjdk16/jmods/jdk.internal.vm.compiler.jmod
+${PLIST.internal_vm_compiler}java/openjdk16/jmods/jdk.internal.vm.compiler.management.jmod
+${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler.management/LICENSE
+${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler/LICENSE
+${PLIST.jvmci}java/openjdk16/jmods/jdk.internal.vm.ci.jmod
+${PLIST.jvmci}java/openjdk16/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+${PLIST.jvmci}java/openjdk16/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+${PLIST.jvmci}java/openjdk16/legal/jdk.internal.vm.ci/LICENSE
+${PLIST.x11}java/openjdk16/lib/libawt_xawt${DBGEXT}
+${PLIST.x11}java/openjdk16/lib/libawt_xawt.so
+${PLIST.x11}java/openjdk16/lib/libsplashscreen${DBGEXT}
+${PLIST.x11}java/openjdk16/lib/libsplashscreen.so
bin/openjdk16-jar
bin/openjdk16-jarsigner
bin/openjdk16-java
@@ -26,8 +48,6 @@ bin/openjdk16-keytool
bin/openjdk16-rmid
bin/openjdk16-rmiregistry
bin/openjdk16-serialver
-${PLIST.aot}java/openjdk16/bin/jaotc
-${PLIST.aot}java/openjdk16/bin/jaotc${DBGEXT}
java/openjdk16/bin/jar
java/openjdk16/bin/jar.diz
java/openjdk16/bin/jarsigner
@@ -56,8 +76,6 @@ java/openjdk16/bin/jimage
java/openjdk16/bin/jimage.diz
java/openjdk16/bin/jinfo
java/openjdk16/bin/jinfo.diz
-java/openjdk16/bin/jjs
-java/openjdk16/bin/jjs.diz
java/openjdk16/bin/jlink
java/openjdk16/bin/jlink.diz
java/openjdk16/bin/jmap
@@ -78,18 +96,12 @@ java/openjdk16/bin/jstatd
java/openjdk16/bin/jstatd.diz
java/openjdk16/bin/keytool
java/openjdk16/bin/keytool.diz
-java/openjdk16/bin/pack200
-java/openjdk16/bin/pack200.diz
-java/openjdk16/bin/rmic
-java/openjdk16/bin/rmic.diz
java/openjdk16/bin/rmid
java/openjdk16/bin/rmid.diz
java/openjdk16/bin/rmiregistry
java/openjdk16/bin/rmiregistry.diz
java/openjdk16/bin/serialver
java/openjdk16/bin/serialver.diz
-java/openjdk16/bin/unpack200
-java/openjdk16/bin/unpack200.diz
java/openjdk16/conf/logging.properties
java/openjdk16/conf/management/jmxremote.access
java/openjdk16/conf/management/jmxremote.password.template
@@ -253,7 +265,6 @@ java/openjdk16/jmods/java.transaction.xa.jmod
java/openjdk16/jmods/java.xml.crypto.jmod
java/openjdk16/jmods/java.xml.jmod
java/openjdk16/jmods/jdk.accessibility.jmod
-${PLIST.aot}java/openjdk16/jmods/jdk.aot.jmod
java/openjdk16/jmods/jdk.attach.jmod
java/openjdk16/jmods/jdk.charsets.jmod
java/openjdk16/jmods/jdk.compiler.jmod
@@ -262,13 +273,12 @@ java/openjdk16/jmods/jdk.crypto.ec.jmod
java/openjdk16/jmods/jdk.dynalink.jmod
java/openjdk16/jmods/jdk.editpad.jmod
java/openjdk16/jmods/jdk.httpserver.jmod
+java/openjdk16/jmods/jdk.incubator.foreign.jmod
+java/openjdk16/jmods/jdk.incubator.vector.jmod
java/openjdk16/jmods/jdk.internal.ed.jmod
java/openjdk16/jmods/jdk.internal.jvmstat.jmod
java/openjdk16/jmods/jdk.internal.le.jmod
java/openjdk16/jmods/jdk.internal.opt.jmod
-${PLIST.jvmci}java/openjdk16/jmods/jdk.internal.vm.ci.jmod
-${PLIST.internal_vm_compiler}java/openjdk16/jmods/jdk.internal.vm.compiler.jmod
-${PLIST.internal_vm_compiler}java/openjdk16/jmods/jdk.internal.vm.compiler.management.jmod
java/openjdk16/jmods/jdk.jartool.jmod
java/openjdk16/jmods/jdk.javadoc.jmod
java/openjdk16/jmods/jdk.jcmd.jmod
@@ -286,13 +296,9 @@ java/openjdk16/jmods/jdk.management.agent.jmod
java/openjdk16/jmods/jdk.management.jfr.jmod
java/openjdk16/jmods/jdk.management.jmod
java/openjdk16/jmods/jdk.naming.dns.jmod
-java/openjdk16/jmods/jdk.naming.ldap.jmod
java/openjdk16/jmods/jdk.naming.rmi.jmod
java/openjdk16/jmods/jdk.net.jmod
-java/openjdk16/jmods/jdk.pack.jmod
-java/openjdk16/jmods/jdk.rmic.jmod
-java/openjdk16/jmods/jdk.scripting.nashorn.jmod
-java/openjdk16/jmods/jdk.scripting.nashorn.shell.jmod
+java/openjdk16/jmods/jdk.nio.mapmode.jmod
java/openjdk16/jmods/jdk.sctp.jmod
java/openjdk16/jmods/jdk.security.auth.jmod
java/openjdk16/jmods/jdk.security.jgss.jmod
@@ -391,9 +397,6 @@ java/openjdk16/legal/java.xml/xerces.md
java/openjdk16/legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.accessibility/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.accessibility/LICENSE
-${PLIST.aot}java/openjdk16/legal/jdk.aot/ADDITIONAL_LICENSE_INFO
-${PLIST.aot}java/openjdk16/legal/jdk.aot/ASSEMBLY_EXCEPTION
-${PLIST.aot}java/openjdk16/legal/jdk.aot/LICENSE
java/openjdk16/legal/jdk.attach/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.attach/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.attach/LICENSE
@@ -406,12 +409,11 @@ java/openjdk16/legal/jdk.compiler/LICENSE
java/openjdk16/legal/jdk.crypto.cryptoki/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.crypto.cryptoki/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.crypto.cryptoki/LICENSE
-java/openjdk16/legal/jdk.crypto.cryptoki/pkcs16cryptotoken.md
-java/openjdk16/legal/jdk.crypto.cryptoki/pkcs16wrapper.md
+java/openjdk16/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+java/openjdk16/legal/jdk.crypto.cryptoki/pkcs11wrapper.md
java/openjdk16/legal/jdk.crypto.ec/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.crypto.ec/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.crypto.ec/LICENSE
-java/openjdk16/legal/jdk.crypto.ec/ecc.md
java/openjdk16/legal/jdk.dynalink/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.dynalink/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.dynalink/LICENSE
@@ -422,6 +424,12 @@ java/openjdk16/legal/jdk.editpad/LICENSE
java/openjdk16/legal/jdk.httpserver/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.httpserver/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.httpserver/LICENSE
+java/openjdk16/legal/jdk.incubator.foreign/ADDITIONAL_LICENSE_INFO
+java/openjdk16/legal/jdk.incubator.foreign/ASSEMBLY_EXCEPTION
+java/openjdk16/legal/jdk.incubator.foreign/LICENSE
+java/openjdk16/legal/jdk.incubator.vector/ADDITIONAL_LICENSE_INFO
+java/openjdk16/legal/jdk.incubator.vector/ASSEMBLY_EXCEPTION
+java/openjdk16/legal/jdk.incubator.vector/LICENSE
java/openjdk16/legal/jdk.internal.ed/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.internal.ed/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.internal.ed/LICENSE
@@ -436,15 +444,6 @@ java/openjdk16/legal/jdk.internal.opt/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.internal.opt/LICENSE
java/openjdk16/legal/jdk.internal.opt/jopt-simple.md
-${PLIST.jvmci}java/openjdk16/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
-${PLIST.jvmci}java/openjdk16/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-${PLIST.jvmci}java/openjdk16/legal/jdk.internal.vm.ci/LICENSE
-${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
-${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler.management/LICENSE
-${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-${PLIST.internal_vm_compiler}java/openjdk16/legal/jdk.internal.vm.compiler/LICENSE
java/openjdk16/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.jartool/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.jartool/LICENSE
@@ -453,8 +452,6 @@ java/openjdk16/legal/jdk.javadoc/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.javadoc/LICENSE
java/openjdk16/legal/jdk.javadoc/jquery.md
java/openjdk16/legal/jdk.javadoc/jqueryUI.md
-java/openjdk16/legal/jdk.javadoc/jszip.md
-java/openjdk16/legal/jdk.javadoc/pako.md
java/openjdk16/legal/jdk.jcmd/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.jcmd/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.jcmd/LICENSE
@@ -502,29 +499,15 @@ java/openjdk16/legal/jdk.management/LICENSE
java/openjdk16/legal/jdk.naming.dns/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.naming.dns/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.naming.dns/LICENSE
-java/openjdk16/legal/jdk.naming.ldap/ADDITIONAL_LICENSE_INFO
-java/openjdk16/legal/jdk.naming.ldap/ASSEMBLY_EXCEPTION
-java/openjdk16/legal/jdk.naming.ldap/LICENSE
java/openjdk16/legal/jdk.naming.rmi/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.naming.rmi/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.naming.rmi/LICENSE
java/openjdk16/legal/jdk.net/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.net/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.net/LICENSE
-java/openjdk16/legal/jdk.pack/ADDITIONAL_LICENSE_INFO
-java/openjdk16/legal/jdk.pack/ASSEMBLY_EXCEPTION
-java/openjdk16/legal/jdk.pack/LICENSE
-java/openjdk16/legal/jdk.rmic/ADDITIONAL_LICENSE_INFO
-java/openjdk16/legal/jdk.rmic/ASSEMBLY_EXCEPTION
-java/openjdk16/legal/jdk.rmic/LICENSE
-java/openjdk16/legal/jdk.scripting.nashorn.shell/ADDITIONAL_LICENSE_INFO
-java/openjdk16/legal/jdk.scripting.nashorn.shell/ASSEMBLY_EXCEPTION
-java/openjdk16/legal/jdk.scripting.nashorn.shell/LICENSE
-java/openjdk16/legal/jdk.scripting.nashorn/ADDITIONAL_LICENSE_INFO
-java/openjdk16/legal/jdk.scripting.nashorn/ASSEMBLY_EXCEPTION
-java/openjdk16/legal/jdk.scripting.nashorn/LICENSE
-java/openjdk16/legal/jdk.scripting.nashorn/double-conversion.md
-java/openjdk16/legal/jdk.scripting.nashorn/joni.md
+java/openjdk16/legal/jdk.nio.mapmode/ADDITIONAL_LICENSE_INFO
+java/openjdk16/legal/jdk.nio.mapmode/ASSEMBLY_EXCEPTION
+java/openjdk16/legal/jdk.nio.mapmode/LICENSE
java/openjdk16/legal/jdk.sctp/ADDITIONAL_LICENSE_INFO
java/openjdk16/legal/jdk.sctp/ASSEMBLY_EXCEPTION
java/openjdk16/legal/jdk.sctp/LICENSE
@@ -552,8 +535,6 @@ java/openjdk16/lib/fontconfig.bfc
java/openjdk16/lib/fontconfig.properties.src
java/openjdk16/lib/jfr/default.jfc
java/openjdk16/lib/jfr/profile.jfc
-java/openjdk16/lib/jli/libjli.diz
-java/openjdk16/lib/jli/libjli.so
java/openjdk16/lib/jrt-fs.jar
java/openjdk16/lib/jspawnhelper
java/openjdk16/lib/jspawnhelper.diz
@@ -564,8 +545,6 @@ java/openjdk16/lib/libawt.diz
java/openjdk16/lib/libawt.so
java/openjdk16/lib/libawt_headless.diz
java/openjdk16/lib/libawt_headless.so
-${PLIST.x16}java/openjdk16/lib/libawt_xawt${DBGEXT}
-${PLIST.x16}java/openjdk16/lib/libawt_xawt.so
java/openjdk16/lib/libdt_socket.diz
java/openjdk16/lib/libdt_socket.so
java/openjdk16/lib/libextnet.diz
@@ -580,8 +559,8 @@ java/openjdk16/lib/libj2gss.diz
java/openjdk16/lib/libj2gss.so
java/openjdk16/lib/libj2pcsc.diz
java/openjdk16/lib/libj2pcsc.so
-java/openjdk16/lib/libj2pkcs16.diz
-java/openjdk16/lib/libj2pkcs16.so
+java/openjdk16/lib/libj2pkcs11.diz
+java/openjdk16/lib/libj2pkcs11.so
java/openjdk16/lib/libjaas.diz
java/openjdk16/lib/libjaas.so
java/openjdk16/lib/libjava.diz
@@ -594,6 +573,8 @@ java/openjdk16/lib/libjdwp.diz
java/openjdk16/lib/libjdwp.so
java/openjdk16/lib/libjimage.diz
java/openjdk16/lib/libjimage.so
+java/openjdk16/lib/libjli.diz
+java/openjdk16/lib/libjli.so
java/openjdk16/lib/libjsig.diz
java/openjdk16/lib/libjsig.so
java/openjdk16/lib/libjsound.diz
@@ -616,12 +597,6 @@ java/openjdk16/lib/libprefs.diz
java/openjdk16/lib/libprefs.so
java/openjdk16/lib/librmi.diz
java/openjdk16/lib/librmi.so
-${PLIST.x16}java/openjdk16/lib/libsplashscreen${DBGEXT}
-${PLIST.x16}java/openjdk16/lib/libsplashscreen.so
-java/openjdk16/lib/libsunec.diz
-java/openjdk16/lib/libsunec.so
-java/openjdk16/lib/libunpack.diz
-java/openjdk16/lib/libunpack.so
java/openjdk16/lib/libverify.diz
java/openjdk16/lib/libverify.so
java/openjdk16/lib/libzip.diz
@@ -633,12 +608,12 @@ java/openjdk16/lib/security/blacklisted.certs
java/openjdk16/lib/security/cacerts
java/openjdk16/lib/security/default.policy
java/openjdk16/lib/security/public_suffix_list.dat
-java/openjdk16/lib/server/Xusage.txt
java/openjdk16/lib/server/libjsig.so
java/openjdk16/lib/server/libjvm.diz
java/openjdk16/lib/server/libjvm.so
java/openjdk16/lib/src.zip
java/openjdk16/lib/tzdb.dat
+java/openjdk16/man/man1/jaotc.1
java/openjdk16/man/man1/jar.1
java/openjdk16/man/man1/jarsigner.1
java/openjdk16/man/man1/java.1
@@ -648,20 +623,21 @@ java/openjdk16/man/man1/javap.1
java/openjdk16/man/man1/jcmd.1
java/openjdk16/man/man1/jconsole.1
java/openjdk16/man/man1/jdb.1
+java/openjdk16/man/man1/jdeprscan.1
java/openjdk16/man/man1/jdeps.1
+java/openjdk16/man/man1/jfr.1
java/openjdk16/man/man1/jinfo.1
-java/openjdk16/man/man1/jjs.1
+java/openjdk16/man/man1/jlink.1
java/openjdk16/man/man1/jmap.1
+java/openjdk16/man/man1/jmod.1
java/openjdk16/man/man1/jps.1
java/openjdk16/man/man1/jrunscript.1
+java/openjdk16/man/man1/jshell.1
java/openjdk16/man/man1/jstack.1
java/openjdk16/man/man1/jstat.1
java/openjdk16/man/man1/jstatd.1
java/openjdk16/man/man1/keytool.1
-java/openjdk16/man/man1/pack200.1
-java/openjdk16/man/man1/rmic.1
java/openjdk16/man/man1/rmid.1
java/openjdk16/man/man1/rmiregistry.1
java/openjdk16/man/man1/serialver.1
-java/openjdk16/man/man1/unpack200.1
java/openjdk16/release
Home |
Main Index |
Thread Index |
Old Index