summaryrefslogtreecommitdiffstats
path: root/x11/gnome-panel
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-01-23 13:57:56 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-01-23 13:57:56 +0800
commit778d43e6d51656d328d64f719de497f7a100248b (patch)
treebe545bd1e828ecd3a51e01fee8c73ce8ff914505 /x11/gnome-panel
parent00112abc4df76af375563c27cdf59446c3cf49ff (diff)
downloadmarcuscom-ports-778d43e6d51656d328d64f719de497f7a100248b.tar.gz
marcuscom-ports-778d43e6d51656d328d64f719de497f7a100248b.tar.zst
marcuscom-ports-778d43e6d51656d328d64f719de497f7a100248b.zip
Allow the clock apple to find the libgweather Locations.xml file.
Reported by: sajd on #freebsd-gnome git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10218 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-panel')
-rw-r--r--x11/gnome-panel/Makefile6
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_gweather-xml.c11
2 files changed, 15 insertions, 2 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 09ce99a1e..4489e6777 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.165 2008/01/20 19:06:44 marcus Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.166 2008/01/20 19:47:43 marcus Exp $
#
PORTNAME= gnome-panel
PORTVERSION= 2.21.5
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -71,6 +71,8 @@ post-patch:
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|"applications.menu"|"gnome-applications.menu"|'
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+ ${WRKSRC}/applets/clock/gweather-xml.c
.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
( ${OSVERSION} < 503101 )
.for po in da.po it.po zh_CN.po zh_TW.po
diff --git a/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c
new file mode 100644
index 000000000..7ae87fdd3
--- /dev/null
+++ b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c
@@ -0,0 +1,11 @@
+--- applets/clock/gweather-xml.c.orig 2008-01-23 00:51:33.000000000 -0500
++++ applets/clock/gweather-xml.c 2008-01-23 00:52:35.000000000 -0500
+@@ -359,7 +359,7 @@ gweather_xml_load_locations( GtkTreeView
+ #ifdef GWEATHER_XML_LOCATION
+ xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml");
+ #else
+- xml = xmlNewTextReaderFilename ("/usr/share/gnome-applets/gweather/Locations.xml");
++ xml = xmlNewTextReaderFilename ("/usr/local/share/libgweather/Locations.xml");
+ #endif
+ if( xml == NULL )
+ goto error_out;