Sync with FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9374 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 27 insertions, 13 deletions

diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index d005d2bf9..41e34f5c3 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -3,12 +3,12 @@
 # Whom:                olgeni@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.9 2007/07/04 15:52:38 mezz Exp $
+#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.10 2007/07/23 16:29:58 mezz Exp $
 #
 
 PORTNAME=	shared-mime-info
-PORTVERSION=	0.21
-PORTREVISION=	4
+PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo
index 4bdabec01..4ffc0f66e 100644
--- a/misc/shared-mime-info/distinfo
+++ b/misc/shared-mime-info/distinfo
@@ -1,3 +1,3 @@
-MD5 (shared-mime-info-0.21.tar.bz2) = e1965e129a473683ba395ebc02206367
-SHA256 (shared-mime-info-0.21.tar.bz2) = 135a36a3d8b14742a569f4fc3fa7c51b709f676f1aad569d6f0e6c0eedf61214
-SIZE (shared-mime-info-0.21.tar.bz2) = 439533
+MD5 (shared-mime-info-0.22.tar.bz2) = b3b4b45ef3f76f720fd0c389f131dd4c
+SHA256 (shared-mime-info-0.22.tar.bz2) = d933caa25caacd57dc8b37f68d222acec3ba3c9d076828d34f006499f6301fb2
+SIZE (shared-mime-info-0.22.tar.bz2) = 417120
diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c
index d591c7c9e..045f753d2 100644
--- a/misc/shared-mime-info/files/patch-update-mime-database.c
+++ b/misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,6 +1,6 @@
---- update-mime-database.c.orig	Fri Dec  3 15:46:28 2004
-+++ update-mime-database.c	Fri Mar 25 14:51:30 2005
-@@ -408,7 +408,8 @@
+--- update-mime-database.c.orig	2007-06-27 15:46:53.000000000 -0400
++++ update-mime-database.c	2007-08-09 15:32:31.000000000 -0400
+@@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo
  		}
  	}
  
