From owner-svn-ports-all@FreeBSD.ORG  Mon Jul  8 17:10:56 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EC42B592;
 Mon,  8 Jul 2013 17:10:56 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DE0061D35;
 Mon,  8 Jul 2013 17:10:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68HAucU047197;
 Mon, 8 Jul 2013 17:10:56 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68HAuuv047196;
 Mon, 8 Jul 2013 17:10:56 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307081710.r68HAuuv047196@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 8 Jul 2013 17:10:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322517 - head/games/gcompris
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 17:10:57 -0000

Author: bapt
Date: Mon Jul  8 17:10:56 2013
New Revision: 322517
URL: http://svnweb.freebsd.org/changeset/ports/322517

Log:
  Convert to USES=display:configure gmake

Modified:
  head/games/gcompris/Makefile

Modified: head/games/gcompris/Makefile
==============================================================================
--- head/games/gcompris/Makefile	Mon Jul  8 16:51:29 2013	(r322516)
+++ head/games/gcompris/Makefile	Mon Jul  8 17:10:56 2013	(r322517)
@@ -24,8 +24,7 @@ RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/
 		gnucap:${PORTSDIR}/cad/gnucap
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext gmake display:configure
 GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
 USE_PYTHON=	-2.7
@@ -46,20 +45,4 @@ post-patch:
 		's|-DGNOME_DISABLE_DEPRECATED||g'
 	@${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
-.if !defined(DISPLAY)
-pre-configure:
-	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
-		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
-		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
-	fi
-	${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
-
-post-configure:
-	@if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
-		${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
-		${RM} -f ${WRKDIR}/.Xvfb.pid ; \
-	fi
-.endif
-
 .include <bsd.port.mk>