diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-16 08:13:16 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-16 08:13:16 +0800 |
| commit | 24fd53217af122b4ef5c74f8c446d9e8aff55c1f (patch) | |
| tree | 2a8f0ba0b009d78d594689f4e61000e11c82351c /deskutils/deskbar-applet/Makefile | |
| parent | b90ec1a3a3dfae020e3067900367e16eab12c237 (diff) | |
| download | marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.tar marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.tar.gz marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.tar.bz2 marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.tar.lz marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.tar.xz marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.tar.zst marcuscom-ports-24fd53217af122b4ef5c74f8c446d9e8aff55c1f.zip | |
Make sure the Xvfb session is properly cleaned up after configure.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5704 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils/deskbar-applet/Makefile')
| -rw-r--r-- | deskutils/deskbar-applet/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 1785f92fe..ef44332c2 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.10 2006/02/04 19:42:36 marcus Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.11 2006/02/14 17:17:03 ahze Exp $ # PORTNAME= deskbar-applet @@ -61,18 +61,18 @@ post-patch: .if !defined(DISPLAY) pre-configure: -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif + @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ + ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ + ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ + fi ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 post-configure: -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif + @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ + ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ + ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ + fi .endif .include <bsd.port.post.mk> |