4 files changed, 30 insertions, 5 deletions

diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index fc7294083a09..570a6895c23e 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		desktop-file-utils
-PORTVERSION=		0.6
+PORTVERSION=		0.7
 CATEGORIES=		devel
 MASTER_SITES=		http://freedesktop.org/Software/desktop-file-utils/releases/
 
@@ -21,8 +21,10 @@ USE_X_PREFIX=		yes
 
 USE_GNOME=		glib20
 WANT_GNOME=		yes
-GNU_CONFIGURE=		yes
+USE_REINPLACE=		yes
+USE_LIBTOOL_VER=	15
 
+CONFIGURE_ARGS=		--with-lispdir=${PREFIX}/share/emacs/site-lisp
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -35,4 +37,14 @@ PLIST_SUB+=		GNOME_VFS=""
 PLIST_SUB+=		GNOME_VFS="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/src/eggdirfuncs.c
+
+post-install:
+.if !defined(PACKAGE_BUILDING)
+	-@${PREFIX}/bin/update-desktop-database -q
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index 3a2f3df10f35..264c66a82a05 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (desktop-file-utils-0.6.tar.gz) = dcace3294470e9cdc9ebfe7de1881ece
-SIZE (desktop-file-utils-0.6.tar.gz) = 386988
+MD5 (desktop-file-utils-0.7.tar.gz) = 32b948c2676170dc01ac4849c00bc5d6
+SIZE (desktop-file-utils-0.7.tar.gz) = 415348
diff --git a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c
new file mode 100644
index 000000000000..13db021e7ba8
--- /dev/null
+++ b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c
@@ -0,0 +1,11 @@
+--- src/eggdirfuncs.c.orig	Sat Jul 24 01:53:05 2004
++++ src/eggdirfuncs.c	Sat Jul 24 01:53:31 2004
+@@ -106,7 +106,7 @@
+   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+ 
+   if (!data_dirs || !data_dirs[0])
+-    data_dirs = (char *) "/usr/local/share/:/usr/share/";
++    data_dirs = (char *) "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
+ 
+   data_dir_vector = g_strsplit (data_dirs, ":", 0);
+ 
diff --git a/devel/desktop-file-utils/pkg-plist b/devel/desktop-file-utils/pkg-plist
index 3a19b3483d1c..e941c49fa615 100644
--- a/devel/desktop-file-utils/pkg-plist
+++ b/devel/desktop-file-utils/pkg-plist
@@ -1,7 +1,9 @@
 bin/desktop-file-install
 bin/desktop-file-validate
 bin/desktop-menu-tool
+bin/update-desktop-database
 %%GNOME_VFS%%etc/gnome-vfs-2.0/modules/menu-modules.conf
 %%GNOME_VFS%%lib/gnome-vfs-2.0/modules/libmenu.a
-%%GNOME_VFS%%lib/gnome-vfs-2.0/modules/libmenu.la
 %%GNOME_VFS%%lib/gnome-vfs-2.0/modules/libmenu.so
+share/emacs/site-lisp/desktop-entry-mode.el
+@exec %D/bin/update-desktop-database -q || /usr/bin/true