From 3aebbc79f2e5b5c366de52f56e8cf40157fa38ab Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 8 Oct 2013 06:53:50 +0000
Subject: [PATCH] Fix test option.

---
 java/openjdk6/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index ffd3b9f221e8..90c575cc8993 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -174,7 +174,7 @@ EXTRA_PATCHES+=	${FILESDIR}/alsa-disable.patch
 DISTFILES+=	${JTREGFILE}:jtreg
 EXTRACT_ONLY+=	${JTREGFILE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
-USE_DISPLAY=	yes
+USES+=		display
 .else
 EXTRA_PATCHES+=	${FILESDIR}/test_gamma-disable.patch
 .endif
@@ -277,7 +277,8 @@ test: build-depends build
 	    -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & \
 	    ${ECHO_CMD} $$! > ${WRKDIR}/.Xvfb.pid
 .endif
-	@-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} ${GMAKE} tests)
+	@-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} \
+	    PLATFORM=bsd ARCH=${ARCH:S/i386/i586/} ${GMAKE} tests)
 .if !defined(DISPLAY)
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid