diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-05 03:40:04 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-02-05 03:40:04 +0800 |
| commit | 91e70f8d0419917795ac440c4907910de1355f93 (patch) | |
| tree | 3592d4c5414c8d4c893f79938db6b6bbe48066c5 | |
| parent | f4253288b35b1554ef8b4450f8e585941ce257e0 (diff) | |
| download | marcuscom-ports-91e70f8d0419917795ac440c4907910de1355f93.tar.gz marcuscom-ports-91e70f8d0419917795ac440c4907910de1355f93.tar.zst marcuscom-ports-91e70f8d0419917795ac440c4907910de1355f93.zip | |
Update to 2.13.90.1, and use a robust Xvfb solution to get this port to build
without a DISPLAY.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5614 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | deskutils/deskbar-applet/Makefile | 29 | ||||
| -rw-r--r-- | deskutils/deskbar-applet/distinfo | 6 | ||||
| -rw-r--r-- | deskutils/deskbar-applet/pkg-plist | 4 |
3 files changed, 33 insertions, 6 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 31757721d..9fbfc6b66 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD: ports/deskutils/deskbar-applet/Makefile,v 1.8 2006/01/17 06:11:44 marcus Exp $ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.6 2006/01/31 19:48:08 marcus Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.7 2006/01/31 20:36:47 marcus Exp $ # PORTNAME= deskbar-applet -PORTVERSION= 2.13.90 +PORTVERSION= 2.13.90.1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.13 @@ -33,7 +33,7 @@ OPTIONS= EVO "Enable evolution support" on .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -BROKEN= "Does not build on 4.X" +BROKEN= Does not build on 4.X .endif .if !defined(WITHOUT_EVO) @@ -44,6 +44,13 @@ CONFIGURE_ARGS+=--disable-evolution PLIST_SUB+= EVO="@comment " .endif +.if !defined(DISPLAY) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} +.if !defined(PACKAGE_BUILDING) +CONFIGURE_ENV+= DISPLAY="localhost:1001" +.endif +.endif + post-patch: @${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/share/applications|${X11BASE}/share/gnome/applications|g' @@ -51,4 +58,20 @@ post-patch: s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/deskbar/Utils.py +.if !defined(DISPLAY) +pre-configure: +.if exists(${WRKDIR}/.Xvfb.pid) + @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill + @${RM} -f ${WRKDIR}/.Xvfb.pid +.endif + ${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 +.endif + .include <bsd.port.post.mk> diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo index 6c6865f60..7a631ae7f 100644 --- a/deskutils/deskbar-applet/distinfo +++ b/deskutils/deskbar-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/deskbar-applet-2.13.90.tar.bz2) = fe8c47c622589a8b1e857ab6a2b0cd1b -SHA256 (gnome2/deskbar-applet-2.13.90.tar.bz2) = ae5423f0899e5c9f8d2f20a286ef56aea856bc837d7c50443cd2e72095f00641 -SIZE (gnome2/deskbar-applet-2.13.90.tar.bz2) = 454410 +MD5 (gnome2/deskbar-applet-2.13.90.1.tar.bz2) = 2854ec4881c39189ff2a01346d7b8f97 +SHA256 (gnome2/deskbar-applet-2.13.90.1.tar.bz2) = 8aabb5ea9f22af767dd719cd9e04e53735089f6afbf126c4dec0d8a92a682965 +SIZE (gnome2/deskbar-applet-2.13.90.1.tar.bz2) = 456557 diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist index d0866f95b..2bdaddfd2 100644 --- a/deskutils/deskbar-applet/pkg-plist +++ b/deskutils/deskbar-applet/pkg-plist @@ -47,6 +47,9 @@ lib/deskbar-applet/handlers/volumes.pyo lib/deskbar-applet/handlers/web_address.py lib/deskbar-applet/handlers/web_address.pyc lib/deskbar-applet/handlers/web_address.pyo +lib/deskbar-applet/handlers/yahoo.py +lib/deskbar-applet/handlers/yahoo.pyc +lib/deskbar-applet/handlers/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.py %%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyc %%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyo @@ -168,6 +171,7 @@ share/gnome/deskbar-applet/art/deskbar-applet.svg share/gnome/deskbar-applet/art/folder-bookmark.png share/gnome/deskbar-applet/art/generic.png share/gnome/deskbar-applet/art/google.png +share/gnome/deskbar-applet/art/yahoo.png share/gnome/deskbar-applet/prefs-dialog.glade share/gnome/deskbar-applet/smart-bookmarks.glade share/gnome/pixmaps/deskbar-applet.svg |