diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2005-01-01 22:16:28 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2005-01-01 22:16:28 +0000 |
| commit | 88d78c401e6ee4a777388d5cdd174c980978b5c2 (patch) | |
| tree | 2b5a6b468d3cfdb76a10eecac6670ca3a6bca876 /graphics/diacanvas2 | |
| parent | 9b7cdfcd6e84afc16e8d0d6510038c94a6a14b6a (diff) | |
| download | ports-88d78c401e6ee4a777388d5cdd174c980978b5c2.tar.gz ports-88d78c401e6ee4a777388d5cdd174c980978b5c2.zip | |
Fix package building by adding a dependency on Xvfb in the
PACKAGE_BUILDING case. The package build scripts then DTRT and ensure
this is running at build-time so a DISPLAY is available.
Approved by: portmgr (self)
Notes
Notes:
svn path=/head/; revision=125629
Diffstat (limited to 'graphics/diacanvas2')
| -rw-r--r-- | graphics/diacanvas2/Makefile | 23 |
1 files changed, 1 insertions, 22 deletions
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} |