summaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2006-07-23 04:35:15 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2006-07-23 04:35:15 +0800
commitf1afabc4aef9dc7955d0971012e2fdedf1c930b3 (patch)
tree13e3afab52caa4f7c359a4d63e0187ccd1f28529 /deskutils
parent67054b4dd707068865ffe7f805db109742db357e (diff)
downloadmarcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.tar
marcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.tar.gz
marcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.tar.bz2
marcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.tar.lz
marcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.tar.xz
marcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.tar.zst
marcuscom-ports-f1afabc4aef9dc7955d0971012e2fdedf1c930b3.zip
Fix up a few of X11BASE -> LOCALBASE for share/gnome/applications and
chase mozilla/firefox living in LOCALBASE now. Bump the PORTREVISION. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6693 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/deskbar-applet/Makefile7
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py4
2 files changed, 6 insertions, 5 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1de8df712..99d5543e8 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.31 2006/07/11 01:32:30 ahze Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.32 2006/07/21 20:46:54 mezz Exp $
#
PORTNAME= deskbar-applet
PORTVERSION= 2.15.4
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -56,9 +57,9 @@ CONFIGURE_ENV+= DISPLAY="localhost:1001"
post-patch:
@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|/usr/share/applications|${X11BASE}/share/gnome/applications|g'
+ 's|/usr/share/applications|${LOCALBASE}/share/gnome/applications|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
+ s|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/deskbar/handlers/mozilla.py \
${WRKSRC}/deskbar/Utils.py
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
index a668777c1..ffad36e44 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
@@ -4,7 +4,7 @@
get_firefox_home_file("searchplugins"),
get_firefox_home_file("search"),
expanduser("~/.mozilla/searchplugins"),
-+ "%%X11BASE%%/lib/firefox/searchplugins",
++ "%%LOCALBASE%%/lib/firefox/searchplugins",
"/usr/lib/firefox/searchplugins",
"/usr/local/lib/firefox/searchplugins",
"/usr/lib/mozilla-firefox/searchplugins",
@@ -12,7 +12,7 @@
smart_dirs = [
get_mozilla_home_file("search"),
expanduser("~/.mozilla/searchplugins"),
-+ "%%X11BASE%%/lib/mozilla/searchplugins",
++ "%%LOCALBASE%%/lib/mozilla/searchplugins",
"/usr/lib/mozilla/searchplugins",
"/usr/local/lib/mozilla/searchplugins"]