diff options
| author | wiz <wiz@pkgsrc.org> | 2019-05-02 08:36:09 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-05-02 08:36:09 +0000 |
| commit | 8c937669006e297b39d7155ec5d6f868d502378e (patch) | |
| tree | f3bd4d14ddb6108ee3fbf4a789318c1ee88b7125 /pkgtools | |
| parent | c228b12d44e6a41c60a60651556c4d3580e8514f (diff) | |
| download | pkgsrc-8c937669006e297b39d7155ec5d6f868d502378e.tar.gz | |
sun-jdk6, sun-jre6: remove
Last update in 2013, remove sun-jdk7/sun-jre7 instead
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/vardefs.go | 2 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/vardefs_test.go | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint4/files/makevars.map | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/pkgtools/pkglint/files/vardefs.go b/pkgtools/pkglint/files/vardefs.go index 735f6539cba..01dac789ecc 100644 --- a/pkgtools/pkglint/files/vardefs.go +++ b/pkgtools/pkglint/files/vardefs.go @@ -455,7 +455,7 @@ func (reg *VarTypeRegistry) Init(src *Pkgsrc) { 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). diff --git a/pkgtools/pkglint/files/vardefs_test.go b/pkgtools/pkglint/files/vardefs_test.go index 8a77d0b8fae..eea4e45ed21 100644 --- a/pkgtools/pkglint/files/vardefs_test.go +++ b/pkgtools/pkglint/files/vardefs_test.go @@ -25,7 +25,7 @@ func (s *Suite) Test_VarTypeRegistry_Init__enumFrom(c *check.C) { "", "_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_Init__enumFrom(c *check.C) { } 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)") diff --git a/pkgtools/pkglint4/files/makevars.map b/pkgtools/pkglint4/files/makevars.map index f4f8cd7dbb9..97461d681ae 100644 --- a/pkgtools/pkglint4/files/makevars.map +++ b/pkgtools/pkglint4/files/makevars.map @@ -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 |