* Update to 0.10

* Move to a LOCALBASE PREFIX since gnome-vfs support was removed
* Cleanup leftover mimeinfo.cache files
* Make more portlint-friendly

Approved by:	maintainer (blanket)

5 files changed, 32 insertions, 33 deletions

diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 53d7f8e517f0..8453dbc17329 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -6,45 +6,42 @@
 #
 
 PORTNAME=		desktop-file-utils
-PORTVERSION=		0.9
+PORTVERSION=		0.10
 CATEGORIES=		devel
-MASTER_SITES=		http://www.marcuscom.com/downloads/ \
-			http://freedesktop.org/Software/desktop-file-utils/releases/
+MASTER_SITES=		http://freedesktop.org/software/${PORTNAME}/releases/
+
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		A couple of command line utilities for working with desktop entries
 
 LIB_DEPENDS=		popt:${PORTSDIR}/devel/popt
 
-# This port contains no X program but it might install a GnomeVFS
-# module and thus we need to use the same prefix as GnomeVFS.
-USE_X_PREFIX=		yes
-
 USE_GNOME=		glib20
 WANT_GNOME=		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"
 
-.include <bsd.port.pre.mk>
+PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 
-.if ${HAVE_GNOME:Mgnomevfs2} != ""
-USE_GNOME+=		gnomevfs2
-PLIST_SUB+=		GNOME_VFS=""
-.else
-PLIST_SUB+=		GNOME_VFS="@comment "
-.endif
+MIMEDIRS=		${X11BASE}/share/applications \
+			${LOCALBASE}/share/applications \
+			/usr/share/applications \
+			${X11BASE}/share/gnome/applications \
+			${LOCALBASE}/share/gnome/applications \
+			/usr/share/gnome/applications
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/src/eggdirfuncs.c
+	@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}|' \
+		< ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	-@${PREFIX}/bin/update-desktop-database -q
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index a68f8fb01aba..2295fdca6f40 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (desktop-file-utils-0.9.tar.gz) = d1f3e0ff6681dba1624b3c57a2d60d38
-SIZE (desktop-file-utils-0.9.tar.gz) = 424432
+MD5 (desktop-file-utils-0.10.tar.gz) = 8b930e9ad08ac6b8205dd00a1d694b0c
+SIZE (desktop-file-utils-0.10.tar.gz) = 341508
diff --git a/devel/desktop-file-utils/files/patch-src::menu-method.c b/devel/desktop-file-utils/files/patch-src::menu-method.c
deleted file mode 100644
index 5b16fe8a671c..000000000000
--- a/devel/desktop-file-utils/files/patch-src::menu-method.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/menu-method.c.orig	Fri Jun 11 00:39:02 2004
-+++ src/menu-method.c	Fri Jun 11 00:39:43 2004
-@@ -117,7 +117,7 @@
- 					    GnomeVFSOpenMode          mode,
- 					    FileHandle              **handle,
- 					    gboolean                  exclusive,
--					    unsigned int              perms);
-+					    mode_t                    perms);
- static void           file_handle_unref    (FileHandle               *handle);
- static GnomeVFSResult file_handle_read     (FileHandle               *handle,
- 					    gpointer                  buffer,
diff --git a/devel/desktop-file-utils/files/pkg-deinstall.in b/devel/desktop-file-utils/files/pkg-deinstall.in
new file mode 100644
index 000000000000..253e5484adae
--- /dev/null
+++ b/devel/desktop-file-utils/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove leftover mimeinfo.cache files.
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+
+for mdir in %%MIMEDIRS%%; do
+    if [ -f ${mdir}/mimeinfo.cache ]; then
+	rm -f ${mdir}/mimeinfo.cache
+    fi
+done
+
+exit 0
diff --git a/devel/desktop-file-utils/pkg-plist b/devel/desktop-file-utils/pkg-plist
index e941c49fa615..21d4a16e2a2e 100644
--- a/devel/desktop-file-utils/pkg-plist
+++ b/devel/desktop-file-utils/pkg-plist
@@ -1,9 +1,5 @@
 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.so
 share/emacs/site-lisp/desktop-entry-mode.el
 @exec %D/bin/update-desktop-database -q || /usr/bin/true