Update to 2.2.3.1.

4 files changed, 19 insertions, 16 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 6647960662f8..8023269ad96f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.3.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 9bcb1c8abe65..27ef5b6e4bc0 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.2.1.tar.bz2) = d5d0982ad17f654b925c42376cdb4917
+MD5 (gnome2/nautilus-2.2.3.1.tar.bz2) = bda251ff194553e3d22dbba6d898b687
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
index fbb9b3b47b47..bcf3479a9a07 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- libnautilus-private/nautilus-volume-monitor.c.orig	Wed Aug 28 16:37:20 2002
-+++ libnautilus-private/nautilus-volume-monitor.c	Wed Sep 11 16:39:15 2002
+--- libnautilus-private/nautilus-volume-monitor.c.orig	Fri Feb 28 09:52:23 2003
++++ libnautilus-private/nautilus-volume-monitor.c	Mon Mar 10 18:13:57 2003
 @@ -59,6 +59,18 @@
  #include <sys/types.h>
  #include <unistd.h>
@@ -241,7 +238,7 @@ $FreeBSD$
  #else
  	GString *new_dev_path;
  	struct cdrom_tocentry entry;
-@@ -1765,7 +1854,7 @@
+@@ -1768,7 +1857,7 @@
  	for (node = volume_list; node != NULL; node = node->next) {
  		volume = node->data;
  		
@@ -250,7 +247,7 @@ $FreeBSD$
  		/* These are set up by get_current_mount_list for Solaris. */
  		volume->is_removable = volume_is_removable (volume);
  #endif
-@@ -1794,7 +1883,7 @@
+@@ -1797,7 +1886,7 @@
  		ok = mount_volume_auto_add (volume);
  	} else if (strcmp (file_system_type_name, "cdda") == 0) {
  		ok = mount_volume_cdda_add (volume);
@@ -259,13 +256,13 @@ $FreeBSD$
  		ok = mount_volume_iso9660_add (volume);
  	} else if (strcmp (file_system_type_name, "nfs") == 0) {
  		ok = mount_volume_nfs_add (volume);
-@@ -1823,8 +1912,8 @@
- 	}
- 
- 	/* Identify device type */
--	if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {		
+@@ -1835,8 +1924,8 @@
+ 	} else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) {
+                 volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
+                 volume->is_removable = TRUE;
+-	} else if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {		
 -		name = volume->mount_path + strlen ("/mnt/");
-+	if (eel_str_has_prefix (volume->mount_path, "/")) {		
++	} else if (eel_str_has_prefix (volume->mount_path, "/")) {		
 +		name = volume->mount_path + strlen ("/");
  		
  		if (eel_str_has_prefix (name, "cdrom")
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index d9d6ad7b7a7d..4fea2accc505 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -26,6 +26,7 @@ include/libnautilus/nautilus-bonobo-ui.h
 include/libnautilus/nautilus-clipboard.h
 include/libnautilus/nautilus-distributed-undo.h
 include/libnautilus/nautilus-idle-queue.h
+include/libnautilus/nautilus-scroll-positionable.h
 include/libnautilus/nautilus-undo-private.h
 include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
@@ -59,14 +60,15 @@ libexec/nautilus-adapter
 libexec/nautilus-text-view
 libexec/nautilus-throbber
 share/gnome/applications/nautilus.desktop
-share/gnome/applications/nautilus-file-management-properties.desktop
 share/gnome/applications/network-scheme.desktop
+share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop
 share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml
 share/gnome/idl/nautilus-distributed-undo.idl
 share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
@@ -289,6 +291,7 @@ share/locale/en_GB/LC_MESSAGES/nautilus.mo
 share/locale/es/LC_MESSAGES/nautilus.mo
 share/locale/et/LC_MESSAGES/nautilus.mo
 share/locale/eu/LC_MESSAGES/nautilus.mo
+share/locale/fa/LC_MESSAGES/nautilus.mo
 share/locale/fi/LC_MESSAGES/nautilus.mo
 share/locale/fr/LC_MESSAGES/nautilus.mo
 share/locale/ga/LC_MESSAGES/nautilus.mo
@@ -302,6 +305,7 @@ share/locale/ko/LC_MESSAGES/nautilus.mo
 share/locale/lt/LC_MESSAGES/nautilus.mo
 share/locale/lv/LC_MESSAGES/nautilus.mo
 share/locale/mk/LC_MESSAGES/nautilus.mo
+share/locale/ml/LC_MESSAGES/nautilus.mo
 share/locale/mn/LC_MESSAGES/nautilus.mo
 share/locale/ms/LC_MESSAGES/nautilus.mo
 share/locale/nl/LC_MESSAGES/nautilus.mo
@@ -320,7 +324,9 @@ share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/th/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo
 share/locale/uk/LC_MESSAGES/nautilus.mo
+share/locale/wa/LC_MESSAGES/nautilus.mo
 share/locale/vi/LC_MESSAGES/nautilus.mo
+share/locale/yi/LC_MESSAGES/nautilus.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/default