svn commit: r308619 - in head: . Mk java java/diablo-jdk15 java/diablo-jdk16 java/diablo-jre15 java/diablo-jre16 java/jdk15 java/jdk15-doc java/jdk16 java/linux-sun-jdk15 java/linux-sun-jre15

Baptiste Daroussin bapt at FreeBSD.org
Mon Dec 10 17:18:33 UTC 2012 

Author: bapt
Date: Mon Dec 10 17:18:32 2012
New Revision: 308619
URL: http://svnweb.freebsd.org/changeset/ports/308619

Log:
  Decommissioning java 1.5 (EOLed since October 2009):
  removal of the different 1.5 jre and jdk vendors
  
  Removing outdated jdk16 vendors:
  removing all the bsdjava and freebsd vendors, consider using openjdk6 or
  openjsk7 instead.
  
  Discussed with:	java (glarkin)

Deleted:
  head/java/diablo-jdk15/
  head/java/diablo-jdk16/
  head/java/diablo-jre15/
  head/java/diablo-jre16/
  head/java/jdk15/
  head/java/jdk15-doc/
  head/java/jdk16/
  head/java/linux-sun-jdk15/
  head/java/linux-sun-jre15/
Modified:
  head/LEGAL
  head/MOVED
  head/Mk/bsd.java.mk
  head/java/Makefile

