Update to 0.20.

4 files changed, 52 insertions, 17 deletions

diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index be71984aae38..238d894e0a27 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	shared-mime-info
-PORTVERSION=	0.19
+PORTVERSION=	0.20
 CATEGORIES=	misc gnome
-MASTER_SITES=	http://www.marcuscom.com/downloads/ \
-		http://people.freedesktop.org/~hadess/
-DISTNAME=	shared-mime-info-${PORTVERSION}
+MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A MIME type database from the FreeDesktop project
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo
index fcf32ca46f27..604d0eb01a55 100644
--- a/misc/shared-mime-info/distinfo
+++ b/misc/shared-mime-info/distinfo
@@ -1,3 +1,3 @@
-MD5 (shared-mime-info-0.19.tar.gz) = 056a86a8245aecfd9c80740380c5265a
-SHA256 (shared-mime-info-0.19.tar.gz) = 4aae542285cdf011d8486ece8c2c8b0431ce1e25e7eb7efd39593f04bc76d118
-SIZE (shared-mime-info-0.19.tar.gz) = 595168
+MD5 (shared-mime-info-0.20.tar.bz2) = 62184241d497d34138285bc248b3fabc
+SHA256 (shared-mime-info-0.20.tar.bz2) = 6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
+SIZE (shared-mime-info-0.20.tar.bz2) = 429405
diff --git a/misc/shared-mime-info/files/patch-Makefile.in b/misc/shared-mime-info/files/patch-Makefile.in
index 990f53a0adbb..d32435f436f9 100644
--- a/misc/shared-mime-info/files/patch-Makefile.in
+++ b/misc/shared-mime-info/files/patch-Makefile.in
@@ -1,16 +1,24 @@
---- Makefile.in.orig	Sat Dec  4 16:05:36 2004
-+++ Makefile.in	Sat Dec  4 16:06:17 2004
-@@ -795,7 +795,12 @@
+--- Makefile.in.orig	Sat Feb 10 04:50:08 2007
++++ Makefile.in	Sat Feb 10 04:52:30 2007
+@@ -251,7 +251,7 @@ EXTRA_DIST = \
+ 
+ CLEANFILES = freedesktop.org.xml po/stamp-it
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+-pkgconfigdir = $(datadir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = shared-mime-info.pc
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -871,7 +871,11 @@ $(pkgconfig_DATA): config.status
  @INTLTOOL_DESKTOP_RULE@
  
  install-data-hook: 
--@ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" "$(DESTDIR)${mimedir}"
-+@ENABLE_UPDATE_MIMEDB_TRUE@	for mdir in %%MIMEDIRS%%; do \
+-@ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(prefix)/share/mime"
++@ENABLE_UPDATE_MIMEDB_TRUE@	for mdir in /usr/X11R6/share/gnome/mime  /usr/local/share/gnome/mime  /usr/X11R6/share/mime  /usr/local/share/mime  /usr/local/gnome2/shared-mime-info/share/mime  /usr/share/mime; do \
 +@ENABLE_UPDATE_MIMEDB_TRUE@		if [ -d $${mdir} ]; then \
 +@ENABLE_UPDATE_MIMEDB_TRUE@			$(DESTDIR)"$(bindir)/update-mime-database" "$${mdir}" ; \
 +@ENABLE_UPDATE_MIMEDB_TRUE@		fi; \
 +@ENABLE_UPDATE_MIMEDB_TRUE@	done
-+
  
  uninstall-hook:
- 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)${mimedir}/$${media}/"*.xml; done
+ 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(prefix)/share/mime/$${media}/"*.xml; done
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 7432e51d9d16..1b5051413920 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -61,16 +61,17 @@ share/mime/application/pdf.xml
 share/mime/application/pgp-encrypted.xml
 share/mime/application/pgp-keys.xml
 share/mime/application/pgp-signature.xml
-share/mime/application/pgp.xml
 share/mime/application/pkcs7-mime.xml
 share/mime/application/pkcs7-signature.xml
 share/mime/application/postscript.xml
+share/mime/application/ram.xml
 share/mime/application/rss+xml.xml
 share/mime/application/rtf.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
 share/mime/application/vnd.hp-pcl.xml
 share/mime/application/vnd.lotus-1-2-3.xml
@@ -92,7 +93,6 @@ share/mime/application/vnd.oasis.opendocument.text-master.xml
 share/mime/application/vnd.oasis.opendocument.text-template.xml
 share/mime/application/vnd.oasis.opendocument.text-web.xml
 share/mime/application/vnd.oasis.opendocument.text.xml
-share/mime/application/vnd.palm.xml
 share/mime/application/vnd.rn-realmedia.xml
 share/mime/application/vnd.stardivision.calc.xml
 share/mime/application/vnd.stardivision.chart.xml
@@ -114,6 +114,7 @@ share/mime/application/vnd.sun.xml.writer.xml
 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-amipro.xml
 share/mime/application/x-applix-spreadsheet.xml
 share/mime/application/x-applix-word.xml
@@ -125,8 +126,11 @@ share/mime/application/x-awk.xml
 share/mime/application/x-bcpio.xml
 share/mime/application/x-bittorrent.xml
 share/mime/application/x-blender.xml
+share/mime/application/x-bzdvi.xml
 share/mime/application/x-bzip-compressed-tar.xml
 share/mime/application/x-bzip.xml
+share/mime/application/x-bzpdf.xml
+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
@@ -141,6 +145,7 @@ share/mime/application/x-cpio-compressed.xml
 share/mime/application/x-cpio.xml
 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
@@ -184,9 +189,14 @@ share/mime/application/x-go-sgf.xml
 share/mime/application/x-graphite.xml
 share/mime/application/x-gtar.xml
 share/mime/application/x-gtktalog.xml
+share/mime/application/x-gzdvi.xml
 share/mime/application/x-gzip.xml
+share/mime/application/x-gzpdf.xml
 share/mime/application/x-gzpostscript.xml
 share/mime/application/x-hdf.xml
+share/mime/application/x-hwp.xml
+share/mime/application/x-hwt.xml
+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
@@ -215,7 +225,7 @@ share/mime/application/x-lzop.xml
 share/mime/application/x-m4.xml
 share/mime/application/x-macbinary.xml
 share/mime/application/x-magicpoint.xml
-share/mime/application/x-matroska.xml
+share/mime/application/x-markaby.xml
 share/mime/application/x-mif.xml
 share/mime/application/x-mozilla-bookmarks.xml
 share/mime/application/x-ms-dos-executable.xml
@@ -264,6 +274,7 @@ share/mime/application/x-srt.xml
 share/mime/application/x-stuffit.xml
 share/mime/application/x-sv4cpio.xml
 share/mime/application/x-sv4crc.xml
+share/mime/application/x-t602.xml
 share/mime/application/x-tar.xml
 share/mime/application/x-tarz.xml
 share/mime/application/x-tex-gf.xml
@@ -280,6 +291,7 @@ share/mime/application/x-wais-source.xml
 share/mime/application/x-wpg.xml
 share/mime/application/x-x509-ca-cert.xml
 share/mime/application/x-xbel.xml
+share/mime/application/x-xliff.xml
 share/mime/application/x-zerosize.xml
 share/mime/application/x-zoo.xml
 share/mime/application/xhtml+xml.xml
@@ -305,6 +317,7 @@ share/mime/audio/x-ape.xml
 share/mime/audio/x-flac+ogg.xml
 share/mime/audio/x-flac.xml
 share/mime/audio/x-it.xml
+share/mime/audio/x-matroska.xml
 share/mime/audio/x-mod.xml
 share/mime/audio/x-mp3-playlist.xml
 share/mime/audio/x-mpeg.xml
@@ -317,9 +330,12 @@ share/mime/audio/x-s3m.xml
 share/mime/audio/x-scpls.xml
 share/mime/audio/x-speex+ogg.xml
 share/mime/audio/x-stm.xml
+share/mime/audio/x-tta.xml
 share/mime/audio/x-voc.xml
 share/mime/audio/x-vorbis+ogg.xml
 share/mime/audio/x-wav.xml
+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
@@ -335,13 +351,16 @@ share/mime/image/jpeg2000.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/tiff.xml
 share/mime/image/vnd.djvu.xml
 share/mime/image/vnd.dwg.xml
 share/mime/image/vnd.dxf.xml
 share/mime/image/vnd.rn-realpix.xml
+share/mime/image/vnd.wap.wbmp.xml
 share/mime/image/x-3ds.xml
 share/mime/image/x-applix-graphics.xml
+share/mime/image/x-bzeps.xml
 share/mime/image/x-canon-crw.xml
 share/mime/image/x-cmu-raster.xml
 share/mime/image/x-compressed-xcf.xml
@@ -350,6 +369,8 @@ share/mime/image/x-eps.xml
 share/mime/image/x-fits.xml
 share/mime/image/x-fpx.xml
 share/mime/image/x-fuji-raf.xml
+share/mime/image/x-gzeps.xml
+share/mime/image/x-icns.xml
 share/mime/image/x-ico.xml
 share/mime/image/x-iff.xml
 share/mime/image/x-ilbm.xml
@@ -358,6 +379,7 @@ share/mime/image/x-kodak-dcr.xml
 share/mime/image/x-kodak-kdc.xml
 share/mime/image/x-lwo.xml
 share/mime/image/x-lws.xml
+share/mime/image/x-macpaint.xml
 share/mime/image/x-minolta-mrw.xml
 share/mime/image/x-msod.xml
 share/mime/image/x-niff.xml
@@ -447,24 +469,29 @@ share/mime/text/x-emacs-lisp.xml
 share/mime/text/x-fortran.xml
 share/mime/text/x-gettext-translation-template.xml
 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-idl.xml
 share/mime/text/x-install.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
+share/mime/text/x-lua.xml
 share/mime/text/x-makefile.xml
 share/mime/text/x-matlab.xml
 share/mime/text/x-moc.xml
 share/mime/text/x-mup.xml
 share/mime/text/x-objcsrc.xml
 share/mime/text/x-ocaml.xml
+share/mime/text/x-ocl.xml
 share/mime/text/x-pascal.xml
 share/mime/text/x-patch.xml
 share/mime/text/x-python.xml
 share/mime/text/x-readme.xml
+share/mime/text/x-rpm-spec.xml
 share/mime/text/x-scheme.xml
 share/mime/text/x-setext.xml
 share/mime/text/x-speech.xml
@@ -492,6 +519,7 @@ share/mime/video/vivo.xml
 share/mime/video/wavelet.xml
 share/mime/video/x-anim.xml
 share/mime/video/x-flic.xml
+share/mime/video/x-matroska.xml
 share/mime/video/x-mng.xml
 share/mime/video/x-ms-asf.xml
 share/mime/video/x-ms-wmv.xml