CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 27 19:35:55 UTC 2025

Modified Files:
        pkgsrc/comms/java-rxtx: Makefile
        pkgsrc/databases/elasticsearch: Makefile
        pkgsrc/databases/java-qdbm: Makefile
        pkgsrc/devel/netbeans-ide: Makefile
        pkgsrc/devel/snappy-java10: Makefile
        pkgsrc/lang/abcl: Makefile
        pkgsrc/lang/swi-prolog-jpl: Makefile
        pkgsrc/mk: java-vm.mk
        pkgsrc/sysutils/tsm8: Makefile
Removed Files:
        pkgsrc/sysutils/tsm8: options.mk

Log Message:
*: clean up after oracle-j{dk,re}8 removal


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/comms/java-rxtx/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/databases/elasticsearch/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/java-qdbm/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/netbeans-ide/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/snappy-java10/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/abcl/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/swi-prolog-jpl/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/mk/java-vm.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/tsm8/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/tsm8/options.mk

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

Modified files:

Index: pkgsrc/comms/java-rxtx/Makefile
diff -u pkgsrc/comms/java-rxtx/Makefile:1.16 pkgsrc/comms/java-rxtx/Makefile:1.17
--- pkgsrc/comms/java-rxtx/Makefile:1.16        Wed Mar 26 14:17:31 2025
+++ pkgsrc/comms/java-rxtx/Makefile     Thu Mar 27 19:35:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2025/03/26 14:17:31 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2025/03/27 19:35:54 wiz Exp $
 
 DISTNAME=      rxtx-2.1-7r2
 PKGNAME=       java-rxtx-2.1.7r2
@@ -22,7 +22,7 @@ PKG_DESTDIR_SUPPORT=  user-destdir
 
 # Configuration looks for certain versions of JDK - this list can be expanded
 # if the patches are also appropriately updated.
-PKG_JVMS_ACCEPTED=     oracle-jdk8 openjdk8
+PKG_JVMS_ACCEPTED=     openjdk8
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/databases/elasticsearch/Makefile
diff -u pkgsrc/databases/elasticsearch/Makefile:1.55 pkgsrc/databases/elasticsearch/Makefile:1.56
--- pkgsrc/databases/elasticsearch/Makefile:1.55        Wed Mar 26 14:17:31 2025
+++ pkgsrc/databases/elasticsearch/Makefile     Thu Mar 27 19:35:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2025/03/26 14:17:31 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2025/03/27 19:35:54 wiz Exp $
 
 DISTNAME=      elasticsearch-6.8.8
 PKGREVISION=   1
@@ -13,7 +13,7 @@ COMMENT=      Distributed RESTful Search Engi
 LICENSE=       apache-2.0
 
 # Uses javah, which doesn't exist in JDK10+ anymore.
-PKG_JVMS_ACCEPTED=     openjdk8 oracle-jdk8
+PKG_JVMS_ACCEPTED=     openjdk8
 
 # Build our own native JNA, the version should match the one that ES ships with
 JNA=                   jna-4.5.1

Index: pkgsrc/databases/java-qdbm/Makefile
diff -u pkgsrc/databases/java-qdbm/Makefile:1.10 pkgsrc/databases/java-qdbm/Makefile:1.11
--- pkgsrc/databases/java-qdbm/Makefile:1.10    Wed Mar 26 14:17:31 2025
+++ pkgsrc/databases/java-qdbm/Makefile Thu Mar 27 19:35:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2025/03/26 14:17:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2025/03/27 19:35:54 wiz Exp $
 
 .include "../../databases/qdbm/Makefile.common"
 
@@ -14,7 +14,7 @@ MY_SUBDIR=    java
 BUILD_DIRS=    ${MY_SUBDIR:Q}
 CONFIGURE_DIRS=        ${MY_SUBDIR:Q}
 
-PKG_JVMS_ACCEPTED=     kaffe openjdk8 oracle-jdk8 openjdk11
+PKG_JVMS_ACCEPTED=     kaffe openjdk8 openjdk11
 
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_PTHREAD= no

