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: tnn
Date: Sun May 17 00:54:01 UTC 2020
Modified Files:
pkgsrc/comms/java-rxtx: Makefile
pkgsrc/databases/elasticsearch: Makefile
pkgsrc/devel/apache-ivy: Makefile
pkgsrc/doc/guide/files: components.xml
pkgsrc/lang/abcl: Makefile
pkgsrc/mk: java-vm.mk
Log Message:
g/c references to openjdk7
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/comms/java-rxtx/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/databases/elasticsearch/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/apache-ivy/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/doc/guide/files/components.xml
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/abcl/Makefile
cvs rdiff -u -r1.119 -r1.120 pkgsrc/mk/java-vm.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.11 pkgsrc/comms/java-rxtx/Makefile:1.12
--- pkgsrc/comms/java-rxtx/Makefile:1.11 Sun Nov 3 12:04:13 2019
+++ pkgsrc/comms/java-rxtx/Makefile Sun May 17 00:54:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/11/03 12:04:13 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/17 00:54:00 tnn Exp $
#
DISTNAME= rxtx-2.1-7r2
@@ -23,7 +23,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 openjdk7 sun-jdk7
+PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8 sun-jdk7
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/databases/elasticsearch/Makefile
diff -u pkgsrc/databases/elasticsearch/Makefile:1.50 pkgsrc/databases/elasticsearch/Makefile:1.51
--- pkgsrc/databases/elasticsearch/Makefile:1.50 Tue Apr 21 16:06:19 2020
+++ pkgsrc/databases/elasticsearch/Makefile Sun May 17 00:54:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2020/04/21 16:06:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2020/05/17 00:54:00 tnn Exp $
DISTNAME= elasticsearch-6.8.8
CATEGORIES= databases textproc
@@ -10,7 +10,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 openjdk7 sun-jdk7
+PKG_JVMS_ACCEPTED= openjdk8 oracle-jdk8 sun-jdk7
# Build our own native JNA, the version should match the one that ES ships with
JNA= jna-4.5.1
Index: pkgsrc/devel/apache-ivy/Makefile
diff -u pkgsrc/devel/apache-ivy/Makefile:1.5 pkgsrc/devel/apache-ivy/Makefile:1.6
--- pkgsrc/devel/apache-ivy/Makefile:1.5 Sat Jan 18 23:30:22 2020
+++ pkgsrc/devel/apache-ivy/Makefile Sun May 17 00:54:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/01/18 23:30:22 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/17 00:54:00 tnn Exp $
#
DISTNAME= apache-ivy-2.4.0-bin
@@ -14,7 +14,7 @@ LICENSE= apache-2.0
.include "../../mk/java-vm.mk"
-.if ${PKG_JVM} == "openjdk7" || ${PKG_JVM} == "sun-jdk7"
+.if ${PKG_JVM} == "sun-jdk7"
DEPENDS+= apache-ant>=1.9<1.10:../../devel/apache-ant19
.else
DEPENDS+= apache-ant>=1.10:../../devel/apache-ant
Index: pkgsrc/doc/guide/files/components.xml
diff -u pkgsrc/doc/guide/files/components.xml:1.58 pkgsrc/doc/guide/files/components.xml:1.59
--- pkgsrc/doc/guide/files/components.xml:1.58 Sun Feb 9 19:06:12 2020
+++ pkgsrc/doc/guide/files/components.xml Sun May 17 00:54:00 2020
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.58 2020/02/09 19:06:12 rillig Exp $ -->
+<!-- $NetBSD: components.xml,v 1.59 2020/05/17 00:54:00 tnn Exp $ -->
<chapter id="components"> <?dbhtml filename="components.html"?>
<title>Package components - files, directories and contents</title>
@@ -214,7 +214,7 @@ converters games mbone
<para>Some packages have different sets of distfiles depending on
the platform, for example <filename
- role="pkg">lang/openjdk7</filename>. These are kept in the same
+ role="pkg">lang/openjdk8</filename>. These are kept in the same
<filename>distinfo</filename> file and care should be taken when
upgrading such a package to ensure distfile information is not
lost.</para>
Index: pkgsrc/lang/abcl/Makefile
diff -u pkgsrc/lang/abcl/Makefile:1.15 pkgsrc/lang/abcl/Makefile:1.16
--- pkgsrc/lang/abcl/Makefile:1.15 Sun Apr 12 19:39:11 2020
+++ pkgsrc/lang/abcl/Makefile Sun May 17 00:54:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/04/12 19:39:11 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/17 00:54:00 tnn Exp $
DISTNAME= abcl-src-1.5.0
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= openjdk8 oracle-jdk8 openjdk7 sun-jdk7 jdk16 jdk15 kaffe
+PKG_JVMS_ACCEPTED= openjdk8 oracle-jdk8 sun-jdk7 jdk16 jdk15 kaffe
BUILD_DEPENDS= apache-ant>=1.7.1:../../devel/apache-ant
Index: pkgsrc/mk/java-vm.mk
diff -u pkgsrc/mk/java-vm.mk:1.119 pkgsrc/mk/java-vm.mk:1.120
--- pkgsrc/mk/java-vm.mk:1.119 Tue Mar 24 20:41:58 2020
+++ pkgsrc/mk/java-vm.mk Sun May 17 00:54:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.119 2020/03/24 20:41:58 joerg Exp $
+# $NetBSD: java-vm.mk,v 1.120 2020/05/17 00:54:00 tnn Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -9,7 +9,7 @@
# PKG_JVM_DEFAULT
# The JVM that should be used if nothing particular is specified.
#
-# Possible values: kaffe openjdk7 openjdk8
+# Possible values: kaffe openjdk8
# sun-jdk7 oracle-jdk8
# adoptopenjdk11-bin
# openjdk-bin openjdk11
@@ -75,7 +75,7 @@ PKG_JVMS_ACCEPTED?= ${_PKG_JVMS}
#
_PKG_JVMS.9= adoptopenjdk11-bin openjdk-bin openjdk11
_PKG_JVMS.8= ${_PKG_JVMS.9} openjdk8 oracle-jdk8
-_PKG_JVMS.7= ${_PKG_JVMS.8} openjdk7 sun-jdk7
+_PKG_JVMS.7= ${_PKG_JVMS.8} sun-jdk7
_PKG_JVMS.6= ${_PKG_JVMS.7} jdk16
_PKG_JVMS.1.5= ${_PKG_JVMS.6} jdk15
_PKG_JVMS.1.4= ${_PKG_JVMS.1.5}
@@ -113,7 +113,7 @@ _PKG_JVM_DEFAULT?= openjdk8
!empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64)
_PKG_JVM_DEFAULT?= oracle-jdk8
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
-_PKG_JVM_DEFAULT?= openjdk7
+_PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
_PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
@@ -129,17 +129,6 @@ _PKG_JVM_DEFAULT?= kaffe
_ONLY_FOR_PLATFORMS.kaffe= \
*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
*-*-mipsel* *-*-sparc *-*-powerpc
-_ONLY_FOR_PLATFORMS.openjdk7= \
- DragonFly-*-* \
- Linux-*-i[3-6]86 \
- Linux-*-x86_64 \
- NetBSD-*-aarch64 \
- NetBSD-[5-9]*-i386 \
- NetBSD-[5-9]*-x86_64 \
- NetBSD-[7-9]*-sparc64 \
- NetBSD-[7-9]*-earmv[67]hf \
- SunOS-*-i386 \
- SunOS-*-x86_64
_ONLY_FOR_PLATFORMS.openjdk8= \
DragonFly-*-* \
Linux-*-i[3-6]86 \
@@ -194,7 +183,6 @@ _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED
.endfor
_JAVA_PKGBASE.kaffe= kaffe
-_JAVA_PKGBASE.openjdk7= openjdk7
_JAVA_PKGBASE.openjdk8= openjdk8
_JAVA_PKGBASE.sun-jdk7= sun-jre7
_JAVA_PKGBASE.oracle-jdk8= oracle-jre8
@@ -204,7 +192,6 @@ _JAVA_PKGBASE.openjdk11= openjdk11
# The following is copied from the respective JVM Makefiles.
_JAVA_NAME.kaffe= kaffe
-_JAVA_NAME.openjdk7= openjdk7
_JAVA_NAME.openjdk8= openjdk8
_JAVA_NAME.sun-jdk7= sun7
_JAVA_NAME.oracle-jdk8= oracle8
@@ -259,7 +246,6 @@ _PKG_JVM= "none"
.endif
BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4
-BUILDLINK_API_DEPENDS.openjdk7?= openjdk7-[0-9]*
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]*
@@ -270,7 +256,6 @@ BUILDLINK_API_DEPENDS.openjdk-bin?= open
BUILDLINK_API_DEPENDS.openjdk11?= openjdk11-[0-9]*
_JRE.kaffe= kaffe
-_JRE.openjdk7= openjdk7
_JRE.openjdk8= openjdk8
_JRE.sun-jdk7= sun-jre7
_JRE.oracle-jdk8= oracle-jre8
@@ -284,10 +269,6 @@ _JAVA_BASE_CLASSES= classes.zip
_JDK_PKGSRCDIR= ../../lang/kaffe
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME= ${LOCALBASE}/java/kaffe
-.elif ${_PKG_JVM} == "openjdk7"
-_JDK_PKGSRCDIR= ../../lang/openjdk7
-_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
-_JAVA_HOME= ${LOCALBASE}/java/openjdk7
.elif ${_PKG_JVM} == "openjdk8"
_JDK_PKGSRCDIR= ../../lang/openjdk8
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
Home |
Main Index |
Thread Index |
Old Index