Index: head/cad/sweethome3d/Makefile
===================================================================
--- head/cad/sweethome3d/Makefile	(revision 543247)
+++ head/cad/sweethome3d/Makefile	(revision 543248)
@@ -1,44 +1,44 @@
 # Created by: Matthias Petermann <matthias@petermann-it.de>
 # $FreeBSD$
 
 PORTNAME=	sweethome3d
 PORTVERSION=	6.4
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Free interior design application
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.TXT
 
 BUILD_DEPENDS=	java3d>=0:java/java3d
 RUN_DEPENDS=	java3d>=0:java/java3d
 
 USES=		zip
 NO_ARCH=	yes
 USE_ANT=	yes
-USE_JAVA=	yes
+USE_JAVA=	8
 
 ALL_TARGET=	jarExecutable
 JARNAME=	SweetHome3D-${PORTVERSION}.jar
 
 SUB_FILES=	sweethome3d.sh
 SUB_LIST=	JARNAME=${JARNAME}
 
 PLIST_FILES=	bin/sweethome3d \
 		${JAVAJARDIR}/${JARNAME} \
 		share/pixmaps/sweethome3d-icon.png
 
 DESKTOP_ENTRIES="Sweet Home 3D" "" "${PORTNAME}-icon" "${PORTNAME}" "" false
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} \
 		${STAGEDIR}${JAVAJARDIR}/${JARNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh \
 		${STAGEDIR}${PREFIX}/bin/sweethome3d
 	${INSTALL_DATA} ${WRKSRC}/deploy/SweetHome3DIcon32x32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/sweethome3d-icon.png
 
 .include <bsd.port.mk>
Index: head/java/java3d/Makefile
===================================================================
--- head/java/java3d/Makefile	(revision 543247)
+++ head/java/java3d/Makefile	(revision 543248)
@@ -1,71 +1,71 @@
 # Created by: nork@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	java3d
 PORTVERSION=	1.5.2
 PORTREVISION=	5
 CATEGORIES=	java graphics games devel
 MASTER_SITES=	https://sites.google.com/site/daemonwizard/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides API for creating and manipulation of 3D geometry
 
 LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	multi
 
 BROKEN_aarch64=		fails to compile: GVector.java:168: bad use of '>'
 BROKEN_armv6=		fails to compile: build.xml: Compile failed; see the compiler error output for details
 BROKEN_armv7=		fails to compile: build.xml: Compile failed; see the compiler error output for details
 
 USES=		gl tar:bzip2 xorg
-USE_JAVA=	yes
+USE_JAVA=	8
 USE_GL=		gl
 USE_XORG=	xt
 JAVA_VENDOR=	openjdk
 USE_ANT=	yes
 LLD_UNSAFE=	yes
 
 PLIST_SUB+=	JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH}
 
 DOCSSRC=	${WRKSRC}/j3d-core/build/freebsd/javadocs/docs-public
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|gcc|${CC}|g' \
 		${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml
 
 do-build:
 	cd ${WRKSRC}/vecmath && ${SETENV} ${MAKE_ENV} ${ANT} dist
 	cd ${WRKSRC}/j3d-core \
 		&& ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
 						-Dis${OPSYS}=yes \
 						-Dports.localbase=${LOCALBASE} \
 						jar-opt
 
 post-build-DOCS-on:
 	cd ${WRKSRC}/j3d-core \
 		&& ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
 						-Dis${OPSYS}=yes \
 						docs-public
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
 	${INSTALL_DATA} \
 		${WRKSRC}/vecmath/dist/lib/ext/vecmath.jar \
 		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dcore.jar \
 		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \
 		${STAGEDIR}${JAVA_HOME}/jre/lib/ext
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
 	${INSTALL} \
 		${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
 		${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${DOCSSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>