Index: pkgsrc/devel/netbeans-ide/Makefile
diff -u pkgsrc/devel/netbeans-ide/Makefile:1.35 pkgsrc/devel/netbeans-ide/Makefile:1.36
--- pkgsrc/devel/netbeans-ide/Makefile:1.35     Wed Mar 26 14:17:31 2025
+++ pkgsrc/devel/netbeans-ide/Makefile  Thu Mar 27 19:35:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/03/26 14:17:31 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2025/03/27 19:35:54 wiz Exp $
 
 DISTNAME=      netbeans-8.2-201609300101
 PKGNAME=       netbeans-ide-8.2
@@ -13,7 +13,7 @@ COMMENT=      NetBeans Java IDE
 
 USE_TOOLS+=            pax
 USE_JAVA=              run
-PKG_JVMS_ACCEPTED=     oracle-jdk8 openjdk8
+PKG_JVMS_ACCEPTED=     openjdk8
 NO_BUILD=              yes
 WRKSRC=                        ${WRKDIR}/netbeans
 

Index: pkgsrc/devel/snappy-java10/Makefile
diff -u pkgsrc/devel/snappy-java10/Makefile:1.12 pkgsrc/devel/snappy-java10/Makefile:1.13
--- pkgsrc/devel/snappy-java10/Makefile:1.12    Wed Mar 26 14:17:31 2025
+++ pkgsrc/devel/snappy-java10/Makefile Thu Mar 27 19:35:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/03/26 14:17:31 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2025/03/27 19:35:54 wiz Exp $
 
 DISTNAME=      snappy-java-${SNAPVER}${SNAPJVER}
 CATEGORIES=    devel
@@ -36,7 +36,7 @@ MAVEN_FLAGS+= -Duser.home=${FAKEHOMEDIR}
 MAVEN_FLAGS+=  -Dmaven.repo.local=${WRKDIR}/deps
 MAVEN_FLAGS+=  --offline
 # Java 11 doesn't support Java 1.5 compatibility.
-.if ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
+.if ${PKG_JVM} == "openjdk8"
 MAVEN_FLAGS+=  -Dmaven.compiler.source=1.5
 MAVEN_FLAGS+=  -Dmaven.compiler.target=1.5
 .else

