pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: update references to sun-jdk6 to sun-jdk7



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu May 2 10:36:19 2019 +0200
Changeset:	342d1df0710c09d275f184b8f3fe1f054d820e8c

Modified Files:
	aokell/Makefile
	apache-commons-beanutils/Makefile
	apache-commons-codec/Makefile
	apache-commons-configuration/Makefile
	apache-commons-dbcp/Makefile
	apache-commons-digester/Makefile
	apache-commons-lang/Makefile
	bsh/Makefile
	cartago/Makefile
	eclipse/Makefile
	feynedit/Makefile
	java-basicplayer/Makefile
	java-jlayer/Makefile
	java-mp3spi/Makefile
	java-tritonus-share/Makefile
	java-vorbisspi/Makefile
	jmol/Makefile
	jython/Makefile
	libgda4/options.mk
	lucene/Makefile
	py-fanova/Makefile
	sarf/Makefile
	simpa/Makefile

Log Message:
*: update references to sun-jdk6 to sun-jdk7

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=342d1df0710c09d275f184b8f3fe1f054d820e8c

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

diffstat:
 aokell/Makefile                       | 2 +-
 apache-commons-beanutils/Makefile     | 2 +-
 apache-commons-codec/Makefile         | 2 +-
 apache-commons-configuration/Makefile | 2 +-
 apache-commons-dbcp/Makefile          | 2 +-
 apache-commons-digester/Makefile      | 2 +-
 apache-commons-lang/Makefile          | 2 +-
 bsh/Makefile                          | 2 +-
 cartago/Makefile                      | 2 +-
 eclipse/Makefile                      | 2 +-
 feynedit/Makefile                     | 2 +-
 java-basicplayer/Makefile             | 2 +-
 java-jlayer/Makefile                  | 2 +-
 java-mp3spi/Makefile                  | 2 +-
 java-tritonus-share/Makefile          | 2 +-
 java-vorbisspi/Makefile               | 2 +-
 jmol/Makefile                         | 2 +-
 jython/Makefile                       | 2 +-
 libgda4/options.mk                    | 2 +-
 lucene/Makefile                       | 2 +-
 py-fanova/Makefile                    | 2 +-
 sarf/Makefile                         | 2 +-
 simpa/Makefile                        | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diffs:
diff --git a/aokell/Makefile b/aokell/Makefile
index 36a008db85..5f5b8453da 100644
--- a/aokell/Makefile
+++ b/aokell/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/AOKell-2.0
 NO_BUILD=	yes
 USE_TOOLS+=	pax
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 USE_JAVA2=		yes
 
 INSTALLATION_DIRS=	share/doc/aokell lib/java/aokell
diff --git a/apache-commons-beanutils/Makefile b/apache-commons-beanutils/Makefile
index d9186edf6b..59cb882177 100644
--- a/apache-commons-beanutils/Makefile
+++ b/apache-commons-beanutils/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-beanutils
 
diff --git a/apache-commons-codec/Makefile b/apache-commons-codec/Makefile
index 9e4e8ac409..b0fe677ed9 100644
--- a/apache-commons-codec/Makefile
+++ b/apache-commons-codec/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-codec
 
diff --git a/apache-commons-configuration/Makefile b/apache-commons-configuration/Makefile
index 0a482c0101..c61cac81d5 100644
--- a/apache-commons-configuration/Makefile
+++ b/apache-commons-configuration/Makefile
@@ -23,7 +23,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-configuration
 
diff --git a/apache-commons-dbcp/Makefile b/apache-commons-dbcp/Makefile
index 36bf24610c..8eae914ec4 100644
--- a/apache-commons-dbcp/Makefile
+++ b/apache-commons-dbcp/Makefile
@@ -22,7 +22,7 @@ USE_TOOLS+=	pax
 
 USE_JAVA=		yes
 USE_JAVA2=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-dbcp
 
diff --git a/apache-commons-digester/Makefile b/apache-commons-digester/Makefile
index c32b6c5b81..326f177855 100644
--- a/apache-commons-digester/Makefile
+++ b/apache-commons-digester/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/apache-commons-digester
 
diff --git a/apache-commons-lang/Makefile b/apache-commons-lang/Makefile
index a7e714f34a..3b5f7c9b8e 100644
--- a/apache-commons-lang/Makefile
+++ b/apache-commons-lang/Makefile
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java
 
diff --git a/bsh/Makefile b/bsh/Makefile
index e32da61b44..f01229c54c 100644
--- a/bsh/Makefile
+++ b/bsh/Makefile
@@ -13,7 +13,7 @@ LICENSE=	spl-1.0 AND gnu-lgpl-v2.1
 
 WRKSRC=		${WRKDIR}
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 USE_JAVA=		yes
 USE_LANGUAGES=		# none
 
diff --git a/cartago/Makefile b/cartago/Makefile
index cccfb7f7f8..2a2c3ed977 100644
--- a/cartago/Makefile
+++ b/cartago/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+=	pax
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java/cartago/lib share/doc/cartago
 
