Sun Apr 3 00:30:19 2022 UTC ()
openjdk11: Fix more NetBSD kqueue values

Bump PKGREVISION.


(ryoon)
diff -r1.40 -r1.41 pkgsrc/lang/openjdk11/Makefile
cvs diff -r1.40 -r1.41 pkgsrc/lang/openjdk11/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk11/Makefile 2022/03/01 13:51:44 1.40
+++ pkgsrc/lang/openjdk11/Makefile 2022/04/03 00:30:19 1.41
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.40 2022/03/01 13:51:44 ryoon Exp $ 1# $NetBSD: Makefile,v 1.41 2022/04/03 00:30:19 ryoon Exp $
2 2
3DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/} 3DISTNAME= jdk11u-${GITHUB_TAG:C/\+/-/}
4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/} 4PKGNAME= openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
7GITHUB_PROJECT= jdk11u 8GITHUB_PROJECT= jdk11u
8GITHUB_TAG= jdk-11.0.14+9-1 9GITHUB_TAG= jdk-11.0.14+9-1
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://openjdk.java.net/ 12HOMEPAGE= https://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 13COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15DISTFILES= ${DEFAULT_DISTFILES} 16DISTFILES= ${DEFAULT_DISTFILES}
16EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 17EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
17 18
@@ -116,33 +117,35 @@ SUBST_FILES.libpath+= make/autoconf/flag @@ -116,33 +117,35 @@ SUBST_FILES.libpath+= make/autoconf/flag
116SUBST_FILES.libpath+= make/autoconf/lib-bundled.m4 117SUBST_FILES.libpath+= make/autoconf/lib-bundled.m4
117SUBST_FILES.libpath+= make/autoconf/lib-freetype.m4 118SUBST_FILES.libpath+= make/autoconf/lib-freetype.m4
118SUBST_FILES.libpath+= make/autoconf/lib-x11.m4 119SUBST_FILES.libpath+= make/autoconf/lib-x11.m4
119SUBST_VARS.libpath= PREFIX COMPILER_RPATH_FLAG JAVA_NAME BUILDLINK_PREFIX.zlib X11BASE 120SUBST_VARS.libpath= PREFIX COMPILER_RPATH_FLAG JAVA_NAME BUILDLINK_PREFIX.zlib X11BASE
120 121
121SUBST_CLASSES+= fontpaths 122SUBST_CLASSES+= fontpaths
122SUBST_STAGE.fontpaths= pre-configure 123SUBST_STAGE.fontpaths= pre-configure
123SUBST_MESSAGE.fontpaths= fixing font paths 124SUBST_MESSAGE.fontpaths= fixing font paths
124SUBST_FILES.fontpaths= make/data/fontconfig/bsd.fontconfig.properties 125SUBST_FILES.fontpaths= make/data/fontconfig/bsd.fontconfig.properties
125SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c 126SUBST_FILES.fontpaths+= src/java.desktop/unix/native/common/awt/fontpath.c
126SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig 127SUBST_VARS.fontpaths= PREFIX BUILDLINK_PREFIX.fontconfig
127 128
128.if ${OPSYS} == "NetBSD" 129.if ${OPSYS} == "NetBSD"
129# NetBSD's EVFILT_* are different from FreeBSD/OpenBSD's values. 130# NetBSD's EVFILT_* EV_* are different from FreeBSD/OpenBSD's values.
130SUBST_CLASSES+= kqueue 131SUBST_CLASSES+= kqueue
131SUBST_STAGE.kqueue= pre-configure 132SUBST_STAGE.kqueue= pre-configure
132SUBST_MESSAGE.kqueue= fixing kqueue filter values 133SUBST_MESSAGE.kqueue= fixing kqueue filter values
133SUBST_FILES.kqueue= src/java.base/bsd/classes/sun/nio/ch/KQueue.java 134SUBST_FILES.kqueue= src/java.base/bsd/classes/sun/nio/ch/KQueue.java
134SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/' 135SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/'
135SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/' 136SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/'
 137SUBST_SED.kqueue+= -e 's/static final int EV_ONESHOT = 0x0010;/static final int EV_ONESHOT = 0x0004;/'
 138SUBST_SED.kqueue+= -e 's/static final int EV_CLEAR = 0x0020;/static final int EV_CLEAR = 0x0008;/'
136.endif 139.endif
137 140
138PLIST_VARS+= aot internal_vm_compiler jvmci 141PLIST_VARS+= aot internal_vm_compiler jvmci
139.if ${MACHINE_ARCH} == "x86_64" 142.if ${MACHINE_ARCH} == "x86_64"
140PLIST.aot= yes 143PLIST.aot= yes
141PLIST.internal_vm_compiler= yes 144PLIST.internal_vm_compiler= yes
142PLIST.jvmci= yes 145PLIST.jvmci= yes
143.endif 146.endif
144.if ${MACHINE_ARCH} == "aarch64" 147.if ${MACHINE_ARCH} == "aarch64"
145PLIST.jvmci= yes 148PLIST.jvmci= yes
146.endif 149.endif
147 150
148.if ${OPSYS} == "NetBSD" 151.if ${OPSYS} == "NetBSD"