diff options
-rw-r--r-- | ftp/ftpcube/Makefile | 3 | ||||
-rw-r--r-- | games/qix/Makefile | 7 | ||||
-rw-r--r-- | graphics/diacanvas2/Makefile | 23 | ||||
-rw-r--r-- | java/forte/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/itk/Makefile | 3 | ||||
-rw-r--r-- | x11/xgrab/Makefile | 3 |
6 files changed, 19 insertions, 24 deletions
diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile index 533239049429..e398837dd232 100644 --- a/ftp/ftpcube/Makefile +++ b/ftp/ftpcube/Makefile @@ -17,6 +17,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A graphical FTP Client RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +.if defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.endif USE_REINPLACE= yes USE_PYTHON= yes diff --git a/games/qix/Makefile b/games/qix/Makefile index 19139c016948..50bfd58c9437 100644 --- a/games/qix/Makefile +++ b/games/qix/Makefile @@ -16,6 +16,9 @@ COMMENT= The classic arcade game BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +.if defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.endif .if defined(WITHOUT_X11) MAKE_ARGS= NO_X11=yes @@ -24,8 +27,8 @@ USE_X_PREFIX= yes PLIST= pkg-plist.x11 .endif -.if !defined(DISPLAY) || ${DISPLAY} == "" -IGNORE= Requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X. +.if (!defined(DISPLAY) || ${DISPLAY} == "") && !defined(PACKAGE_BUILDING) +IGNORE= requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X .endif MAN1= qix.1 diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index 6d1e6923c392..4cb460a1af93 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -24,10 +24,8 @@ USE_LIBTOOL_VER= 15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes - -.if !defined(DISPLAY) +.if defined(PACKAGE_BUILDING) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} -CONFIGURE_ENV+= DISPLAY=localhost:1001 .endif .include <bsd.port.pre.mk> @@ -40,25 +38,6 @@ post-patch: @${REINPLACE_CMD} -e \ 's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in -pre-configure: -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif -.if !defined(DISPLAY) - # - # This is a UGLY hack to not have to specify a X-Display. - # - ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 -.endif - -post-configure: -.if !defined(DISPLAY) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/java/forte/Makefile b/java/forte/Makefile index 5914b2872d97..c6155934581c 100644 --- a/java/forte/Makefile +++ b/java/forte/Makefile @@ -17,6 +17,10 @@ EXTRACT_ONLY= MAINTAINER= ports@FreeBSD.org COMMENT= A Sun's powerful and extensible IDE for Java +.if defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.endif + USE_JAVA= 1.3+ JAVAVM= ${JAVA_HOME}/bin/java diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile index 80d506aced62..d537d6317940 100644 --- a/x11-toolkits/itk/Makefile +++ b/x11-toolkits/itk/Makefile @@ -18,6 +18,9 @@ COMMENT= [incr Tk] (A.K.A. "itk") LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl +.if defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.endif USE_REINPLACE= yes WRKSRC= ${WRKDIR}/itcl${MAJOR}.${MINOR}/itk diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile index 503a0f7c3ccf..a79ad5d67bb7 100644 --- a/x11/xgrab/Makefile +++ b/x11/xgrab/Makefile @@ -18,6 +18,9 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= An X11 image grabber BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} +.if defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.endif USE_X_PREFIX= yes USE_IMAKE= yes |