diff --git a/eclipse/Makefile b/eclipse/Makefile
index 6f7d18f195..94552715eb 100644
--- a/eclipse/Makefile
+++ b/eclipse/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.eclipse.org/
 COMMENT=	Java IDE
 LICENSE=	eclipse-license
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14 openjdk7-bin openjdk7
+PKG_JVMS_ACCEPTED=	sun-jdk7 openjdk7-bin openjdk7
 
 MAKE_ENV+=	JAVA_HOME=${PKG_JAVA_HOME}
 
diff --git a/feynedit/Makefile b/feynedit/Makefile
index 0964cb7982..04437a1ef5 100644
--- a/feynedit/Makefile
+++ b/feynedit/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v3
 
 USE_LANGUAGES=	# none
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	bin share/doc/feynedit
 
diff --git a/java-basicplayer/Makefile b/java-basicplayer/Makefile
index 1cb9b09ffc..81d7f95225 100644
--- a/java-basicplayer/Makefile
+++ b/java-basicplayer/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/java-basicplayer
 
diff --git a/java-jlayer/Makefile b/java-jlayer/Makefile
index 5940d08c82..8ecd4284cb 100644
--- a/java-jlayer/Makefile
+++ b/java-jlayer/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/java-jlayer
 
diff --git a/java-mp3spi/Makefile b/java-mp3spi/Makefile
index 58773b0bf5..0ba30aae4e 100644
--- a/java-mp3spi/Makefile
+++ b/java-mp3spi/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/java-mp3spi
 
diff --git a/java-tritonus-share/Makefile b/java-tritonus-share/Makefile
index d3b0602136..a77c3045bd 100644
--- a/java-tritonus-share/Makefile
+++ b/java-tritonus-share/Makefile
@@ -18,7 +18,7 @@ NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386  Linux-*-i386 Darwin-*-i386
 
diff --git a/java-vorbisspi/Makefile b/java-vorbisspi/Makefile
index 391e6b0f5a..087c975af3 100644
--- a/java-vorbisspi/Makefile
+++ b/java-vorbisspi/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+=	pax
 USE_LANGUAGES=	# none
 
 USE_JAVA=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java share/doc/java-vorbisspi
 
diff --git a/jmol/Makefile b/jmol/Makefile
index a1ba4e3249..3ddbc412cf 100644
--- a/jmol/Makefile
+++ b/jmol/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/jmol-12.0.12
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-*
 
 USE_JAVA2=		yes
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 JMOL_HOME=	${PREFIX}/share/jmol
 JMOL_FILES=	Jmol.jar JmolApplet.jar           \
diff --git a/jython/Makefile b/jython/Makefile
index 0b62b0c19e..63d98b984e 100644
--- a/jython/Makefile
+++ b/jython/Makefile
@@ -23,7 +23,7 @@ JYTHON_NAME=	${PKGNAME}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-* Linux-*-* FreeBSD-*-* OpenBSD-*-*
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 MAKE_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 
 REPLACE_PYTHON+=	jython
diff --git a/libgda4/options.mk b/libgda4/options.mk
index d17cf54a30..8a5f2a6d39 100644
--- a/libgda4/options.mk
+++ b/libgda4/options.mk
@@ -33,7 +33,7 @@ PLIST.bdb=		yes
 
 .if !empty(PKG_OPTIONS:Mjdbc)
 PKGCONFIG_OVERRIDE+=	libgda-jdbc-4.0.pc.in
-PKG_JVMS_ACCEPTED=	openjdk7					# XXX openjdk7-bin sun-jdk6 a.o. (patch-ad and patch-fb)
+PKG_JVMS_ACCEPTED=	openjdk7					# XXX openjdk7-bin sun-jdk7 a.o. (patch-ad and patch-fb)
 BUILD_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
 BUILD_DIRS+=		providers/jdbc
 CONFIGURE_ARGS+=	--with-java=yes
diff --git a/lucene/Makefile b/lucene/Makefile
index 33163aa32b..71df6f0622 100644
--- a/lucene/Makefile
+++ b/lucene/Makefile
@@ -18,7 +18,7 @@ AUTO_MKDIRS=	yes
 USE_JAVA=	yes
 USE_JAVA2=	yes
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${DESTDIR}${PREFIX}/lib/java/lucene
diff --git a/py-fanova/Makefile b/py-fanova/Makefile
index 1ae82f5713..8d97dbfd6c 100644
--- a/py-fanova/Makefile
+++ b/py-fanova/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Functional ANOVA
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
-PKG_JVMS_ACCEPTED=	sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/sarf/Makefile b/sarf/Makefile
index 783a8ae24e..0367366495 100644
--- a/sarf/Makefile
+++ b/sarf/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}
 VERSION=	1.0
 USE_LANGUAGES=	# none
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 USE_JAVA2=		yes
 
 INSTALLATION_DIRS=	bin  lib/java
diff --git a/simpa/Makefile b/simpa/Makefile
index 1916fca9de..33ce38bc50 100644
--- a/simpa/Makefile
+++ b/simpa/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+=	pax
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 
-PKG_JVMS_ACCEPTED=	sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED=	sun-jdk7
 
 INSTALLATION_DIRS=	lib/java/simpa/lib share/doc/simpa
 


Home | Main Index | Thread Index | Old Index