diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index eb749bd852e..fd45b966bc3 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2006/12/16 12:22:33 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2007/03/20 06:43:49 jasper Exp $
 
 COMMENT=	"utilities for 'desktop' entries"
 
-VERSION=	0.10
-DISTNAME=	desktop-file-utils-${VERSION}
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	desktop-file-utils-0.12
 CATEGORIES=	devel
 
 HOMEPAGE=	http://freedesktop.org/wiki/Software_2fdesktop_2dfile_2dutils
@@ -20,16 +18,11 @@ MASTER_SITES=	http://freedesktop.org/software/desktop-file-utils/releases/
 
 MODULES=	devel/gettext	
 
-LIB_DEPENDS=	glib-2.0::devel/glib2 \
-		popt.>=0.3::devel/popt
+LIB_DEPENDS=	glib-2.0::devel/glib2
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-# This port has "/usr/local" hardcoded, we prefer ${LOCALBASE}
-pre-build:
-	perl -pi -e "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/src/eggdirfuncs.c
-
 .include <bsd.port.mk>
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
index 3071ed7c9c6..9ea59636ca1 100644
--- a/devel/desktop-file-utils/distinfo
+++ b/devel/desktop-file-utils/distinfo
@@ -1,4 +1,5 @@
-MD5 (desktop-file-utils-0.10.tar.gz) = 8b930e9ad08ac6b8205dd00a1d694b0c
-RMD160 (desktop-file-utils-0.10.tar.gz) = 659b3ca496522f922fdc243a222f6ca81fc85ebe
-SHA1 (desktop-file-utils-0.10.tar.gz) = e534223872b928ce4b58518d56a8bd883bb60a82
-SIZE (desktop-file-utils-0.10.tar.gz) = 341508
+MD5 (desktop-file-utils-0.12.tar.gz) = 335b91ec70ea1c08f87dfde8c5926e7b
+RMD160 (desktop-file-utils-0.12.tar.gz) = 64bd0c3d12efcde17258382e818d2ab970ff3b58
+SHA1 (desktop-file-utils-0.12.tar.gz) = 79baee7f390665fcaa2a663aa1e48ce6f7fb9a8e
+SHA256 (desktop-file-utils-0.12.tar.gz) = 7db6ade355d56913cecd098a5bec1037bca42e7c7e4b7257c7f7f9f655c5e606
+SIZE (desktop-file-utils-0.12.tar.gz) = 348418
diff --git a/devel/desktop-file-utils/patches/patch-src_eggdirfuncs_c b/devel/desktop-file-utils/patches/patch-src_eggdirfuncs_c
deleted file mode 100644
index dfbe7df8df3..00000000000
--- a/devel/desktop-file-utils/patches/patch-src_eggdirfuncs_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_eggdirfuncs_c,v 1.1.1.1 2005/04/12 21:09:45 marcm Exp $
---- src/eggdirfuncs.c.orig	Mon Dec 27 17:15:00 2004
-+++ src/eggdirfuncs.c	Mon Dec 27 17:15:54 2004
-@@ -106,7 +106,7 @@ egg_get_secondary_data_dirs (void)
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = "/usr/local/share/";
- 
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
- 
diff --git a/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c b/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c
index f916ca94d68..1aa2fd4e30e 100644
--- a/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c
+++ b/devel/desktop-file-utils/patches/patch-src_update-desktop-database_c
@@ -1,15 +1,15 @@
-$OpenBSD: patch-src_update-desktop-database_c,v 1.1.1.1 2005/04/12 21:09:45 marcm Exp $
---- src/update-desktop-database.c.orig	Mon Dec 27 22:02:16 2004
-+++ src/update-desktop-database.c	Mon Dec 27 22:15:55 2004
-@@ -37,6 +37,7 @@
- #include "eggintl.h"
+$OpenBSD: patch-src_update-desktop-database_c,v 1.2 2007/03/20 06:43:49 jasper Exp $
+--- src/update-desktop-database.c.orig	Tue Mar 20 07:35:09 2007
++++ src/update-desktop-database.c	Tue Mar 20 07:36:02 2007
+@@ -34,6 +34,7 @@
+ #include <glib/gi18n.h>
  
  #define NAME "update-desktop-database"
 +#define DB_DIR "/var/db/gnome/applications/"
  #define CACHE_FILENAME "mimeinfo.cache"
  #define TEMP_CACHE_FILENAME_PREFIX ".mimeinfo.cache.XXXXXX"
  
-@@ -310,7 +311,7 @@ open_temp_cache_file (const char *dir, c
+@@ -305,7 +306,7 @@ open_temp_cache_file (const char *dir, c
    FILE *fp;
    mode_t mask;
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-src_update-desktop-database_c,v 1.1.1.1 2005/04/12 21:09:45 marc
    fd = g_mkstemp (file);
  
    if (fd < 0) 
-@@ -391,7 +392,7 @@ sync_database (const char *dir, GError *
+@@ -387,7 +388,7 @@ sync_database (const char *dir, GError *
  
    fclose (tmp_file);