@@ -10,12 +10,12 @@
  }
  
  /* 'node' is a <mime-type> node from a source file, whose type is 'type'.
-@@ -1458,7 +1459,7 @@
+@@ -1510,7 +1511,7 @@ static void check_in_path_xdg_data(const
  
  	env = getenv("XDG_DATA_DIRS");
  	if (!env)
--		env = "/usr/local/share/:/usr/share/";
+-		env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
 +		env = "/usr/local/share/";
- 	dirs = g_strsplit(env, ":", 0);
+ 	dirs = g_strsplit(env, PATH_SEPARATOR, 0);
  	g_return_if_fail(dirs != NULL);
  	for (n = 0; dirs[n]; n++)
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index a28064191..a1cda7aa6 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -3,6 +3,7 @@ libdata/pkgconfig/shared-mime-info.pc
 @unexec [ -f %D/share/mime/XMLnamespaces ] && rm -f %D/share/mime/XMLnamespaces || true
 share/locale/az/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
 share/locale/cy/LC_MESSAGES/shared-mime-info.mo
 share/locale/da/LC_MESSAGES/shared-mime-info.mo
@@ -55,6 +56,7 @@ share/mime/application/pgp-signature.xml
 share/mime/application/pkcs7-mime.xml
 share/mime/application/pkcs7-signature.xml
 share/mime/application/postscript.xml
+share/mime/application/prs.plucker.xml
 share/mime/application/ram.xml
 share/mime/application/rss+xml.xml
 share/mime/application/rtf.xml
@@ -104,6 +106,7 @@ share/mime/application/vnd.sun.xml.math.xml
 share/mime/application/vnd.sun.xml.writer.global.xml
 share/mime/application/vnd.sun.xml.writer.template.xml
 share/mime/application/vnd.sun.xml.writer.xml
+share/mime/application/vnd.symbian.install.xml
 share/mime/application/vnd.wordperfect.xml
 share/mime/application/x-7z-compressed.xml
 share/mime/application/x-abiword.xml
@@ -230,7 +233,7 @@ share/mime/application/x-n64-rom.xml
 share/mime/application/x-nautilus-link.xml
 share/mime/application/x-nes-rom.xml
 share/mime/application/x-netcdf.xml
-share/mime/application/x-netscape-bookmarks.xml
+share/mime/application/x-nintendo-ds-rom.xml
 share/mime/application/x-object.xml
 share/mime/application/x-ole-storage.xml
 share/mime/application/x-oleo.xml
@@ -300,8 +303,10 @@ share/mime/audio/AMR.xml
 share/mime/audio/ac3.xml
 share/mime/audio/basic.xml
 share/mime/audio/midi.xml
+share/mime/audio/mp2.xml
 share/mime/audio/mp4.xml
 share/mime/audio/mpeg.xml
+share/mime/audio/ogg.xml
 share/mime/audio/prs.sid.xml
 share/mime/audio/vnd.rn-realaudio.xml
 share/mime/audio/x-adpcm.xml
@@ -311,6 +316,7 @@ share/mime/audio/x-aiffc.xml
 share/mime/audio/x-ape.xml
 share/mime/audio/x-flac+ogg.xml
 share/mime/audio/x-flac.xml
+share/mime/audio/x-iriver-pla.xml
 share/mime/audio/x-it.xml
 share/mime/audio/x-matroska.xml
 share/mime/audio/x-minipsf.xml
@@ -326,6 +332,7 @@ share/mime/audio/x-riff.xml
 share/mime/audio/x-s3m.xml
 share/mime/audio/x-scpls.xml
 share/mime/audio/x-speex+ogg.xml
+share/mime/audio/x-speex.xml
 share/mime/audio/x-stm.xml
 share/mime/audio/x-tta.xml
 share/mime/audio/x-voc.xml
@@ -366,6 +373,7 @@ share/mime/image/x-compressed-xcf.xml
 share/mime/image/x-dcraw.xml
 share/mime/image/x-dds.xml
 share/mime/image/x-dib.xml
+share/mime/image/x-emf.xml
 share/mime/image/x-eps.xml
 share/mime/image/x-fits.xml
 share/mime/image/x-fpx.xml
@@ -458,6 +466,8 @@ share/mime/text/spreadsheet.xml
 share/mime/text/tab-separated-values.xml
 share/mime/text/troff.xml
 share/mime/text/vnd.rn-realtext.xml
+share/mime/text/vnd.sun.j2me.app-descriptor.xml
+share/mime/text/vnd.wap.wmlscript.xml
 share/mime/text/vnd.wap.wml.xml
 share/mime/text/x-adasrc.xml
 share/mime/text/x-authors.xml
@@ -475,6 +485,7 @@ share/mime/text/x-dsl.xml
 share/mime/text/x-dsrc.xml
 share/mime/text/x-dtd.xml
 share/mime/text/x-emacs-lisp.xml
+share/mime/text/x-erlang.xml
 share/mime/text/x-fortran.xml
 share/mime/text/x-gettext-translation-template.xml
 share/mime/text/x-gettext-translation.xml
@@ -523,6 +534,7 @@ share/mime/video/dv.xml
 share/mime/video/isivideo.xml
 share/mime/video/mp4.xml
 share/mime/video/mpeg.xml
+share/mime/video/ogg.xml
 share/mime/video/quicktime.xml
 share/mime/video/vivo.xml
 share/mime/video/vnd.rn-realvideo.xml
@@ -538,6 +550,8 @@ share/mime/video/x-nsv.xml
 share/mime/video/x-ogm+ogg.xml
 share/mime/video/x-sgi-movie.xml
 share/mime/video/x-theora+ogg.xml
+share/mime/x-epoc/x-sisx-app.xml
+@dirrmtry share/mime/x-epoc
 @dirrmtry share/mime/video
 @dirrmtry share/mime/text
 @dirrmtry share/mime/packages