Index: Makefile
===================================================================
--- Makefile	(révision 322414)
+++ Makefile	(copie de travail)
@@ -131,12 +131,14 @@
 TEST_DESC=	Add support for running regression test
 .endif
 
+USES=		gmake
+TEST_USES=	display:test
+
 .include <bsd.port.options.mk>
 
 # java extracts directly to the cwd
 WRKSRC=		${WRKDIR}
 
-USE_GMAKE=	yes
 USE_MOTIF=	yes
 USE_XORG=	x11 xext xi xt xtst
 
@@ -253,7 +255,6 @@
 DISTFILES+=	${JTREGFILE}:jtreg
 EXTRACT_ONLY+=	${JTREGFILE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
-USE_DISPLAY=	yes
 .endif
 
 COPYDIRS=	\
@@ -332,24 +333,10 @@
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 		${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
 .endif
-.endif
-.if ${PORT_OPTIONS:MTEST}
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Run \"make test\" to execute regression test (it could take a few hours to complete)."
-.if defined(DISPLAY)
-	@${ECHO_MSG} "Unset the environment DISPLAY variable to run tests in a virtual X server."
-.endif
-	@${ECHO_MSG} ""
 
 test: build-depends build
-.if !defined(DISPLAY)
-	@${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-.endif
 	@-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} ${GMAKE} tests)
-.if !defined(DISPLAY)
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You can run \"make test\" again to re-execute only the failed tests."
 	@${ECHO_MSG} ""