Update to 0.8.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5010 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 19 insertions, 25 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1581c1934..f56d96742 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.2 2005/10/31 07:49:53 marcus Exp $
+#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.3 2005/10/31 08:24:28 marcus Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	browserbookapp
@@ -21,6 +20,7 @@ USE_GNOME=	gnomeprefix gnomehack pygnomeextras
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
+USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--disable-beagle
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -42,5 +42,8 @@ PLIST_SUB+=	EVO="@comment "
 post-patch:
 	@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/share/applications|${X11BASE}/share/gnome/applications|g'
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/deskbar/handler_utils.py
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 8584d44ac..2b7fdc93c 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,2 +1,2 @@
-MD5 (deskbar-applet-0.8.3.tar.gz) = b9f0b7d427527f7ff449c5b5a47cf028
-SIZE (deskbar-applet-0.8.3.tar.gz) = 465098
+MD5 (deskbar-applet-0.8.4.tar.gz) = 590ac908dd8890aef9492aabf0a0c78a
+SIZE (deskbar-applet-0.8.4.tar.gz) = 465903
diff --git a/deskutils/deskbar-applet/files/patch-data_Makefile.in b/deskutils/deskbar-applet/files/patch-data_Makefile.in
deleted file mode 100644
index 3d58f2ad1..000000000
--- a/deskutils/deskbar-applet/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/Makefile.in.orig	Mon Oct 31 02:23:26 2005
-+++ data/Makefile.in	Mon Oct 31 02:25:02 2005
-@@ -281,8 +281,6 @@
- 	prefs-dialog.glade
- 
- deskbarbindir = $(libdir)/deskbar-applet
--GCONF_CONFIG_SOURCE = $(GCONF_SCHEMA_CONFIG_SOURCE) \
--                gconftool-2 --makefile-install-rule $(schema_DATA)
- 
- DISTCLEANFILES = \
- 	$(schema_DATA) \
-@@ -696,6 +694,8 @@
- 	sed -e "s|\@LIBEXECDIR\@|$(deskbarbindir)|" $< > $@
- 
- install-data-local:
-+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-+                gconftool-2 --makefile-install-rule $(schema_DATA)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py b/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py
new file mode 100644
index 000000000..8173fc2d0
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py
@@ -0,0 +1,11 @@
+--- deskbar/handler_utils.py.orig	Tue Nov  1 20:32:51 2005
++++ deskbar/handler_utils.py	Tue Nov  1 20:33:08 2005
+@@ -10,7 +10,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/"
+ 	
+ 	dirs = "%s:%s" % (dirs, sysdirs)
+ 	return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]