diff options
| author | kris <kris@FreeBSD.org> | 2005-01-02 06:16:28 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2005-01-02 06:16:28 +0800 |
| commit | 751e1620399057383b0e26c92d8634103ab0a8d9 (patch) | |
| tree | aae3c437c51dc321eb55c87e22dac96e2cbdd750 /graphics | |
| parent | 633c089ab5d4c53df41f1bed2ae3950afc792920 (diff) | |
| download | freebsd-ports-gnome-751e1620399057383b0e26c92d8634103ab0a8d9.tar.gz freebsd-ports-gnome-751e1620399057383b0e26c92d8634103ab0a8d9.tar.zst freebsd-ports-gnome-751e1620399057383b0e26c92d8634103ab0a8d9.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)
Diffstat (limited to 'graphics')
| -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} |