revert to 0.30 -- 0.40 appears to be incompatible with gnome-vfs at least

6 files changed, 23 insertions, 25 deletions

diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 4c2c9a05faa..8bc09a84603 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2008/06/21 17:26:53 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2008/06/23 15:58:05 drochner Exp $
 #
 
-DISTNAME=	shared-mime-info-0.40
+DISTNAME=	shared-mime-info-0.30
 CATEGORIES=	databases
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/shared-mime-info/PLIST b/databases/shared-mime-info/PLIST
index 4f0a5f5ddfe..d87f2e9ff36 100644
--- a/databases/shared-mime-info/PLIST
+++ b/databases/shared-mime-info/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2008/06/21 17:26:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/06/23 15:58:05 drochner Exp $
 bin/update-mime-database
 man/man1/update-mime-database.1
 share/locale/az/LC_MESSAGES/shared-mime-info.mo
-share/locale/be@latin/LC_MESSAGES/shared-mime-info.mo
 share/locale/bg/LC_MESSAGES/shared-mime-info.mo
 share/locale/ca/LC_MESSAGES/shared-mime-info.mo
 share/locale/cs/LC_MESSAGES/shared-mime-info.mo
@@ -16,7 +15,6 @@ share/locale/es/LC_MESSAGES/shared-mime-info.mo
 share/locale/eu/LC_MESSAGES/shared-mime-info.mo
 share/locale/fi/LC_MESSAGES/shared-mime-info.mo
 share/locale/fr/LC_MESSAGES/shared-mime-info.mo
-share/locale/ga/LC_MESSAGES/shared-mime-info.mo
 share/locale/hu/LC_MESSAGES/shared-mime-info.mo
 share/locale/it/LC_MESSAGES/shared-mime-info.mo
 share/locale/ja/LC_MESSAGES/shared-mime-info.mo
diff --git a/databases/shared-mime-info/distinfo b/databases/shared-mime-info/distinfo
index c19bebb36da..520bd595436 100644
--- a/databases/shared-mime-info/distinfo
+++ b/databases/shared-mime-info/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2008/06/21 17:26:53 wiz Exp $
+$NetBSD: distinfo,v 1.14 2008/06/23 15:58:05 drochner Exp $
 
-SHA1 (shared-mime-info-0.40.tar.bz2) = 3d73f96c99fa9576db845bfaf2a6156f7a916668
-RMD160 (shared-mime-info-0.40.tar.bz2) = a0ca15090e440ee2d7d9be396b9a7f500d8bda5f
-Size (shared-mime-info-0.40.tar.bz2) = 447145 bytes
-SHA1 (patch-aa) = 9b5b164b9c7699bfa0ced41206dfee41d80aacee
-SHA1 (patch-ab) = 73957d4c12bc0e8d8bad0382756ed399673a9274
-SHA1 (patch-ac) = a1ca92175fa1b4edc1c174f4edca3d114c0b518f
+SHA1 (shared-mime-info-0.30.tar.bz2) = 509296f035898877b47eb2a36bdfca83a6d15bfc
+RMD160 (shared-mime-info-0.30.tar.bz2) = 8dd8f3dedf18f061b42079d184163390e85e9de8
+Size (shared-mime-info-0.30.tar.bz2) = 495538 bytes
+SHA1 (patch-aa) = e6fbe84b742034d26ef9d3ae89d271d819656ac2
+SHA1 (patch-ab) = 49f17419a552d31908b30a128a675729f2d179a9
+SHA1 (patch-ac) = 8d7688c6af3e3f667d0f2d0adad89d10a5b3dc81
diff --git a/databases/shared-mime-info/patches/patch-aa b/databases/shared-mime-info/patches/patch-aa
index f52d65e499f..aee5a742e84 100644
--- a/databases/shared-mime-info/patches/patch-aa
+++ b/databases/shared-mime-info/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2008/06/21 17:26:53 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2008/06/23 15:58:05 drochner Exp $
 
---- update-mime-database.c.orig	2008-06-09 09:09:49.000000000 +0000
+--- update-mime-database.c.orig	2007-06-27 21:46:53.000000000 +0200
 +++ update-mime-database.c
-@@ -1624,7 +1624,7 @@ static void check_in_path_xdg_data(const
+@@ -1510,7 +1510,7 @@ static void check_in_path_xdg_data(const
  
  	env = getenv("XDG_DATA_DIRS");
  	if (!env)
diff --git a/databases/shared-mime-info/patches/patch-ab b/databases/shared-mime-info/patches/patch-ab
index 115c0acf234..5c46c0747dc 100644
--- a/databases/shared-mime-info/patches/patch-ab
+++ b/databases/shared-mime-info/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.6 2008/06/21 17:26:53 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2008/06/23 15:58:05 drochner Exp $
 
 Don't force a build of the PO files, they need newer gettext versions.
 
---- Makefile.am.orig	2008-06-11 18:24:50.000000000 +0000
+--- Makefile.am.orig	2008-05-12 16:36:23.000000000 +0200
 +++ Makefile.am
-@@ -60,8 +60,6 @@ uninstall-hook:
- 	rm -f "$(DESTDIR)$(datadir)/mime/generic-icons"
- 	rm -f "$(DESTDIR)$(datadir)/mime/globs2"
+@@ -56,8 +56,6 @@ uninstall-hook:
+ 	rm -f "$(DESTDIR)$(datadir)/mime/mime-cache"
+ 	rm -f "$(DESTDIR)$(datadir)/mime/XMLnamespaces"
  
 -all: check
 -
diff --git a/databases/shared-mime-info/patches/patch-ac b/databases/shared-mime-info/patches/patch-ac
index 167b8b8a8f5..bfe3dedcd80 100644
--- a/databases/shared-mime-info/patches/patch-ac
+++ b/databases/shared-mime-info/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2008/06/21 17:26:53 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2008/06/23 15:58:05 drochner Exp $
 
 Don't force a build of the PO files, they need newer gettext versions.
 
---- Makefile.in.orig	2008-06-11 18:24:52.000000000 +0000
+--- Makefile.in.orig	2008-05-12 17:26:26.000000000 +0200
 +++ Makefile.in
-@@ -920,8 +920,6 @@ uninstall-hook:
- 	rm -f "$(DESTDIR)$(datadir)/mime/generic-icons"
- 	rm -f "$(DESTDIR)$(datadir)/mime/globs2"
+@@ -916,8 +916,6 @@ uninstall-hook:
+ 	rm -f "$(DESTDIR)$(datadir)/mime/mime-cache"
+ 	rm -f "$(DESTDIR)$(datadir)/mime/XMLnamespaces"
  
 -all: check
 -