Decommissioning java 1.5 (EOLed since October 2009):

suppress any reference to JAVA_VERSION=	1.5+ (part2)

21 files changed, 40 insertions, 104 deletions

diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index 3a93f4854fc0..c4e2684557f9 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	aoi
@@ -18,7 +18,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-a -q
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index ea5f21ced2f0..281200286721 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD
 RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILES=	${PORTNAME}-${DISTVERSION}.jar
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile
index 999a9e56b0f1..f41a22ccd996 100644
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   cairo-java
-# Date created:        26 Oct 2005
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/graphics/cairo-java/Makefile,v 1.4 2006/09/14 12:47:28 ahze Exp $
-#
 
 PORTNAME=	cairo-java
 PORTVERSION=	1.0.8
@@ -24,7 +20,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index ee617dfc0ad3..c253c2d36f6f 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -1,4 +1,4 @@
-# Created by:	nemysis@gmx.ch
+# Created by: nemysis@gmx.ch
 # $FreeBSD$
 
 PORTNAME=	cbviewer
@@ -23,7 +23,7 @@ FETCH_ARGS?=	-Fpr
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile
index 0d30add9763c..b2bfc62e3f58 100644
--- a/graphics/cosmoplayer/Makefile
+++ b/graphics/cosmoplayer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cosmoplayer
-# Date created:		25 January 2006
-# Whom:			Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	cosmoplayer
 PORTVERSION=	2.1.1
@@ -21,7 +17,7 @@ COMMENT=	Java classes to support VRML
 RUN_DEPENDS=	${JAVALIBDIR}/java40.jar:${PORTSDIR}/devel/netscape-java40
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILES=	npcosmop211.jar LICENSE.npcosmop211.txt
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index f7b643f88681..2ee2a5c78f03 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	geoserver
-# Date created:				10 March 2008
-# Whom:					Wen heping<wenheping@gmail.com>
-#
+# Created by: Wen heping<wenheping@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	geoserver
 PORTVERSION=	2.1.1
@@ -18,7 +14,7 @@ LICENSE=	GPLv2
 
 USE_JAVA=	yes
 USE_ZIP=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile
index d62675cc5e1e..357a29302382 100644
--- a/graphics/jalbum/Makefile
+++ b/graphics/jalbum/Makefile
@@ -18,7 +18,7 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 SUB_FILES=	jalbum.sh
diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile
index 3add132519e0..c85598becfac 100644
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@@ -1,7 +1,4 @@
-# Ports collection makefile for:	Jave
-# Date created:				29 January 2006
-# Whom:					Andreas Daehn <ad001@uni-rostock.de>
-#
+# Created by: Andreas Daehn <ad001@uni-rostock.de>
 # $FreeBSD$
 
 PORTNAME=	jave6
@@ -18,7 +15,7 @@ COMMENT=	Java ASCII-Art-Generator
 
 USE_JAVA=	YES
 USE_ZIP=	YES
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	YES
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 LNKTARGET=	${PREFIX}/bin/jave6
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index ee7fd04ed8e1..fc71d4142bf1 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jdraw
-# Date created:		2006-04-15
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	jdraw
 PORTVERSION=	1.1.5
@@ -39,6 +35,6 @@ do-install:
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
 RUN_DEPENDS+=	${JAVAJARDIR}/looks.jar:${PORTSDIR}/devel/looks
 .endif
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 .include <bsd.port.post.mk>
diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index a9b6a5ff144a..6732849810bf 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   jogl
-# Date created:        5 December 1994
-# Whom:                Peter Jeremy <peterjeremy@optushome.com.au>
-#
+# Created by: Peter Jeremy <peterjeremy@optushome.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	jogl
 PORTVERSION=	1.1.1
@@ -46,7 +42,7 @@ USE_ZIP=	yes
 USE_ANT=	yes
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 BUILD_WRKSRC=	${WRKSRC}/jogl/make
 
diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 3194f560b622..766ecee31e38 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	jpatch
-# Date created:			Jun 30, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	jpatch
 DISTVERSION=	0.4p1
@@ -20,7 +15,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION}
 
diff --git a/graphics/jumpgis-postgis/Makefile b/graphics/jumpgis-postgis/Makefile
index 713a63710229..28ed3cc1f794 100644
--- a/graphics/jumpgis-postgis/Makefile
+++ b/graphics/jumpgis-postgis/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	JUMP PostGIS plugin
-# Date created:				June 25 2004
-# Whom:					Sam Lawrance <boris@brooknet.com.au>
-#
+# Created by: Sam Lawrance <boris@brooknet.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	jumpgis-postgis
 PORTVERSION=	1.1.0
