From owner-svn-ports-head@FreeBSD.ORG  Tue Oct  8 06:53:51 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4E5AE430;
 Tue,  8 Oct 2013 06:53:51 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3BE19281E;
 Tue,  8 Oct 2013 06:53:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r986rpQO018592;
 Tue, 8 Oct 2013 06:53:51 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r986rpUv018591;
 Tue, 8 Oct 2013 06:53:51 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201310080653.r986rpUv018591@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 8 Oct 2013 06:53:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329761 - head/java/openjdk6
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Oct 2013 06:53:51 -0000

Author: jkim
Date: Tue Oct  8 06:53:50 2013
New Revision: 329761
URL: http://svnweb.freebsd.org/changeset/ports/329761

Log:
  Fix test option.

Modified:
  head/java/openjdk6/Makefile

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Tue Oct  8 06:28:41 2013	(r329760)
+++ head/java/openjdk6/Makefile	Tue Oct  8 06:53:50 2013	(r329761)
@@ -174,7 +174,7 @@ EXTRA_PATCHES+=	${FILESDIR}/alsa-disable
 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