Update shared-mime-info to 0.51, and remove conflicts with x11-fm/nautilus.

Add an UPDATING entry on how to properly perform this upgrade.

6 files changed, 36 insertions, 23 deletions

diff --git a/UPDATING b/UPDATING
index 378c082953f6..8bfb0c9222ea 100644
--- a/UPDATING
+++ b/UPDATING
@@ -7,6 +7,17 @@ time you update your ports collection, before attempting any port
 upgrades.
 
 20080725:
+  AFFECTS: users of x11-fm/nautilus and misc/shared-mime-info
+  Author: gnome@FreeBSD.org
+
+  In order to properly update x11-fm/nautilus and
+  misc/shared-mime-info, do the following using portupgrade:
+
+# pkg_deinstall -fO nautilus
+# portupgrade shared-mime-info
+# portinstall -O nautilus
+
+20080725:
   AFFECTS: users of www/ojs2
   Author: Greg Larkin <glarkin@FreeBSD.org>
 
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 5654befba67d..fdc7cf0b4551 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	shared-mime-info
-PORTVERSION=	0.40
+PORTVERSION=	0.51
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
@@ -41,6 +41,5 @@ post-install:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%MIMEDIRS%%|${MIMEDIRS}|' \
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	@${MKDIR} ${PREFIX}/share/mime/x-content
 
 .include <bsd.port.mk>
diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo
index d311fcf9c3e4..fce875437fdc 100644
--- a/misc/shared-mime-info/distinfo
+++ b/misc/shared-mime-info/distinfo
@@ -1,3 +1,3 @@
-MD5 (shared-mime-info-0.40.tar.bz2) = b86a0aa5e87a307ede576088c6450a29
-SHA256 (shared-mime-info-0.40.tar.bz2) = 82f803a5999adb28c422a88894eb95fece53efd08cc1a1c3fdf2ef33fded0775
-SIZE (shared-mime-info-0.40.tar.bz2) = 447145
+MD5 (shared-mime-info-0.51.tar.bz2) = 01d72161f7d88123fbccd378871f02f0
+SHA256 (shared-mime-info-0.51.tar.bz2) = 1c247e03418d6b90bcbc0da6c1abe6ac9cd5bacf9c3a2f3b6105376cf7b0eed8
+SIZE (shared-mime-info-0.51.tar.bz2) = 445565
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 63d7b52f1d0b..f29d25bfe625 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -17,6 +17,7 @@ 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/id/LC_MESSAGES/shared-mime-info.mo
 share/locale/it/LC_MESSAGES/shared-mime-info.mo
 share/locale/ja/LC_MESSAGES/shared-mime-info.mo
 share/locale/ko/LC_MESSAGES/shared-mime-info.mo
@@ -239,11 +240,13 @@ share/mime/application/x-matroska.xml
 share/mime/application/x-mif.xml
 share/mime/application/x-mozilla-bookmarks.xml
 share/mime/application/x-ms-dos-executable.xml
+share/mime/application/x-msi.xml
 share/mime/application/x-mswinurl.xml
 share/mime/application/x-mswrite.xml
 share/mime/application/x-msx-rom.xml
 share/mime/application/x-n64-rom.xml
 share/mime/application/x-nautilus-link.xml
+share/mime/application/x-navi-animation.xml
 share/mime/application/x-nes-rom.xml
 share/mime/application/x-netcdf.xml
 share/mime/application/x-netshow-channel.xml
@@ -542,7 +545,6 @@ 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
 share/mime/text/x-sql.xml
 share/mime/text/x-ssa.xml
 share/mime/text/x-subviewer.xml
@@ -582,6 +584,21 @@ 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-content/audio-cdda.xml
+share/mime/x-content/audio-dvd.xml
+share/mime/x-content/audio-player.xml
+share/mime/x-content/blank-bd.xml
+share/mime/x-content/blank-cd.xml
+share/mime/x-content/blank-dvd.xml
+share/mime/x-content/blank-hddvd.xml
+share/mime/x-content/image-dcf.xml
+share/mime/x-content/image-picturecd.xml
+share/mime/x-content/software.xml
+share/mime/x-content/video-bluray.xml
+share/mime/x-content/video-dvd.xml
+share/mime/x-content/video-hddvd.xml
+share/mime/x-content/video-svcd.xml
+share/mime/x-content/video-vcd.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
@@ -592,8 +609,9 @@ share/mime/x-epoc/x-sisx-app.xml
 @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
+@unexec [ -f %D/share/mime/treemagic ] && rm -f %D/share/mime/treemagic || true
+@unexec [ -f %D/share/mime/types ] && rm -f %D/share/mime/types || true
 @dirrmtry share/mime/x-epoc
-@exec /bin/mkdir -p %D/share/mime/x-content
 @dirrmtry share/mime/x-content
 @dirrmtry share/mime/video
 @dirrmtry share/mime/text
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 515cdf8906ad..e6dd409db450 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	2.22.5.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index a3c43b7d2ce6..a19ebf9300c3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -123,23 +123,7 @@ share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
-share/mime/application/x-gnome-saved-search.xml
 share/mime/packages/nautilus.xml
-share/mime/x-content/audio-cdda.xml
-share/mime/x-content/audio-dvd.xml
-share/mime/x-content/audio-player.xml
-share/mime/x-content/blank-bd.xml
-share/mime/x-content/blank-cd.xml
-share/mime/x-content/blank-dvd.xml
-share/mime/x-content/blank-hddvd.xml
-share/mime/x-content/image-dcf.xml
-share/mime/x-content/image-picturecd.xml
-share/mime/x-content/software.xml
-share/mime/x-content/video-bluray.xml
-share/mime/x-content/video-dvd.xml
-share/mime/x-content/video-hddvd.xml
-share/mime/x-content/video-svcd.xml
-share/mime/x-content/video-vcd.xml
 %%DATADIR%%/browser.xml
 %%DATADIR%%/glade/nautilus-bookmarks-window.glade
 %%DATADIR%%/glade/nautilus-file-management-properties.glade