pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Wed Mar 26 14:17:32 UTC 2025
Modified Files:
pkgsrc/comms/java-rxtx: Makefile
pkgsrc/databases/elasticsearch: Makefile
pkgsrc/databases/java-qdbm: Makefile
pkgsrc/devel/apache-ivy: Makefile
pkgsrc/devel/netbeans-ide: Makefile
pkgsrc/devel/snappy-java10: Makefile
pkgsrc/editors/jde: Makefile
pkgsrc/lang/abcl: Makefile
pkgsrc/lang/openjdk8: bootstrap.mk
pkgsrc/lang/swi-prolog-jpl: Makefile
pkgsrc/mk: java-vm.mk
pkgsrc/pkgtools/pkglint4/files: makevars.map
pkgsrc/sysutils/tsm8: options.mk
Log Message:
i*: clean up after sun-j*7 removal
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/comms/java-rxtx/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/databases/elasticsearch/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/java-qdbm/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/apache-ivy/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/netbeans-ide/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/snappy-java10/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/jde/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/abcl/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/openjdk8/bootstrap.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/swi-prolog-jpl/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/mk/java-vm.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.1 -r1.2 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.15 pkgsrc/comms/java-rxtx/Makefile:1.16
--- pkgsrc/comms/java-rxtx/Makefile:1.15 Mon May 20 13:03:48 2024
+++ pkgsrc/comms/java-rxtx/Makefile Wed Mar 26 14:17:31 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/05/20 13:03:48 gdt Exp $
-#
+# $NetBSD: Makefile,v 1.16 2025/03/26 14:17:31 wiz Exp $
DISTNAME= rxtx-2.1-7r2
PKGNAME= java-rxtx-2.1.7r2
@@ -23,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 sun-jdk7
+PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/databases/elasticsearch/Makefile
diff -u pkgsrc/databases/elasticsearch/Makefile:1.54 pkgsrc/databases/elasticsearch/Makefile:1.55
--- pkgsrc/databases/elasticsearch/Makefile:1.54 Fri Aug 30 07:30:21 2024
+++ pkgsrc/databases/elasticsearch/Makefile Wed Mar 26 14:17:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2024/08/30 07:30:21 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2025/03/26 14:17:31 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 sun-jdk7
+PKG_JVMS_ACCEPTED= openjdk8 oracle-jdk8
# 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.9 pkgsrc/databases/java-qdbm/Makefile:1.10
--- pkgsrc/databases/java-qdbm/Makefile:1.9 Thu Dec 15 07:12:55 2022
+++ pkgsrc/databases/java-qdbm/Makefile Wed Mar 26 14:17:31 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/12/15 07:12:55 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2025/03/26 14:17:31 wiz Exp $
.include "../../databases/qdbm/Makefile.common"
@@ -15,7 +14,7 @@ MY_SUBDIR= java
BUILD_DIRS= ${MY_SUBDIR:Q}
CONFIGURE_DIRS= ${MY_SUBDIR:Q}
-PKG_JVMS_ACCEPTED= kaffe openjdk8 sun-jdk7 oracle-jdk8 openjdk11
+PKG_JVMS_ACCEPTED= kaffe openjdk8 oracle-jdk8 openjdk11
GNU_CONFIGURE= yes
GNU_CONFIGURE_PTHREAD= no
Index: pkgsrc/devel/apache-ivy/Makefile
diff -u pkgsrc/devel/apache-ivy/Makefile:1.8 pkgsrc/devel/apache-ivy/Makefile:1.9
--- pkgsrc/devel/apache-ivy/Makefile:1.8 Fri Oct 4 19:07:58 2024
+++ pkgsrc/devel/apache-ivy/Makefile Wed Mar 26 14:17:31 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2024/10/04 19:07:58 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.9 2025/03/26 14:17:31 wiz Exp $
DISTNAME= apache-ivy-2.5.0-bin
PKGREVISION= 1
@@ -14,11 +13,7 @@ LICENSE= apache-2.0
.include "../../mk/java-vm.mk"
-.if ${PKG_JVM} == "sun-jdk7"
-DEPENDS+= apache-ant>=1.9<1.10:../../devel/apache-ant19
-.else
DEPENDS+= apache-ant>=1.10:../../devel/apache-ant
-.endif
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
Index: pkgsrc/devel/netbeans-ide/Makefile
diff -u pkgsrc/devel/netbeans-ide/Makefile:1.34 pkgsrc/devel/netbeans-ide/Makefile:1.35
--- pkgsrc/devel/netbeans-ide/Makefile:1.34 Mon Aug 14 05:24:13 2023
+++ pkgsrc/devel/netbeans-ide/Makefile Wed Mar 26 14:17:31 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/08/14 05:24:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.35 2025/03/26 14:17:31 wiz Exp $
DISTNAME= netbeans-8.2-201609300101
PKGNAME= netbeans-ide-8.2
@@ -14,7 +13,7 @@ COMMENT= NetBeans Java IDE
USE_TOOLS+= pax
USE_JAVA= run
-PKG_JVMS_ACCEPTED= sun-jdk7 oracle-jdk8 openjdk8
+PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8
NO_BUILD= yes
WRKSRC= ${WRKDIR}/netbeans
Index: pkgsrc/devel/snappy-java10/Makefile
diff -u pkgsrc/devel/snappy-java10/Makefile:1.11 pkgsrc/devel/snappy-java10/Makefile:1.12
--- pkgsrc/devel/snappy-java10/Makefile:1.11 Mon Jun 27 06:31:38 2022
+++ pkgsrc/devel/snappy-java10/Makefile Wed Mar 26 14:17:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/06/27 06:31:38 nia Exp $
+# $NetBSD: Makefile,v 1.12 2025/03/26 14:17:31 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} == "sun-jdk7" || ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
+.if ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
MAVEN_FLAGS+= -Dmaven.compiler.source=1.5
MAVEN_FLAGS+= -Dmaven.compiler.target=1.5
.else
Index: pkgsrc/editors/jde/Makefile
diff -u pkgsrc/editors/jde/Makefile:1.31 pkgsrc/editors/jde/Makefile:1.32
--- pkgsrc/editors/jde/Makefile:1.31 Sat May 14 22:25:36 2022
+++ pkgsrc/editors/jde/Makefile Wed Mar 26 14:17:31 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2022/05/14 22:25:36 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.32 2025/03/26 14:17:31 wiz Exp $
DISTNAME= jde-2.3.2
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -27,8 +26,6 @@ EMACS_VERSIONS_ACCEPTED= emacs21 # XXX
.include "../../editors/emacs/modules.mk"
-PKG_DEFAULT_JVM= sun-jdk14
-
PKGSRC_MAKE_ENV+= EMACS=${EMACS}
MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
Index: pkgsrc/lang/abcl/Makefile
diff -u pkgsrc/lang/abcl/Makefile:1.19 pkgsrc/lang/abcl/Makefile:1.20
--- pkgsrc/lang/abcl/Makefile:1.19 Wed Apr 3 14:15:41 2024
+++ pkgsrc/lang/abcl/Makefile Wed Mar 26 14:17:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/04/03 14:15:41 ktnb Exp $
+# $NetBSD: Makefile,v 1.20 2025/03/26 14:17:32 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 sun-jdk7 jdk16 jdk15 kaffe
+PKG_JVMS_ACCEPTED= openjdk17 openjdk11 openjdk8 oracle-jdk8 jdk16 jdk15 kaffe
TOOL_DEPENDS= apache-ant>=1.7.1:../../devel/apache-ant
Index: pkgsrc/lang/openjdk8/bootstrap.mk
diff -u pkgsrc/lang/openjdk8/bootstrap.mk:1.15 pkgsrc/lang/openjdk8/bootstrap.mk:1.16
--- pkgsrc/lang/openjdk8/bootstrap.mk:1.15 Sun Sep 22 15:16:26 2019
+++ pkgsrc/lang/openjdk8/bootstrap.mk Wed Mar 26 14:17:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.15 2019/09/22 15:16:26 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.16 2025/03/26 14:17:32 wiz Exp $
#
# This file contains a map of available binary bootstrap toolchains
# and which kit to use for each supported platform.
@@ -84,15 +84,4 @@ EXTRACT_ONLY+= ${BOOT.fbsd10-amd64}
# TODO adoptopenjdk?
.endif
-.if ${OPSYS} == "SunOS"
-BUILDLINK_DEPMETHOD.sun-jdk7?= build
-.include "../../lang/sun-jdk7/buildlink3.mk"
-#NB: sun-jdk7 includes sun-jre7/buildlink3.mk
-post-extract: copy-bootstrap-jdk
-.PHONY: copy-bootstrap-jdk
-copy-bootstrap-jdk:
- ${MKDIR} ${ALT_BOOTDIR}
- cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR}
-.endif
-
ALT_BOOTDIR= ${WRKDIR}/bootstrap
Index: pkgsrc/lang/swi-prolog-jpl/Makefile
diff -u pkgsrc/lang/swi-prolog-jpl/Makefile:1.9 pkgsrc/lang/swi-prolog-jpl/Makefile:1.10
--- pkgsrc/lang/swi-prolog-jpl/Makefile:1.9 Sun Aug 25 06:18:57 2024
+++ pkgsrc/lang/swi-prolog-jpl/Makefile Wed Mar 26 14:17:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/03/26 14:17:32 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 sun-jdk7 oracle-jdk8
+PKG_JVMS_ACCEPTED= kaffe openjdk8 oracle-jdk8
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.138 pkgsrc/mk/java-vm.mk:1.139
--- pkgsrc/mk/java-vm.mk:1.138 Tue Mar 4 11:46:26 2025
+++ pkgsrc/mk/java-vm.mk Wed Mar 26 14:17:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.138 2025/03/04 11:46:26 abs Exp $
+# $NetBSD: java-vm.mk,v 1.139 2025/03/26 14:17:32 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,7 @@
# The JVM that should be used if nothing particular is specified.
#
# Possible values: kaffe openjdk8
-# sun-jdk7 oracle-jdk8
+# oracle-jdk8
# adoptopenjdk11-bin
# openjdk-bin openjdk11
# openjdk17 oracle-jdk17
@@ -87,7 +87,7 @@ _PKG_JVMS.11= ${_PKG_JVMS.17} openjdk11
_PKG_JVMS.11= ${_PKG_JVMS.17} adoptopenjdk11-bin openjdk11
.endif
_PKG_JVMS.8= ${_PKG_JVMS.11} openjdk8 oracle-jdk8
-_PKG_JVMS.7= ${_PKG_JVMS.8} sun-jdk7
+_PKG_JVMS.7= ${_PKG_JVMS.8}
_PKG_JVMS.6= ${_PKG_JVMS.7} jdk16
_PKG_JVMS.1.5= ${_PKG_JVMS.6} jdk15
_PKG_JVMS.1.4= ${_PKG_JVMS.1.5}
@@ -149,16 +149,6 @@ _PKG_JVM_DEFAULT?= kaffe
_ONLY_FOR_PLATFORMS.kaffe= \
*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
*-*-mipsel* *-*-sparc *-*-powerpc
-_ONLY_FOR_PLATFORMS.sun-jdk7= \
- 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-i386 \
- SunOS-5.11-x86_64
_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 \
@@ -217,7 +207,6 @@ _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED
_JAVA_PKGBASE.kaffe= kaffe
_JAVA_PKGBASE.openjdk8= openjdk8
-_JAVA_PKGBASE.sun-jdk7= sun-jre7
_JAVA_PKGBASE.oracle-jdk8= oracle-jre8
_JAVA_PKGBASE.adoptopenjdk11-bin= adoptopenjdk11-bin
_JAVA_PKGBASE.openjdk-bin= openjdk-bin
@@ -229,7 +218,6 @@ _JAVA_PKGBASE.openjdk21= openjdk21
# The following is copied from the respective JVM Makefiles.
_JAVA_NAME.kaffe= kaffe
_JAVA_NAME.openjdk8= openjdk8
-_JAVA_NAME.sun-jdk7= sun7
_JAVA_NAME.oracle-jdk8= oracle8
_JAVA_NAME.adoptopenjdk11-bin= adoptopenjdk11-bin
_JAVA_NAME.openjdk-bin= openjdk-bin
@@ -286,8 +274,6 @@ _PKG_JVM= "none"
BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4
BUILDLINK_API_DEPENDS.openjdk8?= openjdk8-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jdk7?= sun-jdk7-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jre7?= sun-jre7-[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]*
@@ -299,7 +285,6 @@ BUILDLINK_API_DEPENDS.openjdk21?= openjd
_JRE.kaffe= kaffe
_JRE.openjdk8= openjdk8
-_JRE.sun-jdk7= sun-jre7
_JRE.oracle-jdk8= oracle-jre8
_JRE.adoptopenjdk11-bin= adoptopenjdk11-bin
_JRE.openjdk-bin= openjdk-bin
@@ -318,11 +303,6 @@ _JAVA_HOME= ${LOCALBASE}/java/kaffe
_JDK_PKGSRCDIR= ../../lang/openjdk8
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME= ${LOCALBASE}/java/openjdk8
-.elif ${_PKG_JVM} == "sun-jdk7"
-_JDK_PKGSRCDIR= ../../lang/sun-jdk7
-_JRE_PKGSRCDIR= ../../lang/sun-jre7
-_JAVA_HOME= ${LOCALBASE}/java/sun-7
-UNLIMIT_RESOURCES+= datasize virtualsize
.elif ${_PKG_JVM} == "oracle-jdk8"
_JDK_PKGSRCDIR= ../../lang/oracle-jdk8
_JRE_PKGSRCDIR= ../../lang/oracle-jre8
Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.16 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.17
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.16 Sun Aug 25 06:19:09 2024
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Wed Mar 26 14:17:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.16 2024/08/25 06:19:09 wiz Exp $
+# $NetBSD: makevars.map,v 1.17 2025/03/26 14:17:32 wiz Exp $
#
# This file contains the guessed type of some variables, according to
@@ -591,22 +591,16 @@ PKG_HACKS List of Identifier [h:a]
PKG_INFO ShellCommand [$system]
PKG_JAVA_HOME Pathname [$system]
PKG_JVM { \
- blackdown-jdk13 \
- jdk jdk14 \
kaffe \
- openjdk7 openjdk7-bin sun-jdk7 \
+ openjdk7 openjdk7-bin \
} [$system]
PKG_JVMS_ACCEPTED List of { \
- blackdown-jdk13 \
- jdk jdk14 \
kaffe \
- openjdk7 openjdk7-bin sun-jdk7 \
+ openjdk7 openjdk7-bin \
} [m:s,c:ds]
PKG_JVM_DEFAULT { \
- blackdown-jdk13 \
- jdk jdk14 \
kaffe \
- openjdk7 openjdk7-bin sun-jdk7 \
+ openjdk7 openjdk7-bin \
} [$user]
PKG_LEGACY_OPTIONS List of Option
PKG_LIBTOOL Pathname [m:s]
Index: pkgsrc/sysutils/tsm8/options.mk
diff -u pkgsrc/sysutils/tsm8/options.mk:1.1 pkgsrc/sysutils/tsm8/options.mk:1.2
--- pkgsrc/sysutils/tsm8/options.mk:1.1 Wed Oct 17 13:54:39 2018
+++ pkgsrc/sysutils/tsm8/options.mk Wed Mar 26 14:17:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/10/17 13:54:39 hauke Exp $
+# $NetBSD: options.mk,v 1.2 2025/03/26 14:17:32 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.tsm
PKG_SUPPORTED_OPTIONS= java
@@ -14,7 +14,7 @@ USE_TOOLS+= bash:run
USE_JAVA= run
USE_JAVA2= yes
# We need a Linux jvm
-PKG_JVMS_ACCEPTED= sun-jdk7 oracle-jdk8
+PKG_JVMS_ACCEPTED= oracle-jdk8
PLIST.java= yes
PUBLIC_BINS+= dsmj
Home |
Main Index |
Thread Index |
Old Index