Index: pkgsrc/lang/abcl/Makefile
diff -u pkgsrc/lang/abcl/Makefile:1.20 pkgsrc/lang/abcl/Makefile:1.21
--- pkgsrc/lang/abcl/Makefile:1.20      Wed Mar 26 14:17:32 2025
+++ pkgsrc/lang/abcl/Makefile   Thu Mar 27 19:35:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2025/03/26 14:17:32 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2025/03/27 19:35:54 wiz Exp $
 
 DISTNAME=      abcl-src-1.9.2
 PKGNAME=       ${DISTNAME:C/-src//}
@@ -9,7 +9,7 @@ MAINTAINER=     asau%inbox.ru@localhost
 HOMEPAGE=      https://abcl.org/
 COMMENT=       Armed Bear Common Lisp
 
-PKG_JVMS_ACCEPTED=     openjdk17 openjdk11 openjdk8 oracle-jdk8 jdk16 jdk15 kaffe
+PKG_JVMS_ACCEPTED=     openjdk17 openjdk11 openjdk8 jdk16 jdk15 kaffe
 
 TOOL_DEPENDS=  apache-ant>=1.7.1:../../devel/apache-ant
 

Index: pkgsrc/lang/swi-prolog-jpl/Makefile
diff -u pkgsrc/lang/swi-prolog-jpl/Makefile:1.10 pkgsrc/lang/swi-prolog-jpl/Makefile:1.11
--- pkgsrc/lang/swi-prolog-jpl/Makefile:1.10    Wed Mar 26 14:17:32 2025
+++ pkgsrc/lang/swi-prolog-jpl/Makefile Thu Mar 27 19:35:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2025/03/26 14:17:32 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2025/03/27 19:35:55 wiz Exp $
 
 .include "../../lang/swi-prolog-lite/Makefile.common"
 
@@ -10,7 +10,7 @@ COMMENT=              JPL package for SWI Prolog
 USE_TOOLS+=            pkg-config
 
 # does not find JNI for java>=11
-PKG_JVMS_ACCEPTED=     kaffe openjdk8 oracle-jdk8
+PKG_JVMS_ACCEPTED=     kaffe openjdk8
 
 CMAKE_CONFIGURE_ARGS+=         -DSWIPL_PACKAGES_JAVA=ON
 CMAKE_CONFIGURE_ARGS+=         -DINSTALL_PACKAGES=OFF

Index: pkgsrc/mk/java-vm.mk
diff -u pkgsrc/mk/java-vm.mk:1.139 pkgsrc/mk/java-vm.mk:1.140
--- pkgsrc/mk/java-vm.mk:1.139  Wed Mar 26 14:17:32 2025
+++ pkgsrc/mk/java-vm.mk        Thu Mar 27 19:35:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.139 2025/03/26 14:17:32 wiz Exp $
+# $NetBSD: java-vm.mk,v 1.140 2025/03/27 19:35:55 wiz Exp $
 #
 # This Makefile fragment provides a Java VM, either at build-time or at
 # run-time, depending on the package's needs.
@@ -12,7 +12,6 @@
 #      The JVM that should be used if nothing particular is specified.
 #
 #      Possible values: kaffe openjdk8
-#              oracle-jdk8
 #              adoptopenjdk11-bin
 #              openjdk-bin openjdk11
 #              openjdk17 oracle-jdk17
@@ -86,7 +85,7 @@ _PKG_JVMS.11=         ${_PKG_JVMS.17} openjdk11
 .else
 _PKG_JVMS.11=          ${_PKG_JVMS.17} adoptopenjdk11-bin openjdk11
 .endif
-_PKG_JVMS.8=           ${_PKG_JVMS.11} openjdk8 oracle-jdk8
+_PKG_JVMS.8=           ${_PKG_JVMS.11} openjdk8
 _PKG_JVMS.7=           ${_PKG_JVMS.8}
 _PKG_JVMS.6=           ${_PKG_JVMS.7} jdk16
 _PKG_JVMS.1.5=         ${_PKG_JVMS.6} jdk15
@@ -130,8 +129,6 @@ _PKG_JVM_DEFAULT?=  openjdk17
         ${MACHINE_PLATFORM:MDarwin-*-aarch64} || \
         ${MACHINE_PLATFORM:MDarwin-*-x86_64}
 _PKG_JVM_DEFAULT?=     oracle-jdk17
-.  elif ${MACHINE_PLATFORM:MLinux-*-i[3456]86}
-_PKG_JVM_DEFAULT?=     oracle-jdk8
 .  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
 _PKG_JVM_DEFAULT?=     openjdk8
 .  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
@@ -149,15 +146,6 @@ _PKG_JVM_DEFAULT?= kaffe
 _ONLY_FOR_PLATFORMS.kaffe= \
        *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
        *-*-mipsel* *-*-sparc *-*-powerpc
-_ONLY_FOR_PLATFORMS.oracle-jdk8= \
-       Darwin-9.*-i386                 Darwin-[1-9][0-9].*-i386        \
-        Darwin-9.*-x86_64              Darwin-[1-9][0-9].*-x86_64      \
-       FreeBSD-6.*-i386 \
-       Linux-*-i[3-6]86 \
-       Linux-*-x86_64 \
-       NetBSD-[6-9].*-x86_64           NetBSD-1[0-9].*-x86_64          \
-       NetBSD-[6-9].*-i386             NetBSD-1[0-9].*-i386            \
-       SunOS-5.11-x86_64
 _ONLY_FOR_PLATFORMS.adoptopenjdk11-bin= \
        Linux-*-x86_64 \
        NetBSD-[6-9].*-x86_64           NetBSD-1[0-9].*-x86_64
@@ -207,7 +195,6 @@ _PKG_JVMS_ACCEPTED+=        ${PKG_JVMS_ACCEPTED
 
 _JAVA_PKGBASE.kaffe=           kaffe
 _JAVA_PKGBASE.openjdk8=                openjdk8
-_JAVA_PKGBASE.oracle-jdk8=     oracle-jre8
 _JAVA_PKGBASE.adoptopenjdk11-bin=      adoptopenjdk11-bin
 _JAVA_PKGBASE.openjdk-bin=     openjdk-bin
 _JAVA_PKGBASE.openjdk11=       openjdk11
@@ -218,7 +205,6 @@ _JAVA_PKGBASE.openjdk21=    openjdk21
 # The following is copied from the respective JVM Makefiles.
 _JAVA_NAME.kaffe=              kaffe
 _JAVA_NAME.openjdk8=           openjdk8
-_JAVA_NAME.oracle-jdk8=                oracle8
 _JAVA_NAME.adoptopenjdk11-bin=         adoptopenjdk11-bin
 _JAVA_NAME.openjdk-bin=                openjdk-bin
 _JAVA_NAME.openjdk11=          openjdk11
@@ -274,8 +260,6 @@ _PKG_JVM=           "none"
 
 BUILDLINK_API_DEPENDS.kaffe?=          kaffe>=1.1.4
 BUILDLINK_API_DEPENDS.openjdk8?=       openjdk8-[0-9]*
-BUILDLINK_API_DEPENDS.oracle-jdk8?=    oracle-jdk8-[0-9]*
-BUILDLINK_API_DEPENDS.oracle-jre8?=    oracle-jre8-[0-9]*
 BUILDLINK_API_DEPENDS.adoptopenjdk11-bin?=     adoptopenjdk11-bin-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk-bin?=    openjdk-bin-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk11?=      openjdk11-[0-9]*
@@ -285,7 +269,6 @@ BUILDLINK_API_DEPENDS.openjdk21?=   openjd
 
 _JRE.kaffe=            kaffe
 _JRE.openjdk8=         openjdk8
-_JRE.oracle-jdk8=      oracle-jre8
 _JRE.adoptopenjdk11-bin=       adoptopenjdk11-bin
 _JRE.openjdk-bin=      openjdk-bin
 _JRE.openjdk11=                openjdk11
@@ -303,11 +286,6 @@ _JAVA_HOME=                ${LOCALBASE}/java/kaffe
 _JDK_PKGSRCDIR=                ../../lang/openjdk8
 _JRE_PKGSRCDIR=                ${_JDK_PKGSRCDIR}
 _JAVA_HOME=            ${LOCALBASE}/java/openjdk8
-.elif ${_PKG_JVM} == "oracle-jdk8"
-_JDK_PKGSRCDIR=                ../../lang/oracle-jdk8
-_JRE_PKGSRCDIR=                ../../lang/oracle-jre8
-_JAVA_HOME=            ${LOCALBASE}/java/oracle-8
-UNLIMIT_RESOURCES+=    datasize virtualsize
 .elif ${_PKG_JVM} == "adoptopenjdk11-bin"
 _JDK_PKGSRCDIR=                ../../lang/adoptopenjdk11-bin
 _JRE_PKGSRCDIR=                ../../lang/adoptopenjdk11-bin

Index: pkgsrc/sysutils/tsm8/Makefile
diff -u pkgsrc/sysutils/tsm8/Makefile:1.15 pkgsrc/sysutils/tsm8/Makefile:1.16
--- pkgsrc/sysutils/tsm8/Makefile:1.15  Wed Sep 18 16:58:33 2024
+++ pkgsrc/sysutils/tsm8/Makefile       Thu Mar 27 19:35:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/09/18 16:58:33 hauke Exp $
+# $NetBSD: Makefile,v 1.16 2025/03/27 19:35:55 wiz Exp $
 
 DISTNAME=      tsm-${PKGVER}
 PKGVER=                8.1.23.0
@@ -81,8 +81,6 @@ MESSAGE_SUBST+=               EMULDIR=${EMULDIR}
 
 INSTALLATION_DIRS+=    bin emul/linux/etc/ld.so.conf.d ${DOC_DIR} ${EG_DIR}
 
-.include "options.mk"
-
 post-configure:
        ${CP} ${FILESDIR}/tsm_daily.sh ${WRKSRC}