From ab01a47e66b1551da9bc387c140391a0cef0e3ad Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 10 Jul 2013 08:19:23 +0000 Subject: USE_GMAKE -> USES=gmake USE_DISPLAY -> USES=display git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18623 df743ca5-7f9a-e211-a948-0013205c9059 --- accessibility/accerciser/Makefile | 22 ++-------------------- accessibility/accerciser3/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile index de060cbed..87ab6efcd 100644 --- a/accessibility/accerciser/Makefile +++ b/accessibility/accerciser/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/accessibility/accerciser/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= accerciser PORTVERSION= 1.12.1 @@ -15,34 +15,16 @@ COMMENT= Interactive Python accessibility explorer for GNOME CONFLICTS= accerciser-3.[0-9].* USE_BZIP2= yes -USE_GMAKE= yes USE_GNOME= pygnomedesktop atspi intlhack USE_PYTHON= yes -USES= gettext pkgconfig +USES= display:configure gettext gmake pkgconfig INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -USE_DISPLAY= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= accerciser.schemas MAN1= accerciser.1 -.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 diff --git a/accessibility/accerciser3/Makefile b/accessibility/accerciser3/Makefile index cabbd6835..f9b674d79 100644 --- a/accessibility/accerciser3/Makefile +++ b/accessibility/accerciser3/Makefile @@ -1,6 +1,6 @@ # Created by: Michael Johnson # $FreeBSD$ -# $MCom$ +# $MCom: ports/trunk/accessibility/accerciser3/Makefile 18610 2013-06-30 16:33:05Z marcus $ PORTNAME= accerciser PORTVERSION= 3.6.2 @@ -20,10 +20,9 @@ RUN_DEPENDS= gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-deskto CONFLICTS= accerciser-1.* USE_XZ= yes -USE_GMAKE= yes USE_GNOME= gtk30 pygobject3 intlhack USE_PYTHON= yes -USES= gettext pkgconfig +USES= gettext gmake pkgconfig INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -- cgit v1.2.3