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: Thu May 2 08:36:11 UTC 2019
Modified Files:
pkgsrc/comms/java-rxtx: Makefile
pkgsrc/devel/eclipse: Makefile
pkgsrc/doc: CHANGES-2019
pkgsrc/graphics/PanoTools: Makefile
pkgsrc/lang: Makefile
pkgsrc/meta-pkgs/bulk-medium: Makefile
pkgsrc/misc/libreoffice5-bin: options.mk
pkgsrc/misc/libreoffice6-bin: options.mk
pkgsrc/mk: java-vm.mk
pkgsrc/pkgtools/pkglint/files: vardefs.go vardefs_test.go
pkgsrc/pkgtools/pkglint4/files: makevars.map
pkgsrc/www/jalbum: Makefile
Removed Files:
pkgsrc/lang/sun-jdk6: DESCR Makefile PLIST.linux-i386
PLIST.linux-x86_64 PLIST.solaris-i386 PLIST.solaris-x86_64
buildlink3.mk builtin.mk distinfo
pkgsrc/lang/sun-jdk6/files: common
pkgsrc/lang/sun-jre6: DEINSTALL DESCR INSTALL MESSAGE.NetBSD Makefile
Makefile.common PLIST.linux-i386 PLIST.linux-x86_64
PLIST.solaris-i386 PLIST.solaris-x86_64 buildlink3.mk builtin.mk
distinfo sfiles-linux-i386.mk sfiles-linux-x86_64.mk
sfiles-solaris-i386.mk sfiles-solaris-x86_64.mk
pkgsrc/licenses: sun-jdk14-license sun-jdk6-license sun-jre14-license
sun-jre6-license
Log Message:
sun-jdk6, sun-jre6: remove
Last update in 2013, remove sun-jdk7/sun-jre7 instead
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/comms/java-rxtx/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/eclipse/Makefile
cvs rdiff -u -r1.1925 -r1.1926 pkgsrc/doc/CHANGES-2019
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/PanoTools/Makefile
cvs rdiff -u -r1.515 -r1.516 pkgsrc/lang/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/sun-jdk6/DESCR
cvs rdiff -u -r1.37 -r0 pkgsrc/lang/sun-jdk6/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/lang/sun-jdk6/PLIST.linux-i386 \
pkgsrc/lang/sun-jdk6/PLIST.linux-x86_64
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/sun-jdk6/PLIST.solaris-i386 \
pkgsrc/lang/sun-jdk6/PLIST.solaris-x86_64 pkgsrc/lang/sun-jdk6/builtin.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/lang/sun-jdk6/buildlink3.mk
cvs rdiff -u -r1.23 -r0 pkgsrc/lang/sun-jdk6/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/sun-jdk6/files/common
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/sun-jre6/DEINSTALL \
pkgsrc/lang/sun-jre6/builtin.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/sun-jre6/DESCR \
pkgsrc/lang/sun-jre6/MESSAGE.NetBSD \
pkgsrc/lang/sun-jre6/PLIST.solaris-x86_64
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/sun-jre6/INSTALL
cvs rdiff -u -r1.45 -r0 pkgsrc/lang/sun-jre6/Makefile
cvs rdiff -u -r1.23 -r0 pkgsrc/lang/sun-jre6/Makefile.common
cvs rdiff -u -r1.26 -r0 pkgsrc/lang/sun-jre6/PLIST.linux-i386 \
pkgsrc/lang/sun-jre6/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/lang/sun-jre6/PLIST.linux-x86_64
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/sun-jre6/PLIST.solaris-i386 \
pkgsrc/lang/sun-jre6/sfiles-linux-i386.mk \
pkgsrc/lang/sun-jre6/sfiles-linux-x86_64.mk \
pkgsrc/lang/sun-jre6/sfiles-solaris-i386.mk \
pkgsrc/lang/sun-jre6/sfiles-solaris-x86_64.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/lang/sun-jre6/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/licenses/sun-jdk14-license \
pkgsrc/licenses/sun-jdk6-license pkgsrc/licenses/sun-jre14-license \
pkgsrc/licenses/sun-jre6-license
cvs rdiff -u -r1.56 -r1.57 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/libreoffice5-bin/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/libreoffice6-bin/options.mk
cvs rdiff -u -r1.115 -r1.116 pkgsrc/mk/java-vm.mk
cvs rdiff -u -r1.62 -r1.63 pkgsrc/pkgtools/pkglint/files/vardefs.go
cvs rdiff -u -r1.13 -r1.14 pkgsrc/pkgtools/pkglint/files/vardefs_test.go
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/jalbum/Makefile
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.9 pkgsrc/comms/java-rxtx/Makefile:1.10
--- pkgsrc/comms/java-rxtx/Makefile:1.9 Tue Dec 29 04:54:37 2015
+++ pkgsrc/comms/java-rxtx/Makefile Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/12/29 04:54:37 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/02 08:36:10 wiz 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 sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8 openjdk7 sun-jdk7
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/devel/eclipse/Makefile
diff -u pkgsrc/devel/eclipse/Makefile:1.33 pkgsrc/devel/eclipse/Makefile:1.34
--- pkgsrc/devel/eclipse/Makefile:1.33 Sat Apr 27 11:18:56 2019
+++ pkgsrc/devel/eclipse/Makefile Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/04/27 11:18:56 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2019/05/02 08:36:10 wiz Exp $
DISTNAME= ${PKGNAME_NOREV}
PKGNAME= eclipse-${VERSION}
@@ -15,7 +15,7 @@ LICENSE= eclipse-license
DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant
USE_TOOLS+= unzip zip
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED= sun-jdk7
MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q}
MAKE_ENV+= ANT_HOME=${PREFIX:Q}
Index: pkgsrc/doc/CHANGES-2019
diff -u pkgsrc/doc/CHANGES-2019:1.1925 pkgsrc/doc/CHANGES-2019:1.1926
--- pkgsrc/doc/CHANGES-2019:1.1925 Thu May 2 08:24:08 2019
+++ pkgsrc/doc/CHANGES-2019 Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.1925 2019/05/02 08:24:08 wiz Exp $
+$NetBSD: CHANGES-2019,v 1.1926 2019/05/02 08:36:10 wiz Exp $
Changes to the packages collection and infrastructure in 2019:
@@ -3112,3 +3112,5 @@ Changes to the packages collection and i
Removed chat/tkicb [wiz 2019-05-02]
Removed multimedia/xanim [wiz 2019-05-02]
Removed lang/jini [wiz 2019-05-02]
+ Removed lang/sun-jdk6 [wiz 2019-05-02]
+ Removed lang/sun-jre6 [wiz 2019-05-02]
Index: pkgsrc/graphics/PanoTools/Makefile
diff -u pkgsrc/graphics/PanoTools/Makefile:1.25 pkgsrc/graphics/PanoTools/Makefile:1.26
--- pkgsrc/graphics/PanoTools/Makefile:1.25 Sun Feb 11 15:50:12 2018
+++ pkgsrc/graphics/PanoTools/Makefile Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/02/11 15:50:12 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/02 08:36:10 wiz Exp $
DISTNAME= PanoTools
PKGNAME= ${DISTNAME}-2.6b1
@@ -16,7 +16,7 @@ EMUL_MODULES.linux= base jpeg png tiff
WRKSRC= ${WRKDIR}/PTLinux
BUILD_DIRS= # empty
USE_JAVA= run
-PKG_JVMS_ACCEPTED= sun-jdk6
+PKG_JVMS_ACCEPTED= sun-jdk7
PLIST_SUBST+= JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
Index: pkgsrc/lang/Makefile
diff -u pkgsrc/lang/Makefile:1.515 pkgsrc/lang/Makefile:1.516
--- pkgsrc/lang/Makefile:1.515 Thu May 2 08:24:08 2019
+++ pkgsrc/lang/Makefile Thu May 2 08:36:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.515 2019/05/02 08:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.516 2019/05/02 08:36:09 wiz Exp $
#
COMMENT= Programming languages
@@ -271,9 +271,7 @@ SUBDIR+= squeak-vm
SUBDIR+= sr
SUBDIR+= sr-examples
SUBDIR+= stalin
-SUBDIR+= sun-jdk6
SUBDIR+= sun-jdk7
-SUBDIR+= sun-jre6
SUBDIR+= sun-jre7
SUBDIR+= swi-prolog
SUBDIR+= swi-prolog-jpl
Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.56 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.57
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.56 Tue Apr 30 03:46:43 2019
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile Thu May 2 08:36:10 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2019/04/30 03:46:43 taca Exp $
+# $NetBSD: Makefile,v 1.57 2019/05/02 08:36:10 wiz Exp $
-DISTNAME= bulk-medium-20190430
+DISTNAME= bulk-medium-20190502
CATEGORIES= meta-pkgs
MASTER_SITES= # empty
DISTFILES= # empty
@@ -84,8 +84,8 @@ BUILD_DEPENDS+= php>=7.1<7.2:../../lang/
BUILD_DEPENDS+= ruby24-base-[0-9]*:../../lang/ruby24-base
BUILD_DEPENDS+= ruby25-base-[0-9]*:../../lang/ruby25-base
BUILD_DEPENDS+= ruby26-base-[0-9]*:../../lang/ruby26-base
-BUILD_DEPENDS+= sun-jdk6-[0-9]*:../../lang/sun-jdk6
-BUILD_DEPENDS+= sun-jre6-[0-9]*:../../lang/sun-jre6
+BUILD_DEPENDS+= sun-jdk7-[0-9]*:../../lang/sun-jdk7
+BUILD_DEPENDS+= sun-jre7-[0-9]*:../../lang/sun-jre7
BUILD_DEPENDS+= openjdk7-[0-9]*:../../lang/openjdk7
BUILD_DEPENDS+= openjdk8-[0-9]*:../../lang/openjdk8
BUILD_DEPENDS+= python37-[0-9]*:../../lang/python37
Index: pkgsrc/misc/libreoffice5-bin/options.mk
diff -u pkgsrc/misc/libreoffice5-bin/options.mk:1.1 pkgsrc/misc/libreoffice5-bin/options.mk:1.2
--- pkgsrc/misc/libreoffice5-bin/options.mk:1.1 Fri Jan 8 23:53:13 2016
+++ pkgsrc/misc/libreoffice5-bin/options.mk Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/01/08 23:53:13 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2019/05/02 08:36:10 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice-bin
PKG_SUPPORTED_OPTIONS= java
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= java
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mjava)
-PKG_JVMS_ACCEPTED= jdk15 sun-jdk6
+PKG_JVMS_ACCEPTED= jdk15
USE_JAVA= run
.include "../../mk/java-vm.mk"
.endif
Index: pkgsrc/misc/libreoffice6-bin/options.mk
diff -u pkgsrc/misc/libreoffice6-bin/options.mk:1.1 pkgsrc/misc/libreoffice6-bin/options.mk:1.2
--- pkgsrc/misc/libreoffice6-bin/options.mk:1.1 Sat Mar 23 10:52:09 2019
+++ pkgsrc/misc/libreoffice6-bin/options.mk Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/03/23 10:52:09 tsutsui Exp $
+# $NetBSD: options.mk,v 1.2 2019/05/02 08:36:10 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice-bin
PKG_SUPPORTED_OPTIONS= java
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= java
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mjava)
-PKG_JVMS_ACCEPTED= jdk15 sun-jdk6
+PKG_JVMS_ACCEPTED= jdk15
USE_JAVA= run
.include "../../mk/java-vm.mk"
.endif
Index: pkgsrc/mk/java-vm.mk
diff -u pkgsrc/mk/java-vm.mk:1.115 pkgsrc/mk/java-vm.mk:1.116
--- pkgsrc/mk/java-vm.mk:1.115 Tue Mar 26 21:05:15 2019
+++ pkgsrc/mk/java-vm.mk Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.115 2019/03/26 21:05:15 ryoon Exp $
+# $NetBSD: java-vm.mk,v 1.116 2019/05/02 08:36:10 wiz Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -10,7 +10,7 @@
# The JVM that should be used if nothing particular is specified.
#
# Possible values: kaffe openjdk7 openjdk8
-# sun-jdk6 sun-jdk7 oracle-jdk8
+# sun-jdk7 oracle-jdk8
# openjdk-bin
# Default value: (platform-dependent)
#
@@ -75,7 +75,7 @@ PKG_JVMS_ACCEPTED?= ${_PKG_JVMS}
_PKG_JVMS.9= openjdk-bin
_PKG_JVMS.8= ${_PKG_JVMS.9} openjdk8 oracle-jdk8
_PKG_JVMS.7= ${_PKG_JVMS.8} openjdk7 sun-jdk7
-_PKG_JVMS.6= ${_PKG_JVMS.7} sun-jdk6 jdk16
+_PKG_JVMS.6= ${_PKG_JVMS.7} jdk16
_PKG_JVMS.1.5= ${_PKG_JVMS.6} jdk15
_PKG_JVMS.1.4= ${_PKG_JVMS.1.5}
_PKG_JVMS.yes= ${_PKG_JVMS.1.4} kaffe
@@ -104,14 +104,10 @@ _PKG_JVM_DEFAULT?= openjdk8
!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || \
!empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
_PKG_JVM_DEFAULT?= openjdk8
-. elif !empty(MACHINE_PLATFORM:MNetBSD-[1234].*-i386)
-_PKG_JVM_DEFAULT?= sun-jdk6
. elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
!empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
!empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64)
_PKG_JVM_DEFAULT?= oracle-jdk8
-. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
-_PKG_JVM_DEFAULT?= sun-jdk6
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
_PKG_JVM_DEFAULT?= openjdk7
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
@@ -129,20 +125,6 @@ _PKG_JVM_DEFAULT?= kaffe
_ONLY_FOR_PLATFORMS.kaffe= \
*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
*-*-mipsel* *-*-sparc *-*-powerpc
-# exclude *-*-x86_64 from kaffe list as it apparently doesn't work
-_ONLY_FOR_PLATFORMS.sun-jdk6= \
- Darwin-9.*-i386 Darwin-9.*-x86_64 \
- Darwin-10.*-i386 Darwin-10.*-x86_64 \
- Darwin-11.*-i386 Darwin-11.*-x86_64 \
- FreeBSD-6.*-i386 \
- Linux-*-i[3-6]86 \
- Linux-*-x86_64 \
- NetBSD-*-i386 NetBSD-*-x86_64 \
- SunOS-5.10-i386 \
- SunOS-5.10-sparc \
- SunOS-5.10-x86_64 \
- SunOS-5.11-i386 \
- SunOS-5.11-x86_64
_ONLY_FOR_PLATFORMS.openjdk7= \
DragonFly-*-* \
Linux-*-i[3-6]86 \
@@ -204,7 +186,6 @@ _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED
_JAVA_PKGBASE.kaffe= kaffe
_JAVA_PKGBASE.openjdk7= openjdk7
_JAVA_PKGBASE.openjdk8= openjdk8
-_JAVA_PKGBASE.sun-jdk6= sun-jre6
_JAVA_PKGBASE.sun-jdk7= sun-jre7
_JAVA_PKGBASE.oracle-jdk8= oracle-jre8
_JAVA_PKGBASE.openjdk-bin= openjdk-bin
@@ -213,7 +194,6 @@ _JAVA_PKGBASE.openjdk-bin= openjdk-bin
_JAVA_NAME.kaffe= kaffe
_JAVA_NAME.openjdk7= openjdk7
_JAVA_NAME.openjdk8= openjdk8
-_JAVA_NAME.sun-jdk6= sun6
_JAVA_NAME.sun-jdk7= sun7
_JAVA_NAME.oracle-jdk8= oracle8
_JAVA_NAME.openjdk-bin= openjdk-bin
@@ -267,8 +247,6 @@ _PKG_JVM= "none"
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-jdk6?= sun-jdk6-[0-9]*
-BUILDLINK_API_DEPENDS.sun-jre6?= sun-jre6-[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]*
@@ -278,7 +256,6 @@ BUILDLINK_API_DEPENDS.openjdk-bin?= open
_JRE.kaffe= kaffe
_JRE.openjdk7= openjdk7
_JRE.openjdk8= openjdk8
-_JRE.sun-jdk6= sun-jre6
_JRE.sun-jdk7= sun-jre7
_JRE.oracle-jdk8= oracle-jre8
_JRE.openjdk-bin= openjdk-bin
@@ -297,11 +274,6 @@ _JAVA_HOME= ${LOCALBASE}/java/openjdk7
_JDK_PKGSRCDIR= ../../lang/openjdk8
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME= ${LOCALBASE}/java/openjdk8
-.elif ${_PKG_JVM} == "sun-jdk6"
-_JDK_PKGSRCDIR= ../../lang/sun-jdk6
-_JRE_PKGSRCDIR= ../../lang/sun-jre6
-_JAVA_HOME= ${LOCALBASE}/java/sun-6
-UNLIMIT_RESOURCES+= datasize
.elif ${_PKG_JVM} == "sun-jdk7"
_JDK_PKGSRCDIR= ../../lang/sun-jdk7
_JRE_PKGSRCDIR= ../../lang/sun-jre7
Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.62 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.63
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.62 Sun Apr 28 18:13:53 2019
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go Thu May 2 08:36:10 2019
@@ -455,7 +455,7 @@ func (reg *VarTypeRegistry) Init(src *Pk
jvms := enumFrom(
"mk/java-vm.mk",
- "openjdk8 oracle-jdk8 openjdk7 sun-jdk7 sun-jdk6 jdk16 jdk15 kaffe",
+ "openjdk8 oracle-jdk8 openjdk7 sun-jdk7 jdk16 jdk15 kaffe",
"_PKG_JVMS.*")
// Last synced with mk/defaults/mk.conf revision 1.300 (fe3d998769f).
Index: pkgsrc/pkgtools/pkglint/files/vardefs_test.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs_test.go:1.13 pkgsrc/pkgtools/pkglint/files/vardefs_test.go:1.14
--- pkgsrc/pkgtools/pkglint/files/vardefs_test.go:1.13 Sat Apr 20 17:43:25 2019
+++ pkgsrc/pkgtools/pkglint/files/vardefs_test.go Thu May 2 08:36:10 2019
@@ -25,7 +25,7 @@ func (s *Suite) Test_VarTypeRegistry_Ini
"",
"_PKG_JVMS.8= openjdk8 oracle-jdk8",
"_PKG_JVMS.7= ${_PKG_JVMS.8} openjdk7 sun-jdk7",
- "_PKG_JVMS.6= ${_PKG_JVMS.7} sun-jdk6 jdk16")
+ "_PKG_JVMS.6= ${_PKG_JVMS.7} jdk16")
t.CreateFileLines("mk/compiler.mk",
MkRcsID,
"",
@@ -53,7 +53,7 @@ func (s *Suite) Test_VarTypeRegistry_Ini
}
test("EMACS_VERSIONS_ACCEPTED", "enum: emacs29 emacs31 (list, package-settable)")
- test("PKG_JVM", "enum: jdk16 openjdk7 openjdk8 oracle-jdk8 sun-jdk6 sun-jdk7 (system-provided)")
+ test("PKG_JVM", "enum: jdk16 openjdk7 openjdk8 oracle-jdk8 sun-jdk7 (system-provided)")
test("USE_LANGUAGES", "enum: ada c c++ c++03 c++0x c++11 c++14 c99 "+
"fortran fortran77 gnu++03 gnu++0x gnu++11 gnu++14 java obj-c++ objc (list, package-settable)")
test("PKGSRC_COMPILER", "enum: ccache distcc f2c g95 gcc ido mipspro-ucode sunpro (list, user-settable)")
Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.9 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.10
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.9 Mon May 21 08:12:23 2018
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.9 2018/05/21 08:12:23 adam Exp $
+# $NetBSD: makevars.map,v 1.10 2019/05/02 08:36:10 wiz Exp $
#
# This file contains the guessed type of some variables, according to
@@ -594,21 +594,18 @@ PKG_JVM { \
blackdown-jdk13 \
jdk jdk14 \
kaffe \
- sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \
openjdk7 openjdk7-bin sun-jdk7 \
} [$system]
PKG_JVMS_ACCEPTED List of { \
blackdown-jdk13 \
jdk jdk14 \
kaffe \
- sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \
openjdk7 openjdk7-bin sun-jdk7 \
} [m:s,c:ds]
PKG_JVM_DEFAULT { \
blackdown-jdk13 \
jdk jdk14 \
kaffe \
- sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \
openjdk7 openjdk7-bin sun-jdk7 \
} [$user]
PKG_LEGACY_OPTIONS List of Option
Index: pkgsrc/www/jalbum/Makefile
diff -u pkgsrc/www/jalbum/Makefile:1.32 pkgsrc/www/jalbum/Makefile:1.33
--- pkgsrc/www/jalbum/Makefile:1.32 Sun Dec 9 21:05:36 2018
+++ pkgsrc/www/jalbum/Makefile Thu May 2 08:36:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/12/09 21:05:36 adam Exp $
+# $NetBSD: Makefile,v 1.33 2019/05/02 08:36:10 wiz Exp $
DISTNAME= Jalbum${VERSION}
PKGNAME= jalbum-${VERSION}
@@ -15,7 +15,7 @@ LICENSE= gnu-lgpl-v2
VERSION= 8.5.3
USE_JAVA2= 1.5
-PKG_JVMS_ACCEPTED= jdk15 sun-jdk6
+PKG_JVMS_ACCEPTED= sun-jdk7
WRKSRC= ${WRKDIR}/Jalbum
Home |
Main Index |
Thread Index |
Old Index