4 files changed, 44 insertions, 15 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 899f14b73cc7..e37572eb4cfd 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.0.6
-PORTREVISION=	4
+PORTVERSION=	2.0.7
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.1/sources/${PORTNAME:S/2$//}
+MASTER_SITE_SUBDIR=	2.0.2/sources/${PORTNAME:S/2$//}
 DIST_SUBDIR=	gnome2
 DISTNAME=	nautilus-${PORTVERSION}
 
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 2526664c53ff..d597860b51bc 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.0.6.tar.bz2) = 5e1c5e4ca53f857cad5e3eaae1cff1c3
+MD5 (gnome2/nautilus-2.0.7.tar.bz2) = e57430aafa33314b5df93e34de28c7dd
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index c50612426b3c..e09fa7ef2f7b 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Thu Aug 15 00:46:25 2002
-+++ Makefile.in	Thu Aug 15 00:47:59 2002
-@@ -143,7 +143,7 @@
- DESKTOP_IN_FILES = nautilus.desktop.in
- DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
- 
--SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
-+SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 								components			po 				data 				icons 				docs				$(NULL)
- 
- 
- EXTRA_DIST =  	COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus.desktop				nautilus.desktop.in				gnome-starthere-96.png				gnome-starthere.png				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				intltool-extract.in				intltool-merge.in				intltool-update.in				Makefile.shared					add-include-prefix				$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
+--- Makefile.in.orig	Sat Sep 14 16:54:42 2002
++++ Makefile.in	Sat Sep 14 16:55:17 2002
+@@ -161,7 +161,6 @@
+ 	libnautilus-private 	\
+ 	libnautilus-adapter	\
+ 	src 			\
+-	test 			\
+ 	components		\
+ 	po 			\
+ 	data 			\
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml
new file mode 100644
index 000000000000..81e3a2a71451
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml
@@ -0,0 +1,31 @@
+--- libnautilus-private/filesystem-attributes.xml.orig	Sat Sep 14 16:56:38 2002
++++ libnautilus-private/filesystem-attributes.xml	Sat Sep 14 17:01:31 2002
+@@ -3,10 +3,12 @@
+     <filesystem name="affs"     _default_volume_name="AFFS Volume"/>
+     <filesystem name="afs"      _default_volume_name="AFS Network Volume"/>
+     <filesystem name="auto"     _default_volume_name="Auto-detected Volume"/>
++    <filesystem name="cd9660"  _default_volume_name="CDROM Volume"/>
+     <filesystem name="cdda"     _default_volume_name="CD Digital Audio"/>
+     <filesystem name="cdrom"    _default_volume_name="CD-ROM Drive"/>
+     <filesystem name="devfs"    _default_volume_name="Hardware Device Volume"/>
+     <filesystem name="ext2"     _default_volume_name="Ext2 Linux Volume" trash="yes"/>
++    <filesystem name="ext2fs"     _default_volume_name="Ext2 Linux Volume" trash="yes"/>
+     <filesystem name="ext3"     _default_volume_name="Ext3 Linux Volume" trash="yes"/>
+     <filesystem name="fat"      _default_volume_name="MSDOS Volume" trash="yes"/>
+     <filesystem name="hfs"	_default_volume_name="MacOS Volume" trash="yes"/>
+@@ -15,10 +17,15 @@
+     <filesystem name="hsfs"     _default_volume_name="Hsfs CDROM Volume"/>
+     <filesystem name="jfs"      _default_volume_name="JFS Volume" trash="yes"/>
+     <filesystem name="hpfs"     _default_volume_name="Windows NT Volume"/>
++    <filesystem name="linprocfs"     _default_volume_name="System Volume"/>
++    <filesystem name="mfs"	_default_volume_name="Memory Volume" trash="yes"/>
+     <filesystem name="minix"    _default_volume_name="Minix Volume"/>
+     <filesystem name="msdos"    _default_volume_name="MSDOS Volume"/>
+     <filesystem name="nfs"      _default_volume_name="NFS Network Volume" trash="yes"/>
++    <filesystem name="ntfs"     _default_volume_name="Windows NT Volume"/>
++    <filesystem name="nwfs"     _default_volume_name="Netware Volume"/>
+     <filesystem name="proc"     _default_volume_name="System Volume"/>
++    <filesystem name="procfs"     _default_volume_name="System Volume"/>
+     <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/>
+     <filesystem name="smbfs"    _default_volume_name="Windows Shared Volume" trash="yes"/>
+     <filesystem name="supermount"      _default_volume_name="SuperMount Volume" />