10 files changed, 7 insertions, 12 deletions

diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 86c35d61a797..30a22100755e 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	electric
 PORTVERSION=	9.07
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	GNU \
 		http://www.staticfreesoft.com/:1 \
@@ -20,7 +21,6 @@ LICENSE=	GPLv3
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"
diff --git a/cad/electric-ng/files/electric-ng.in b/cad/electric-ng/files/electric-ng.in
index b419239d7d36..8a60831ec501 100644
--- a/cad/electric-ng/files/electric-ng.in
+++ b/cad/electric-ng/files/electric-ng.in
@@ -6,7 +6,6 @@
 set JAVA = "%%LOCALBASE%%/bin/java"
 set LIBFILES = "%%LIBFILES%%"
 set JARPATH = "%%JAVALIBDIR%%"
-setenv JAVA_VERSION "%%JAVA_VERSION%%"
 
 if ( "${LIBFILES}" != "" ) then
 	set CLASSPATH = :`echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`
diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index 4cf990567130..761dc35546fa 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fidocadj
 PORTVERSION=	0.24.6
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
 DISTFILES=	${PORTNAME}.jar:src
@@ -23,7 +23,6 @@ NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 
-JAVA_VERSION=	1.6+
 USE_JAVA=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/cad/fidocadj/files/fidocadj.sh.in b/cad/fidocadj/files/fidocadj.sh.in
index 71c4e3ec855f..b3b57c70e257 100644
--- a/cad/fidocadj/files/fidocadj.sh.in
+++ b/cad/fidocadj/files/fidocadj.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index af5193acbdc3..21a1801d9a3d 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	impact
 PORTVERSION=	0.7.06.038
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION} \
@@ -24,7 +24,6 @@ WRKSRC=		${WRKDIR}/Impact
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/Impact
diff --git a/cad/impact/files/impact.in b/cad/impact/files/impact.in
index 11391407ed44..b99cdbcf062f 100644
--- a/cad/impact/files/impact.in
+++ b/cad/impact/files/impact.in
@@ -3,5 +3,5 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:doc:bin run.Impact "$@"
 cd -
diff --git a/cad/impact/files/impactgui.in b/cad/impact/files/impactgui.in
index 187e2a0b9abf..28e4b02ab2c8 100644
--- a/cad/impact/files/impactgui.in
+++ b/cad/impact/files/impactgui.in
@@ -3,5 +3,5 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
+"%%LOCALBASE%%/bin/java" -Xmx1000m -Xss1m -cp .:bin:doc:lib/jogl.jar:lib/gluegen-rt.jar:lib/patbinfree153.jar:lib/LogDB.jar:lib/mysql-connector-java-5.1.11-bin.jar gui.ImpactGUI
 cd -
diff --git a/cad/logisim/Makefile b/cad/logisim/Makefile
index 6791cdffab55..d722f1e1a1b0 100644
--- a/cad/logisim/Makefile
+++ b/cad/logisim/Makefile
@@ -16,7 +16,6 @@ LICENSE=	GPLv2
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_RUN=	yes
-JAVA_VERSION=	1.6+
 
 PLIST_FILES=	${DATADIR_REL}/${PORTNAME}-generic-${PORTVERSION}${EXTRACT_SUFX} \
 		bin/${PORTNAME}
diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index 79ba118a2c1d..e24768576067 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sweethome3d
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -20,7 +21,6 @@ USES=		zip
 NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 ALL_TARGET=	jarExecutable
 JARNAME=	SweetHome3D-${PORTVERSION}.jar
diff --git a/cad/sweethome3d/files/sweethome3d.sh.in b/cad/sweethome3d/files/sweethome3d.sh.in
index 5380e161581c..98b88265f4d3 100644
--- a/cad/sweethome3d/files/sweethome3d.sh.in
+++ b/cad/sweethome3d/files/sweethome3d.sh.in
@@ -4,6 +4,5 @@
 
 JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
 
 exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@"