CVS commit: pkgsrc/lang/openjdk11

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May  9 00:09:15 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk11: Makefile PLIST

Log Message:
openjdk11: fix PLIST handling for JVMCI


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/openjdk11/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.18 pkgsrc/lang/openjdk11/Makefile:1.19
--- pkgsrc/lang/openjdk11/Makefile:1.18 Mon May  4 21:21:11 2020
+++ pkgsrc/lang/openjdk11/Makefile      Sat May  9 00:09:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/05/04 21:21:11 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2020/05/09 00:09:15 tnn Exp $
 
 DISTNAME=      openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -115,14 +115,14 @@ SUBST_FILES.fontpaths=            make/data/fontco
 SUBST_FILES.fontpaths+=                src/java.desktop/unix/native/common/awt/fontpath.c
 SUBST_VARS.fontpaths=          PREFIX BUILDLINK_PREFIX.fontconfig
 
-PLIST_VARS+=                   aot
-PLIST_VARS+=                   internal_vm_compiler
+PLIST_VARS+=                   aot internal_vm_compiler jvmci
 .if ${MACHINE_ARCH} == "x86_64"
 PLIST.aot=                     yes
 PLIST.internal_vm_compiler=    yes
+PLIST.jvmci=                   yes
 .endif
 .if ${MACHINE_ARCH} == "aarch64"
-PLIST.internal_vm_compiler=    yes
+PLIST.jvmci=                   yes
 .endif
 
 .if ${OPSYS} == "NetBSD"

Index: pkgsrc/lang/openjdk11/PLIST
diff -u pkgsrc/lang/openjdk11/PLIST:1.3 pkgsrc/lang/openjdk11/PLIST:1.4
--- pkgsrc/lang/openjdk11/PLIST:1.3     Thu Apr 16 11:51:26 2020
+++ pkgsrc/lang/openjdk11/PLIST Sat May  9 00:09:15 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/04/16 11:51:26 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/09 00:09:15 tnn Exp $
 bin/openjdk11-jar
 bin/openjdk11-java
 bin/openjdk11-javac
@@ -224,7 +224,7 @@ java/openjdk11/jmods/jdk.internal.ed.jmo
 java/openjdk11/jmods/jdk.internal.jvmstat.jmod
 java/openjdk11/jmods/jdk.internal.le.jmod
 java/openjdk11/jmods/jdk.internal.opt.jmod
-${PLIST.internal_vm_compiler}java/openjdk11/jmods/jdk.internal.vm.ci.jmod
+${PLIST.jvmci}java/openjdk11/jmods/jdk.internal.vm.ci.jmod
 ${PLIST.internal_vm_compiler}java/openjdk11/jmods/jdk.internal.vm.compiler.jmod
 ${PLIST.internal_vm_compiler}java/openjdk11/jmods/jdk.internal.vm.compiler.management.jmod
 java/openjdk11/jmods/jdk.jartool.jmod
@@ -393,9 +393,9 @@ java/openjdk11/legal/jdk.internal.opt/AD
 java/openjdk11/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION
 java/openjdk11/legal/jdk.internal.opt/LICENSE
 java/openjdk11/legal/jdk.internal.opt/jopt-simple.md
-${PLIST.internal_vm_compiler}java/openjdk11/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
-${PLIST.internal_vm_compiler}java/openjdk11/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-${PLIST.internal_vm_compiler}java/openjdk11/legal/jdk.internal.vm.ci/LICENSE
+${PLIST.jvmci}java/openjdk11/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+${PLIST.jvmci}java/openjdk11/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+${PLIST.jvmci}java/openjdk11/legal/jdk.internal.vm.ci/LICENSE
 ${PLIST.internal_vm_compiler}java/openjdk11/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
 ${PLIST.internal_vm_compiler}java/openjdk11/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
 ${PLIST.internal_vm_compiler}java/openjdk11/legal/jdk.internal.vm.compiler.management/LICENSE