diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-20 22:08:23 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-20 22:08:23 +0000 |
| commit | ca0d7739437d8179095a364781dca0706918b154 (patch) | |
| tree | 9a5d11694e7c45a81dd017bafe7f4fd5a9d01202 /deskutils | |
| parent | - Fix build with sql enabled (diff) | |
Remove support for a separate X11BASE.
Approved by: portmgr (implicit)
Notes
Notes:
svn path=/head/; revision=191580
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/deskbar-applet/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/deskbar-applet/files/patch-deskbar_Utils.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 9887d170ba7f..1073f5aac0f4 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -8,7 +8,7 @@ PORTNAME= deskbar-applet PORTVERSION= 2.18.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -59,7 +59,7 @@ post-patch: @${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \ 's|/usr/share/applications|${LOCALBASE}/share/gnome/applications|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/deskbar/handlers/mozilla.py \ ${WRKSRC}/deskbar/Utils.py diff --git a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py index 773c8e15ae77..4c68b77664cc 100644 --- a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py +++ b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py @@ -5,7 +5,7 @@ sysdirs = os.getenv("XDG_DATA_DIRS") if sysdirs == None: - sysdirs = "/usr/local/share:/usr/share" -+ sysdirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/" ++ sysdirs = "/usr/local/share/gnome:/usr/local/share:/usr/share" dirs = "%s:%s" % (dirs, sysdirs) return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)] |