aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils/deskbar-applet/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/deskbar-applet/Makefile')
-rw-r--r--deskutils/deskbar-applet/Makefile30
1 files changed, 3 insertions, 27 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index e7d3b434f2ca..5deda8ea4a44 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.80 2008/03/11 14:26:12 ahze Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.94 2008/11/23 02:11:32 marcus Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.22.3.1
-PORTREVISION= 1
+PORTVERSION= 2.24.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,6 +28,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
+USE_DISPLAY= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -46,34 +46,10 @@ CONFIGURE_ARGS+=--disable-evolution
PLIST_SUB+= EVO="@comment "
.endif
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
- ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.if !defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+= DISPLAY="localhost:1001"
-.endif
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/deskbar/handlers/mozilla.py \
${WRKSRC}/deskbar/core/Utils.py
-.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 <bsd.port.post.mk>