4 files changed, 40 insertions, 7 deletions

diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index eb329bd14544..c5431ed30ac1 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -1,9 +1,9 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#   $MCom: ports/devel/desktop-file-utils/Makefile,v 1.8 2007/09/07 20:22:45 mezz Exp $
+#   $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	desktop-file-utils
-PORTVERSION=	0.18
+PORTVERSION=	0.21
 CATEGORIES=	devel
 MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/
 
@@ -12,7 +12,7 @@ COMMENT=	A couple of command line utilities for working with desktop entries
 
 USES=		pkgconfig gettext
 USE_GNOME=	glib20
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-lispdir
@@ -20,8 +20,8 @@ CONFIGURE_ENV=	EMACS="no"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		desktop-file-install.1 desktop-file-validate.1 \
-		update-desktop-database.1
+MAN1=		desktop-file-edit.1 desktop-file-install.1 \
+		desktop-file-validate.1 update-desktop-database.1
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index 886daad4b210..b5a1c818bff1 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (desktop-file-utils-0.18.tar.bz2) = d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231
-SIZE (desktop-file-utils-0.18.tar.bz2) = 256340
+SHA256 (desktop-file-utils-0.21.tar.xz) = b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b
+SIZE (desktop-file-utils-0.21.tar.xz) = 128972
diff --git a/devel/desktop-file-utils/files/patch-src_update-desktop-database.c b/devel/desktop-file-utils/files/patch-src_update-desktop-database.c
new file mode 100644
index 000000000000..793083cafdd8
--- /dev/null
+++ b/devel/desktop-file-utils/files/patch-src_update-desktop-database.c
@@ -0,0 +1,32 @@
+From f0a269e1d65843822915faa1bb020da8b6b9954c Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Mon, 07 Jan 2013 08:02:08 +0000
+Subject: update-desktop-database: List only once a desktop file per mime type
+
+If a desktop file is registering the same mime type more than once
+(useless but okay), the desktop file was listed more than once for that
+mime type in mimeinfo.cache.
+
+It's easy to avoid, so make sure we only have a desktop file once per
+mime type.
+---
+diff --git a/src/update-desktop-database.c b/src/update-desktop-database.c
+index ffc1440..7f48357 100644
+--- src/update-desktop-database.c
++++ src/update-desktop-database.c
+@@ -83,6 +83,13 @@ cache_desktop_file (const char  *desktop_file,
+ 
+   desktop_files = (GList *) g_hash_table_lookup (mime_types_map, mime_type);
+ 
++  /* do not add twice a desktop file mentioning the mime type more than once
++   * (no need to use g_list_find() because we cache all mime types registered
++   * by a desktop file before moving to another desktop file) */
++  if (desktop_files &&
++      strcmp (desktop_file, (const char *) desktop_files->data) == 0)
++    return;
++
+   desktop_files = g_list_prepend (desktop_files, g_strdup (desktop_file));
+   g_hash_table_insert (mime_types_map, g_strdup (mime_type), desktop_files);
+ }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/devel/desktop-file-utils/pkg-plist b/devel/desktop-file-utils/pkg-plist
index 18d19eb05954..ea1ca1207e7c 100644
--- a/devel/desktop-file-utils/pkg-plist
+++ b/devel/desktop-file-utils/pkg-plist
@@ -1,3 +1,4 @@
+bin/desktop-file-edit
 bin/desktop-file-install
 bin/desktop-file-validate
 bin/update-desktop-database