Modified: head/LEGAL
==============================================================================
--- head/LEGAL	Mon Dec 10 17:07:22 2012	(r308618)
+++ head/LEGAL	Mon Dec 10 17:18:32 2012	(r308619)
@@ -112,10 +112,6 @@ dgd/*			net/dgd-lpmud		No monetary gain.
 						it depends on dgd, which has
 						restrictions on distribution
 						Source tarball may go on CD-ROM
-diablo-caffe-freebsd*-*-* java/diablo-jdk15	License does not allow
-						distribution with fee
-diablo-latte-freebsd*-*-* java/diablo-jre15	License does not allow
-						distribution with fee
 djbdns*			dns/djbdns		No license -- see
 						http://cr.yp.to/softwarelaw.html
 djbfft-*		math/djbfft		No license -- see
@@ -243,14 +239,6 @@ idea.V*.tar.Z		security/idea		A patented
 iperf-*			benchmarks/iperf	Cannot charge a fee for the
 						software
 j2me_wireless_toolkit*	java/sun-wtk		No redistribution allowed
-jdk-1_5_0-bin-scsl.*	java/jdk15		Redistribution of pre-compiled
-						binaries is not permitted
-jdk-1_5_0-src-scsl.*	java/jdk15		Redistribution of pre-compiled
-						binaries is not permitted
-jdk-1_5_0-doc.*		java/jdk15-doc		This documentation is under
-						license and export control
-jdk-1_5_0*-i586.bin	java/linux-sun-jdk15	Redistribution of repackaged
-						binaries not permitted
 jdk-6*-i586.bin		java/linux-sun-jdk16	Redistribution of repackaged
 						binaries not permitted
 jdk-7*-i586.tar.gz	java/linux-sun-jdk17	Redistribution of repackaged
@@ -266,8 +254,6 @@ javax_comm-*-solsparc.*	comms/java-comma
 jmf-*-alljava.zip	java/jmf		Redistribution of pre-compiled
 						binaries is not permitted
 jpgraph-2.*		graphics/jpgraph2	Not for commercial use
-jre-1_5*-i586.bin	java/linux-sun-jre15	License does not allow
-						distribution with fee
 jre-6*-i586.bin		java/linux-sun-jre16	License does not allow
 						distribution with fee
 jre-7*-i586.tar.gz	java/linux-sun-jre17	License does not allow

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Dec 10 17:07:22 2012	(r308618)
+++ head/MOVED	Mon Dec 10 17:18:32 2012	(r308619)
@@ -3942,3 +3942,12 @@ lang/tcl82||2012-12-03|No longer develop
 x11-toolkits/tk82||2012-12-03|No longer developed, no more consumers
 astro/prune|astro/gpsprune|2012-12-03|Project was renamed
 net-p2p/limewire||2012-12-07|Has expired: Abandoned up stream
+java/diablo-jre16|java/openjdk6-jre|2012-12-10|Has expired: Outdated, consider using openjdk6 or openjdk7
+java/diablo-jdk16|java/openjdk6|2012-12-10|Has expired: Outdated, consider using openjdk6 or openjdk7
+java/diablo-jre15|java/openjdk6-jre|2012-12-10|Has expired: Outdated, consider using openjdk6 or openjdk7
+java/diablo-jdk15|java/openjdk6|2012-12-10|Has expired: Outdated, consider using openjdk6 or openjdk7
+java/jdk15|java/openjdk6|2012-12-10|Has expired: EOLed upstream since october 2009
+java/jdk16|java/openjdk6|2012-12-10|Has expired: Outdated, consider using openjdk6 or openjdk7
+java/linux-sun-jre15|java/linux-sun-jre16|2012-12-10|Has expired: EOLed upstream since october 2009
+java/linux-sun-jdk15|java/linux-sun-jdk16|2012-12-10|Has expired: EOLed upstream since october 2009
+java/jdk15-doc|java/jdk16-doc|2012-12-10|Has expired: EOLed upstream since october 2009

Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk	Mon Dec 10 17:07:22 2012	(r308618)
+++ head/Mk/bsd.java.mk	Mon Dec 10 17:18:32 2012	(r308619)
@@ -25,7 +25,7 @@ Java_Include_MAINTAINER=	glewis at FreeBSD.
 #
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #					port. An optional "+" allows you to specify a range of
-#					versions. (allowed values: 1.5[+] 1.6[+] 1.7[+])
+#					versions. (allowed values: 1.6[+] 1.7[+])
 #
 # JAVA_OS			List of space-separated suitable JDK port operating systems
 #					for the port. (allowed values: native linux)
@@ -156,10 +156,10 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .		endif
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	1.5 1.6 1.7
+__JAVA_VERSION_LIST=	1.6 1.7
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
-_JAVA_VENDOR_LIST=		freebsd bsdjava sun openjdk
+_JAVA_VENDOR_LIST=		sun openjdk
 
 # Set all meta-information about JDK ports:
 # port location, corresponding JAVA_HOME, JDK version, OS, vendor
@@ -167,24 +167,12 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO=	
 											VERSION=1.7.0	OS=native	VENDOR=openjdk
 _JAVA_PORT_NATIVE_OPENJDK_JDK_1_6_INFO=		PORT=java/openjdk6			HOME=${LOCALBASE}/openjdk6 \
 											VERSION=1.6.0	OS=native	VENDOR=openjdk
-_JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO=		PORT=java/diablo-jdk16			HOME=${LOCALBASE}/diablo-jdk1.6.0 \
-											VERSION=1.6.0	OS=native	VENDOR=freebsd
-_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO=		PORT=java/diablo-jdk15			HOME=${LOCALBASE}/diablo-jdk1.5.0 \
-											VERSION=1.5.0	OS=native	VENDOR=freebsd
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5_INFO=		PORT=java/jdk15					HOME=${LOCALBASE}/jdk1.5.0 \
-											VERSION=1.5.0	OS=native	VENDOR=bsdjava
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO=		PORT=java/jdk16					HOME=${LOCALBASE}/jdk1.6.0 \
-											VERSION=1.6.0	OS=native	VENDOR=bsdjava
-_JAVA_PORT_LINUX_SUN_JDK_1_5_INFO=			PORT=java/linux-sun-jdk15		HOME=${LOCALBASE}/linux-sun-jdk1.5.0 \
-											VERSION=1.5.0	OS=linux	VENDOR=sun
 _JAVA_PORT_LINUX_SUN_JDK_1_6_INFO=			PORT=java/linux-sun-jdk16		HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \
 											VERSION=1.6.0	OS=linux	VENDOR=sun
 _JAVA_PORT_LINUX_SUN_JDK_1_7_INFO=			PORT=java/linux-sun-jdk17		HOME=${LOCALBASE}/linux-sun-jdk1.7.0 \
 											VERSION=1.7.0	OS=linux	VENDOR=sun
 
 # Verbose description for each VENDOR
-_JAVA_VENDOR_freebsd=		"FreeBSD Foundation"
-_JAVA_VENDOR_bsdjava=		"BSD Java Porting Team"
 _JAVA_VENDOR_openjdk=		"OpenJDK BSD Porting Team"
 _JAVA_VENDOR_sun=			Sun
 
@@ -196,15 +184,10 @@ _JAVA_OS_linux=		Linux
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_OPENJDK_JDK_1_6
 
 # List all JDK ports
-__JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \
-					JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \
-					JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
+__JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
-					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \
-					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
 					JAVA_PORT_LINUX_SUN_JDK_1_7 \
-					JAVA_PORT_LINUX_SUN_JDK_1_6 \
-					JAVA_PORT_LINUX_SUN_JDK_1_5
+					JAVA_PORT_LINUX_SUN_JDK_1_6
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 					${_JAVA_PREFERRED_PORTS} \
 					${__JAVA_PORTS_ALL}
@@ -269,7 +252,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .		if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/1.5+/1.5 1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
+_JAVA_VERSION=	${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
 .		else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .		endif

Modified: head/java/Makefile
==============================================================================
--- head/java/Makefile	Mon Dec 10 17:07:22 2012	(r308618)
+++ head/java/Makefile	Mon Dec 10 17:18:32 2012	(r308619)
@@ -15,10 +15,6 @@
     SUBDIR += cos
     SUBDIR += cryptix-jce
     SUBDIR += dbvis
-    SUBDIR += diablo-jdk15
-    SUBDIR += diablo-jdk16
-    SUBDIR += diablo-jre15
-    SUBDIR += diablo-jre16
     SUBDIR += drexelsnmp
     SUBDIR += eclipse
     SUBDIR += eclipse-EPIC
@@ -98,9 +94,6 @@
     SUBDIR += jcckit
     SUBDIR += jcommon
     SUBDIR += jdbcpool
-    SUBDIR += jdk15
-    SUBDIR += jdk15-doc
-    SUBDIR += jdk16
     SUBDIR += jdk16-doc
     SUBDIR += jdom
     SUBDIR += jflex
@@ -120,10 +113,8 @@
     SUBDIR += jump
     SUBDIR += junit
     SUBDIR += langspec
-    SUBDIR += linux-sun-jdk15
     SUBDIR += linux-sun-jdk16
     SUBDIR += linux-sun-jdk17
-    SUBDIR += linux-sun-jre15
     SUBDIR += linux-sun-jre16
     SUBDIR += linux-sun-jre17
     SUBDIR += mmake

More information about the svn-ports-head mailing list