25 files changed, 13 insertions, 42 deletions

diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index b24d04980db7..721223090f0f 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aoi
 PORTVERSION=	3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/ArtOfIllusion/${PORTVERSION} \
 		SF/${PORTNAME}/ArtOfIllusion-manual/${PORTVERSION}:docs
@@ -21,7 +21,6 @@ LIB_DEPENDS=	libjogl.so:graphics/jogl
 USES=		zip
 DOS2UNIX_FILES=	../AoI_Manual/*.html # USES=dos2unix is optional
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
diff --git a/graphics/aoi/files/aoi.in b/graphics/aoi/files/aoi.in
index 1dd580b25f96..816444ceaaed 100644
--- a/graphics/aoi/files/aoi.in
+++ b/graphics/aoi/files/aoi.in
@@ -2,7 +2,5 @@
 #
 # $FreeBSD$
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -jar "%%DATADIR%%/ArtOfIllusion.jar" "${@}"
diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile
index c3e5511e327f..b59e0d344b16 100644
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@@ -16,7 +16,6 @@ LICENSE=	BSD3CLAUSE
 RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILES=	${PORTNAME}-${DISTVERSION}.jar
diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index 78a0539b95ff..6a1d784d7a53 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CPE_VENDOR=	apache
 
 USES=		cpe
-USE_JAVA=	1.7+
+USE_JAVA=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index 09c2c7165df4..aed064d23c56 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cbviewer
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \
 		SF/nemysisfreebsdp/graphics/:icons
@@ -23,7 +23,6 @@ RUN_DEPENDS=	unrar:archivers/unrar
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	CREDITS
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/graphics/cbviewer/files/cbviewer.in b/graphics/cbviewer/files/cbviewer.in
index 7be1937f6085..419df5a4e527 100644
--- a/graphics/cbviewer/files/cbviewer.in
+++ b/graphics/cbviewer/files/cbviewer.in
@@ -3,7 +3,5 @@
 # $FreeBSD$
 #
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
 -jar "%%DATADIR%%/CBViewer.jar" "${@}"
diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile
index b54386b6882d..3e55e3e81406 100644
--- a/graphics/cosmoplayer/Makefile
+++ b/graphics/cosmoplayer/Makefile
@@ -22,7 +22,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror auto-accept
 RUN_DEPENDS=	${JAVALIBDIR}/java40.jar:devel/netscape-java40
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/graphics/ditaa/Makefile b/graphics/ditaa/Makefile
index 1d316d37d6e1..a470959618ce 100644
--- a/graphics/ditaa/Makefile
+++ b/graphics/ditaa/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKDIR}/COPYING
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index d605849930a8..ff4a72249397 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 USES=		zip
 USE_JAVA=	yes
 
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile
index 77afea621215..31b8e3b169b0 100644
--- a/graphics/jalbum/Makefile
+++ b/graphics/jalbum/Makefile
@@ -16,7 +16,6 @@ USES=		zip
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 SUB_FILES=	jalbum.sh
diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile
index 929ba5f42139..bc3807bec028 100644
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jave6
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics java
 MASTER_SITES=	http://www.jave.de/developer/\
 		http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/
@@ -16,11 +16,9 @@ EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	jave6 pkg-message
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 do-install:
diff --git a/graphics/jave6/files/jave6.in b/graphics/jave6/files/jave6.in
index 7b60edec299e..3a37127f5762 100644
--- a/graphics/jave6/files/jave6.in
+++ b/graphics/jave6/files/jave6.in
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
 cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar jave.jar "${@}"
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index f61bfc5c01e8..ffce5eee8fe6 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jdraw
 PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
@@ -22,7 +22,7 @@ PLASTIC3D_DESC=		Use Plastic3DLook&Feel
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME}
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D}
+SUB_LIST=	JDRAWJAR=${JDRAWJAR} PLASTIC3D=${PLASTIC3D}
 
 JDRAWJAR=	${DATADIR}/${DISTFILES}
 
@@ -37,6 +37,5 @@ do-install:
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
 RUN_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/looks
 .endif
-JAVA_VERSION=	1.6+
 
 .include <bsd.port.mk>
diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in
index fdf78202b420..db25833ce358 100644
--- a/graphics/jdraw/files/jdraw.in
+++ b/graphics/jdraw/files/jdraw.in
@@ -1,10 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ -z "${JAVA_VERSION}" ]; then
-	JAVA_VERSION="%%JAVA_VERSION%%"
-fi
-
 LOOK_AND_FEEL="%%PLASTIC3D%%"
 
 exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@"
diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index ddd0f9ad3bd2..9b53f85e4134 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -35,7 +35,6 @@ USE_ANT=	yes
 USE_LDCONFIG=	yes
 USE_LOCALE=	en_US.UTF-8
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 BUILD_WRKSRC=	${WRKSRC}/jogl/make
 BUILD_BINPATH=	${WRKSRC}/bin
diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 54027a679bbe..b5b9985607a8 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jpatch
 DISTVERSION=	0.4p1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JPatch%200.4%20PREVIEW%201
 DISTNAME=	${PORTNAME}0_4preview1
@@ -13,7 +13,6 @@ COMMENT=	Spline based 3D modeling tool
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION}
 
diff --git a/graphics/jpatch/files/jpatch.sh.in b/graphics/jpatch/files/jpatch.sh.in
index 9f6eda7db431..14f134a46969 100644
--- a/graphics/jpatch/files/jpatch.sh.in
+++ b/graphics/jpatch/files/jpatch.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 1edaca258faa..d5f0330dbc3b 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -38,7 +38,6 @@ OPTIONS_SUB=	yes
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_OS=	native
 CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
 .else
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index 3ef931c85508..e7099d125097 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -41,7 +41,6 @@ USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 INSTALLS_ICONS=	yes
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 181f9411aba9..f67642961455 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mapyrus
 PORTVERSION=	1.801
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics print java
 MASTER_SITES=	SF
 
@@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/userdoc/COPYING
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAVA_VERSION=	1.6+
-
 MAPYRUSDOCS=	${PORTNAME}.pdf
 MAPYRUSJAR=	${PORTNAME}.jar
 
diff --git a/graphics/mapyrus/files/mapyrus.in b/graphics/mapyrus/files/mapyrus.in
index b9f54ed5ee69..eaa13e166d94 100644
--- a/graphics/mapyrus/files/mapyrus.in
+++ b/graphics/mapyrus/files/mapyrus.in
@@ -9,5 +9,4 @@ if [ -z "$1" ]; then
 else
     MAPYRUS_ARGS="$@"
 fi
-JAVA_VERSION="%%JAVA_VERSION%%" \
-	exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS}
+exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS}
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 1a348d1ec212..acd8d4da411c 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -53,7 +53,6 @@ CONFIGURE_ARGS+=	--without-netcdf
 .if defined(WITH_JAVA)
 ONLY_FOR_ARCHS=	i386
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 BUILD_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 RUN_DEPENDS+=	${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer
 CONFIGURE_ARGS+=	--with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \
diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile
index 6606b8964e0d..daef7a183c6c 100644
--- a/graphics/tintfu/Makefile
+++ b/graphics/tintfu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tintfu
 PORTVERSION=	0.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
@@ -18,7 +18,6 @@ EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 PLIST_FILES=	%%JAVAJARDIR%%/${DISTNAME}.jar \
 		bin/tintfu
diff --git a/graphics/tintfu/files/tintfu.sh.in b/graphics/tintfu/files/tintfu.sh.in
index c766004fc83c..4f773c697d41 100644
--- a/graphics/tintfu/files/tintfu.sh.in
+++ b/graphics/tintfu/files/tintfu.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar"
diff --git a/graphics/xmlgraphics-commons/Makefile b/graphics/xmlgraphics-commons/Makefile
index 48845676610b..fb5785c89aaf 100644
--- a/graphics/xmlgraphics-commons/Makefile
+++ b/graphics/xmlgraphics-commons/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Several reusable components used by Apache Batik and FOP
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_JAVA=	1.6+
+USE_JAVA=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes