4 files changed, 41 insertions, 30 deletions

diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 4ed1919bb039..702556da0561 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	shared-mime-info
-PORTVERSION=	0.23
-PORTREVISION=	1
+PORTVERSION=	0.30
 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 bc3a0e6e3191..771d3b802f6b 100644
--- a/misc/shared-mime-info/distinfo
+++ b/misc/shared-mime-info/distinfo
@@ -1,3 +1,3 @@
-MD5 (shared-mime-info-0.23.tar.bz2) = 3120a720f6a94881614b533f37a7671f
-SHA256 (shared-mime-info-0.23.tar.bz2) = 038faac46b629968f98dd8ead54ad0ced71fa438b59fca3a144000e0b7f01620
-SIZE (shared-mime-info-0.23.tar.bz2) = 475904
+MD5 (shared-mime-info-0.30.tar.bz2) = 115316be6bb5e3dd8c667742a4301678
+SHA256 (shared-mime-info-0.30.tar.bz2) = 696c90c7b69f8b11be5e74d926d57f72f77c124cfc9d697d363a0294784653c6
+SIZE (shared-mime-info-0.30.tar.bz2) = 495538
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 5706a2b89fe3..3fb1a99b8825 100644
--- a/misc/shared-mime-info/files/patch-update-mime-database.c
+++ b/misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,13 +1,5 @@
 --- update-mime-database.c.orig	2007-07-02 04:00:13.000000000 -0500
 +++ update-mime-database.c	2008-01-28 23:42:30.000000000 -0600
-@@ -54,6 +54,7 @@
- 	"model",
- 	"multipart",
- 	"x-epoc",
-+	"x-content",
- };
- 
- /* Represents a MIME type */
 @@ -445,7 +446,8 @@
  		}
  	}
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 8955e3e34c17..d78c72f20d1d 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -1,6 +1,5 @@
 bin/update-mime-database
 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
@@ -41,20 +40,23 @@ share/mime/application/atom+xml.xml
 share/mime/application/dicom.xml
 share/mime/application/docbook+xml.xml
 share/mime/application/ecmascript.xml
+share/mime/application/epub+zip.xml
+share/mime/application/gnunet-directory.xml
 share/mime/application/illustrator.xml
 share/mime/application/javascript.xml
 share/mime/application/mac-binhex40.xml
 share/mime/application/mathematica.xml
 share/mime/application/mbox.xml
+share/mime/application/msword-template.xml
 share/mime/application/msword.xml
 share/mime/application/octet-stream.xml
 share/mime/application/oda.xml
 share/mime/application/ogg.xml
 share/mime/application/pdf.xml
-share/mime/application/pkcs10.xml
 share/mime/application/pgp-encrypted.xml
 share/mime/application/pgp-keys.xml
 share/mime/application/pgp-signature.xml
+share/mime/application/pkcs10.xml
 share/mime/application/pkcs7-mime.xml
 share/mime/application/pkcs7-signature.xml
 share/mime/application/postscript.xml
@@ -65,7 +67,6 @@ share/mime/application/rtf.xml
 share/mime/application/sdp.xml
 share/mime/application/sieve.xml
 share/mime/application/smil.xml
-share/mime/application/stuffit.xml
 share/mime/application/vnd.corel-draw.xml
 share/mime/application/vnd.emusic-emusic_package.xml
 share/mime/application/vnd.hp-hpgl.xml
@@ -76,6 +77,7 @@ share/mime/application/vnd.ms-access.xml
 share/mime/application/vnd.ms-excel.xml
 share/mime/application/vnd.ms-powerpoint.xml
 share/mime/application/vnd.ms-tnef.xml
+share/mime/application/vnd.ms-works.xml
 share/mime/application/vnd.ms-xpsdocument.xml
 share/mime/application/vnd.oasis.opendocument.chart.xml
 share/mime/application/vnd.oasis.opendocument.database.xml
@@ -114,6 +116,7 @@ share/mime/application/vnd.wordperfect.xml
 share/mime/application/x-7z-compressed.xml
 share/mime/application/x-abiword.xml
 share/mime/application/x-ace.xml
+share/mime/application/x-alz.xml
 share/mime/application/x-amipro.xml
 share/mime/application/x-applix-spreadsheet.xml
 share/mime/application/x-applix-word.xml
@@ -133,9 +136,10 @@ share/mime/application/x-bzpostscript.xml
 share/mime/application/x-cbr.xml
 share/mime/application/x-cbz.xml
 share/mime/application/x-cd-image.xml
-share/mime/application/x-cgi.xml
+share/mime/application/x-cdrdao-toc.xml
 share/mime/application/x-chess-pgn.xml
 share/mime/application/x-chm.xml
+share/mime/application/x-cisco-vpn-settings.xml
 share/mime/application/x-class-file.xml
 share/mime/application/x-compress.xml
 share/mime/application/x-compressed-tar.xml
@@ -146,7 +150,6 @@ share/mime/application/x-csh.xml
 share/mime/application/x-cue.xml
 share/mime/application/x-dar.xml
 share/mime/application/x-dbf.xml
-share/mime/application/x-dbm.xml
 share/mime/application/x-dc-rom.xml
 share/mime/application/x-deb.xml
 share/mime/application/x-designer.xml
@@ -156,7 +159,7 @@ share/mime/application/x-dvi.xml
 share/mime/application/x-e-theme.xml
 share/mime/application/x-egon.xml
 share/mime/application/x-executable.xml
-share/mime/application/x-flash-video.xml
+share/mime/application/x-fluid.xml
 share/mime/application/x-font-afm.xml
 share/mime/application/x-font-bdf.xml
 share/mime/application/x-font-dos.xml
@@ -170,6 +173,7 @@ share/mime/application/x-font-sunos-news.xml
 share/mime/application/x-font-tex-tfm.xml
 share/mime/application/x-font-tex.xml
 share/mime/application/x-font-ttf.xml
+share/mime/application/x-font-ttx.xml
 share/mime/application/x-font-type1.xml
 share/mime/application/x-font-vfont.xml
 share/mime/application/x-frame.xml
@@ -199,6 +203,7 @@ share/mime/application/x-ica.xml
 share/mime/application/x-ipod-firmware.xml
 share/mime/application/x-java-archive.xml
 share/mime/application/x-java-jnlp-file.xml
+share/mime/application/x-java-pack200.xml
 share/mime/application/x-java.xml
 share/mime/application/x-jbuilder-project.xml
 share/mime/application/x-karbon.xml
@@ -220,6 +225,8 @@ share/mime/application/x-lha.xml
 share/mime/application/x-lhz.xml
 share/mime/application/x-linguist.xml
 share/mime/application/x-lyx.xml
+share/mime/application/x-lzma-compressed-tar.xml
+share/mime/application/x-lzma.xml
 share/mime/application/x-lzop.xml
 share/mime/application/x-m4.xml
 share/mime/application/x-macbinary.xml
@@ -268,6 +275,7 @@ share/mime/application/x-shockwave-flash.xml
 share/mime/application/x-shorten.xml
 share/mime/application/x-siag.xml
 share/mime/application/x-slp.xml
+share/mime/application/x-smaf.xml
 share/mime/application/x-sms-rom.xml
 share/mime/application/x-snes-rom.xml
 share/mime/application/x-sqlite2.xml
@@ -298,6 +306,8 @@ share/mime/application/x-xliff.xml
 share/mime/application/x-zerosize.xml
 share/mime/application/x-zoo.xml
 share/mime/application/xhtml+xml.xml
+share/mime/application/xml-dtd.xml
+share/mime/application/xml-external-parsed-entity.xml
 share/mime/application/xml.xml
 share/mime/application/xslt+xml.xml
 share/mime/application/xspf+xml.xml
@@ -326,7 +336,6 @@ share/mime/audio/x-m4b.xml
 share/mime/audio/x-matroska.xml
 share/mime/audio/x-minipsf.xml
 share/mime/audio/x-mod.xml
-share/mime/audio/x-mp3-playlist.xml
 share/mime/audio/x-mpegurl.xml
 share/mime/audio/x-ms-asx.xml
 share/mime/audio/x-ms-wma.xml
@@ -347,7 +356,7 @@ share/mime/audio/x-wavpack-correction.xml
 share/mime/audio/x-wavpack.xml
 share/mime/audio/x-xi.xml
 share/mime/audio/x-xm.xml
-@unexec [ -f %D/share/mime/globs ] && rm -f %D/share/mime/globs || true
+share/mime/audio/x-xmf.xml
 share/mime/image/bmp.xml
 share/mime/image/cgm.xml
 share/mime/image/dpx.xml
@@ -359,8 +368,8 @@ share/mime/image/jp2.xml
 share/mime/image/jpeg.xml
 share/mime/image/png.xml
 share/mime/image/rle.xml
-share/mime/image/svg+xml.xml
 share/mime/image/svg+xml-compressed.xml
+share/mime/image/svg+xml.xml
 share/mime/image/tiff.xml
 share/mime/image/vnd.djvu.xml
 share/mime/image/vnd.dwg.xml
@@ -380,6 +389,7 @@ 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-exr.xml
 share/mime/image/x-fits.xml
 share/mime/image/x-fpx.xml
 share/mime/image/x-fuji-raf.xml
@@ -434,9 +444,6 @@ share/mime/inode/fifo.xml
 share/mime/inode/mount-point.xml
 share/mime/inode/socket.xml
 share/mime/inode/symlink.xml
-@unexec [ -f %D/share/mime/magic ] && rm -f %D/share/mime/magic || true
-@unexec [ -f %D/share/mime/aliases ] && rm -f %D/share/mime/aliases || true
-@unexec [ -f %D/share/mime/subclasses ] && rm -f %D/share/mime/subclasses || true
 share/mime/message/delivery-status.xml
 share/mime/message/disposition-notification.xml
 share/mime/message/external-body.xml
@@ -473,8 +480,8 @@ 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/vnd.wap.wmlscript.xml
 share/mime/text/x-adasrc.xml
 share/mime/text/x-authors.xml
 share/mime/text/x-bibtex.xml
@@ -482,6 +489,7 @@ share/mime/text/x-c++hdr.xml
 share/mime/text/x-c++src.xml
 share/mime/text/x-changelog.xml
 share/mime/text/x-chdr.xml
+share/mime/text/x-cmake.xml
 share/mime/text/x-copying.xml
 share/mime/text/x-credits.xml
 share/mime/text/x-csharp.xml
@@ -489,7 +497,7 @@ share/mime/text/x-csrc.xml
 share/mime/text/x-dcl.xml
 share/mime/text/x-dsl.xml
 share/mime/text/x-dsrc.xml
-share/mime/text/x-dtd.xml
+share/mime/text/x-eiffel.xml
 share/mime/text/x-emacs-lisp.xml
 share/mime/text/x-erlang.xml
 share/mime/text/x-fortran.xml
@@ -498,10 +506,11 @@ share/mime/text/x-gettext-translation.xml
 share/mime/text/x-google-video-pointer.xml
 share/mime/text/x-gtkrc.xml
 share/mime/text/x-haskell.xml
+share/mime/text/x-iMelody.xml
 share/mime/text/x-idl.xml
 share/mime/text/x-install.xml
+share/mime/text/x-iptables.xml
 share/mime/text/x-java.xml
-share/mime/text/x-ksysv-log.xml
 share/mime/text/x-ldif.xml
 share/mime/text/x-literate-haskell.xml
 share/mime/text/x-log.xml
@@ -510,8 +519,12 @@ share/mime/text/x-makefile.xml
 share/mime/text/x-matlab.xml
 share/mime/text/x-microdvd.xml
 share/mime/text/x-moc.xml
+share/mime/text/x-mof.xml
 share/mime/text/x-mpsub.xml
+share/mime/text/x-mrml.xml
+share/mime/text/x-ms-regedit.xml
 share/mime/text/x-mup.xml
+share/mime/text/x-nfo.xml
 share/mime/text/x-objcsrc.xml
 share/mime/text/x-ocaml.xml
 share/mime/text/x-ocl.xml
@@ -526,6 +539,7 @@ share/mime/text/x-setext.xml
 share/mime/text/x-speech.xml
 share/mime/text/x-sql.xml
 share/mime/text/x-ssa.xml
+share/mime/text/x-subviewer.xml
 share/mime/text/x-tcl.xml
 share/mime/text/x-tex.xml
 share/mime/text/x-texinfo.xml
@@ -552,6 +566,7 @@ share/mime/video/vnd.rn-realvideo.xml
 share/mime/video/wavelet.xml
 share/mime/video/x-anim.xml
 share/mime/video/x-flic.xml
+share/mime/video/x-flv.xml
 share/mime/video/x-matroska.xml
 share/mime/video/x-mng.xml
 share/mime/video/x-ms-asf.xml
@@ -562,9 +577,15 @@ 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
+@unexec [ -f %D/share/mime/XMLnamespaces ] && rm -f %D/share/mime/XMLnamespaces || true
+@unexec [ -f %D/share/mime/aliases ] && rm -f %D/share/mime/aliases || true
+@unexec [ -f %D/share/mime/globs ] && rm -f %D/share/mime/globs || true
+@unexec [ -f %D/share/mime/magic ] && rm -f %D/share/mime/magic || true
+@unexec [ -f %D/share/mime/mime.cache ] && rm -f %D/share/mime/mime.cache || true
+@unexec [ -f %D/share/mime/subclasses ] && rm -f %D/share/mime/subclasses || true
+@dirrmtry share/mime/x-epoc
 @exec /bin/mkdir -p %D/share/mime/x-content
 @dirrmtry share/mime/x-content
-@dirrmtry share/mime/x-epoc
 @dirrmtry share/mime/video
 @dirrmtry share/mime/text
 @dirrmtry share/mime/packages
@@ -575,7 +596,6 @@ share/mime/x-epoc/x-sisx-app.xml
 @dirrmtry share/mime/image
 @dirrmtry share/mime/audio
 @dirrmtry share/mime/application
-@unexec [ -f %D/share/mime/mime.cache ] && rm -f %D/share/mime/mime.cache || true
 @dirrmtry share/mime
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw