Update to 0.60:

shared-mime-info 0.60 (2009-02-21)
* Mime-type Changes:
- Add alias for SMIL
- Fix SMIL detection
- Add Annodex mime-type
- Only use .ogg for audio Ogg files
- Fix RDF mime-type
- Oasis mime-type fixes
- Make PICTURES match a picture CD but not "pictures"
- Add alias for application/zip
- Add Microsoft Document Imaging format
- Add magic for 7z archives
- Add cb7 comic book archives
- Add magic for XCF files
- Remove application/x-msi magic
- Add audio/x-gsm mime-type
- Add MS cab mime-type
- Add FictionBook mime-type
- Fix PKCS#12 bundles definition (not text files)
- Add PKCS#7 and PkiPath mime-types
- Add application/vnd.ms-wpl mime-type
- Add more aliases for media types
- Add alias for text/x-csv
- Fix comment for Gnucash files
- Make Javascript a sub-class of C
- Add *.vapi as a glob for Vala files
- Fix image/fits to match IANA
- Add Office 2007/OpenXML documents mime-types
- Add Pocket Word and AportisDoc document types
- Fix MS ICO, and Photoshop image to match IANA

* Other changes:
- Regenerate the pot file when needed
- Some clarifications in the spec
- Build fix when srcdir != builddir

4 files changed, 14 insertions, 29 deletions

diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 7bff0e5c91e..c698404d026 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2008/10/31 14:02:18 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2009/02/23 09:05:02 wiz Exp $
 #
 
-DISTNAME=	shared-mime-info-0.51
-PKGREVISION=	2
+DISTNAME=	shared-mime-info-0.60
 CATEGORIES=	databases
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/shared-mime-info/distinfo b/databases/shared-mime-info/distinfo
index 4a6f7444776..d5a02fc2a3d 100644
--- a/databases/shared-mime-info/distinfo
+++ b/databases/shared-mime-info/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2008/10/16 13:50:44 drochner Exp $
+$NetBSD: distinfo,v 1.16 2009/02/23 09:05:02 wiz Exp $
 
-SHA1 (shared-mime-info-0.51.tar.bz2) = 4428b572e6d0fd1d8cf5d2f3eb887d7ab90e151f
-RMD160 (shared-mime-info-0.51.tar.bz2) = 9e0281f3bd9ac44af60833ec6b15af9f58936cc7
-Size (shared-mime-info-0.51.tar.bz2) = 445565 bytes
+SHA1 (shared-mime-info-0.60.tar.bz2) = 5c071da5a6fca3116ac39a1b06c10d52d85e37ec
+RMD160 (shared-mime-info-0.60.tar.bz2) = b7f781b248c2dd65e51575502fe427f964866e65
+Size (shared-mime-info-0.60.tar.bz2) = 457377 bytes
 SHA1 (patch-aa) = e6fbe84b742034d26ef9d3ae89d271d819656ac2
-SHA1 (patch-ab) = 8b3491881bf3997cad1f667913d27bbf745079c8
-SHA1 (patch-ac) = a851f39fcdcdc94c6d2149b38e9e3f200ee1c052
+SHA1 (patch-ac) = 994591f5256669e5c16702594983bf6422790eb0
diff --git a/databases/shared-mime-info/patches/patch-ab b/databases/shared-mime-info/patches/patch-ab
deleted file mode 100644
index 807f3c78b77..00000000000
--- a/databases/shared-mime-info/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2008/10/16 13:50:44 drochner Exp $
-
---- Makefile.am.orig	2008-07-22 16:49:20.000000000 +0200
-+++ Makefile.am
-@@ -67,8 +67,6 @@ uninstall-hook:
- 	rm -f "$(DESTDIR)$(datadir)/mime/treemagic"
- 	rm -f "$(DESTDIR)$(datadir)/mime/types"
- 
--all: check
--
- check:
- 	@if test -n $(XMLLINT) ; then \
- 		xmllint --noout --valid $(srcdir)/freedesktop.org.xml;	\
diff --git a/databases/shared-mime-info/patches/patch-ac b/databases/shared-mime-info/patches/patch-ac
index 8ff3790c75a..f598a19913d 100644
--- a/databases/shared-mime-info/patches/patch-ac
+++ b/databases/shared-mime-info/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.6 2008/10/16 13:50:44 drochner Exp $
+$NetBSD: patch-ac,v 1.7 2009/02/23 09:05:02 wiz Exp $
 
---- Makefile.in.orig	2008-07-23 12:44:50.000000000 +0200
+--- Makefile.in.orig	2009-02-21 14:50:21.000000000 +0000
 +++ Makefile.in
-@@ -954,8 +954,6 @@ uninstall-hook:
+@@ -955,7 +955,7 @@ uninstall-hook:
  	rm -f "$(DESTDIR)$(datadir)/mime/treemagic"
  	rm -f "$(DESTDIR)$(datadir)/mime/types"
  
 -all: check
--
- check:
- 	@if test -n $(XMLLINT) ; then \
- 		xmllint --noout --valid $(srcdir)/freedesktop.org.xml;	\
++all:
+ 	make -C po shared-mime-info.pot
+ 
+ check: freedesktop.org.xml