Update to 0.10:

o Remove all menus code (Mark McLoughlin)
o Don't try and add key/value pairs to comments (Miloslav Trmac)

5 files changed, 12 insertions, 27 deletions

diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile
index a97b51748c8..c5f596e4bb0 100644
--- a/sysutils/desktop-file-utils/Makefile
+++ b/sysutils/desktop-file-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/12/05 09:38:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/03 21:43:07 jmmv Exp $
 #
 
-DISTNAME=	desktop-file-utils-0.9
+DISTNAME=	desktop-file-utils-0.10
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://freedesktop.org/software/desktop-file-utils/releases/
 
diff --git a/sysutils/desktop-file-utils/PLIST b/sysutils/desktop-file-utils/PLIST
index a54c0d32cc1..dbec0586c9e 100644
--- a/sysutils/desktop-file-utils/PLIST
+++ b/sysutils/desktop-file-utils/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/21 17:03:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/03 21:43:07 jmmv Exp $
 bin/desktop-file-install
 bin/desktop-file-validate
-bin/desktop-menu-tool
 bin/update-desktop-database
 @comment in INSTALL script: share/applications/mimeinfo.cache
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/sysutils/desktop-file-utils/distinfo b/sysutils/desktop-file-utils/distinfo
index e63a3ee7047..90664a80106 100644
--- a/sysutils/desktop-file-utils/distinfo
+++ b/sysutils/desktop-file-utils/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/12/05 09:38:02 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2005/01/03 21:43:07 jmmv Exp $
 
-SHA1 (desktop-file-utils-0.9.tar.gz) = 5e8e282625179975fe5c0f96ac262aa853aa3814
-Size (desktop-file-utils-0.9.tar.gz) = 424432 bytes
-SHA1 (patch-aa) = c1735afe417865a755da948698f58e448230cf90
-SHA1 (patch-ab) = ebd5c0525c4e0894f2880682862aeeb76a528f04
+SHA1 (desktop-file-utils-0.10.tar.gz) = e534223872b928ce4b58518d56a8bd883bb60a82
+Size (desktop-file-utils-0.10.tar.gz) = 341508 bytes
+SHA1 (patch-ab) = cc26f1936bf39ea4006df9245c1383f9d7588bd9
diff --git a/sysutils/desktop-file-utils/patches/patch-aa b/sysutils/desktop-file-utils/patches/patch-aa
deleted file mode 100644
index 2d384c25c5d..00000000000
--- a/sysutils/desktop-file-utils/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/09/21 17:03:54 jmmv Exp $
-
---- src/Makefile.in.orig	2004-07-22 08:52:29.000000000 +0200
-+++ src/Makefile.in
-@@ -243,7 +243,7 @@ EXTRA_DIST = \
- 
- @HAVE_GNOME_VFS_TRUE@module_flags = -export_dynamic -avoid-version
- 
--@HAVE_GNOME_VFS_TRUE@modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-+@HAVE_GNOME_VFS_TRUE@modulesconfdir = $(datadir)/examples/@PACKAGE@
- @HAVE_GNOME_VFS_TRUE@modulesconf_DATA = menu-modules.conf
- 
- @HAVE_GNOME_VFS_TRUE@modulesdir = $(libdir)/gnome-vfs-2.0/modules
diff --git a/sysutils/desktop-file-utils/patches/patch-ab b/sysutils/desktop-file-utils/patches/patch-ab
index 8abdf394b42..7e5d0da4125 100644
--- a/sysutils/desktop-file-utils/patches/patch-ab
+++ b/sysutils/desktop-file-utils/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/09/21 17:03:54 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/03 21:43:07 jmmv Exp $
 
---- Makefile.in.orig	2004-07-22 08:52:29.000000000 +0200
+--- Makefile.in.orig	2004-11-11 16:14:17.000000000 +0100
 +++ Makefile.in
-@@ -143,7 +143,7 @@ sbindir = @sbindir@
+@@ -138,7 +138,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--SUBDIRS = src test misc
-+SUBDIRS = src test
+-SUBDIRS = src misc
++SUBDIRS = src
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs