diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-21 06:03:10 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-21 06:03:10 +0800 |
commit | 57727e912ce3a82fa5f8ba9438237937cffea880 (patch) | |
tree | 6750339edc1ff447fbd010f140bac2b0739d1c78 /deskutils | |
parent | 3e34caa392ce0dfb72dd4d117c6efe6050df6186 (diff) | |
download | marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.gz marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.bz2 marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.lz marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.xz marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.zst marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.zip |
Remove support for a separate X11BASE.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8891 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/deskbar-applet/Makefile | 6 | ||||
-rw-r--r-- | deskutils/deskbar-applet/files/patch-deskbar_Utils.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 78b94e939..120ff2de4 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.56 2007/04/28 05:39:15 marcus Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.57 2007/05/19 21:36:01 marcus Exp $ # PORTNAME= deskbar-applet PORTVERSION= 2.18.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -57,7 +57,7 @@ CONFIGURE_ENV+= DISPLAY="localhost:1001" post-patch: @${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 9f896130e..5fffd29d7 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 = "/usr/local/share/:%%X11BASE%%/share/" ++ sysdirs = "/usr/local/share" dirs = "%s:%s" % (dirs, sysdirs) return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)] |