@@ -19,7 +15,7 @@ RUN_DEPENDS=	jumpgis:${PORTSDIR}/graphics/jumpgis
 
 TARGET_DIR=	${PREFIX}/jumpgis
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile
index 79f63353a9eb..47b5eac9119e 100644
--- a/graphics/jumpgis/Makefile
+++ b/graphics/jumpgis/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	JUMP Unified Mapping Platform
-# Date created:				June 16 2004
-# Whom:					Sam Lawrance <boris@brooknet.com.au>
-#
+# Created by: Sam Lawrance <boris@brooknet.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	jumpgis
 PORTVERSION=	1.1.2
@@ -23,7 +19,7 @@ EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 TARGET_DIR=	${PREFIX}/${PORTNAME}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ZIP=	yes
 NO_BUILD=	yes
 WANT_GNOME=	yes
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index 2d5b8cb8b79d..766337070bf0 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -1,8 +1,6 @@
-# New ports collection makefile for:   panorama-tools
-# Date created:        26 august 2004
-# Whom:                cartola (Carlos E. G. Carvalho)
-#
+# Created by: cartola (Carlos E. G. Carvalho)
 # $FreeBSD$
+
 # This port has been made as a building and running dependence for the
 # hugin port.
 # The hugin port is a gui interface to interact with this and other
@@ -39,7 +37,7 @@ USE_LDCONFIG=	yes
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
 .else
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 4314da5b5177..9d0150aad49a 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libpano13
-# Date created:				8 October 2007
-# Whom:					Vasil Dimov <vd@FreeBSD.org>
-#
+# Created by: Vasil Dimov <vd@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libpano13
 PORTVERSION=	2.9.18
@@ -49,7 +45,7 @@ MAN1=		\
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
 PLIST_SUB=	JAVA=""
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 2470e492b3d5..bddabffe11d1 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mapyrus
-# Date created:		2006-04-25
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	mapyrus
 PORTVERSION=	1.202
@@ -20,7 +16,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ZIP=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 064857405dbe..932a3b90f5eb 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	opendx
-# Date created:		27 May 1999
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-# Updates:              Randall Hopper <rhh@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
@@ -53,7 +48,7 @@ CONFIGURE_ARGS+=	--without-netcdf
 
 .if defined(WITH_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer
 RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer
 CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index 2dbebb1adeaa..270369880da6 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	openjump
-# Date created:				08 May, 2009
-# Whom:					Wen Heping<wenheping@gmail.com>
-#
+# Created by: Wen Heping<wenheping@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	OpenJUMP
 PORTVERSION=	1.5.1
@@ -43,7 +39,7 @@ LICENSE_PERMS_JYTHON=	auto-accept
 
 TARGET_DIR=	${PREFIX}/${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile
index a38a98ed207b..1f79502e9930 100644
--- a/graphics/tintfu/Makefile
+++ b/graphics/tintfu/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	tintfu
-# Date created:			Nov 10, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	tintfu
 PORTVERSION=	0.0.4
@@ -25,7 +20,7 @@ EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 PLIST_FILES=	%%JAVAJARDIR%%/${DISTNAME}.jar \
 		bin/tintfu
diff --git a/graphics/xmlgraphics-commons/Makefile b/graphics/xmlgraphics-commons/Makefile
index c7d1a02bd64b..747f96f18811 100644
--- a/graphics/xmlgraphics-commons/Makefile
+++ b/graphics/xmlgraphics-commons/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmlgraphics-commons
-# Date created:				11 February 2010
-# Whom:					rfarmer@predatorlabs.net
-#
+# Created by: rfarmer@predatorlabs.net
 # $FreeBSD$
-#
 
 PORTNAME=	xmlgraphics-commons
 PORTVERSION=	1.5.r1222519
@@ -15,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Several reusable components used by Apache Batik and FOP
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 USE_ANT=	yes
diff --git a/graphics/yed/Makefile b/graphics/yed/Makefile
index a53cac69860c..dd2b986ea579 100644
--- a/graphics/yed/Makefile
+++ b/graphics/yed/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 RESTRICTED=	Downloading requires acceptance of license agreement
 DESKTOP_ENTRIES="yEd" "${COMMENT}" "" "yed" "" "false"