diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-25 15:45:30 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-25 15:45:30 +0800 |
| commit | 69f85091ff9ab52c81c26a8ae24c63c6fce8268f (patch) | |
| tree | 74d00c1ded798a48c10b3314c620b3d1b51d9cb7 /x11 | |
| parent | 33007b89e63dba153af8ba9c95e25cc62888e41d (diff) | |
| download | marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.tar marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.tar.gz marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.tar.bz2 marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.tar.lz marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.tar.xz marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.tar.zst marcuscom-ports-69f85091ff9ab52c81c26a8ae24c63c6fce8268f.zip | |
Make libnotify support default to on, and fix Python module detection.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6489 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-applets/Makefile | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index d1d753933..9666c031d 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.119 2006/06/24 06:52:46 marcus Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.120 2006/06/25 06:03:42 marcus Exp $ # PORTNAME= gnome-applets PORTVERSION= 2.15.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -58,7 +58,7 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \ - defined(WITH_LIBNOTIFY) + !defined(WITHOUT_LIBNOTIFY) LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify .endif @@ -94,10 +94,34 @@ PLIST_SUB+= PYTHON="" PLIST_SUB+= PYTHON="@comment " .endif +.if defined(USE_PYTHON) && !defined(DISPLAY) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ + ${X11BASE}/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|malloc.h|stdlib.h|g' \ ${WRKSRC}/libgweather/weather-met.c @${REINPLACE_CMD} -e 's|system-tools-backends|system-tools-backends-2.0|g' \ ${WRKSRC}/configure +.if defined(USE_PYTHON) && !defined(DISPLAY) +pre-configure: + @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 [ -f ${WRKDIR}/.Xvfb.pid ]; then \ + ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ + ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ + fi +.endif + .include <bsd.port.post.mk> |