5 files changed, 60 insertions, 73 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index c5c0cd83d6b7..766316dbe736 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
 DIST_SUBDIR=	gnome2
 DISTNAME=	nautilus-${PORTVERSION}
 
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 02b7e675a01a..3f9a14a9cca8 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.0.0.tar.bz2) = 582e225b049beff3f1a543ac13be9dd8
+MD5 (gnome2/nautilus-2.0.1.tar.bz2) = 723d7b26e00eca6e5e01990976393e4b
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 9fa54d521470..e3791b9336ea 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 15 02:24:38 2002
-+++ configure	Sat Jun 15 02:27:06 2002
-@@ -7481,6 +7481,7 @@
+--- configure.orig	Tue Jul 23 21:46:17 2002
++++ configure	Tue Jul 23 21:49:20 2002
+@@ -8311,6 +8311,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,24 +8,25 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11829,14 +11830,14 @@
+@@ -13383,7 +13384,7 @@
  
  LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
  
 -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
 +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
  
+ 
  CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+@@ -13391,7 +13392,7 @@
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
  
 -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
 +CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
  
- COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
- COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -12546,9 +12547,9 @@
+ 
+ COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
+@@ -14291,9 +14292,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -37,7 +38,7 @@
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -12599,24 +12600,24 @@
+@@ -14345,24 +14346,24 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
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 c76d27a3b7ed..9dcc45e1748e 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,9 +1,6 @@
-
-$FreeBSD$
-
---- libnautilus-private/nautilus-volume-monitor.c.orig	Wed Oct 10 03:16:39 2001
-+++ libnautilus-private/nautilus-volume-monitor.c	Wed Dec  5 23:58:45 2001
-@@ -60,6 +60,18 @@
+--- libnautilus-private/nautilus-volume-monitor.c.orig	Thu Jul 11 13:11:51 2002
++++ libnautilus-private/nautilus-volume-monitor.c	Wed Jul 24 00:25:40 2002
+@@ -59,6 +59,18 @@
  #include <sys/types.h>
  #include <unistd.h>
  
@@ -22,7 +19,7 @@ $FreeBSD$
  #ifdef HAVE_SYS_VFSTAB_H
  #include <sys/vfstab.h>
  #else
-@@ -104,7 +116,7 @@
+@@ -103,7 +115,7 @@
  #define MNTOPT_RO "ro"
  #endif
  
@@ -31,19 +28,19 @@ $FreeBSD$
  #define setmntent(f,m) fopen(f,m)
  #endif
  
-@@ -495,6 +507,11 @@
+@@ -503,6 +515,11 @@
  		return TRUE;
  	}
  #endif
 +#ifdef __FreeBSD__
 +	if (eel_str_has_prefix (ent->f_mntonname, "/mnt/")) {
-+		return TRUE;
++	    	return TRUE;
 +	}
 +#endif
- 	
- 	return FALSE;
- }
-@@ -510,35 +527,42 @@
+ 
+ #ifdef SOLARIS_MNT
+ 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
+@@ -524,10 +541,15 @@
  static GList *
  get_removable_volumes (NautilusVolumeMonitor *monitor)
  {
@@ -59,29 +56,29 @@ $FreeBSD$
 +	GList *volumes = NULL;
 +	MountTableEntry *ent = NULL;
 +	NautilusVolume *volume = NULL;
+ 	char * fs_opt;
  #ifdef HAVE_SYS_MNTTAB_H
          MountTableEntry ent_storage;
+@@ -535,26 +557,27 @@
+ #ifdef HAVE_GETMNTINFO
+ 	int count, index;
  #endif
 -	ent = NULL;
 -	volume = NULL;
 -	volumes = NULL;
  
  #ifdef HAVE_GETMNTINFO
- 	int count, index;
-+	/*{static int b = 1; while (b);}*/
- 	
  	count = getmntinfo (&ent, MNT_WAIT);
  	/* getmentinfo returns a pointer to static data. Do not free. */
  	for (index = 0; index < count; index++) {
--		if (has_removable_mntent_options (ent + 1)) {
+-		if (has_removable_mntent_options (&ent[index])) {
 +		if (has_removable_mntent_options (ent + index)) {
  			volume = create_volume (ent[index].f_mntfromname,
--						ent[index].f_mntoname);
-+						ent[index].f_mntonname);
+ 						ent[index].f_mntonname);
  			volume->is_removable = TRUE;
  			volumes = finish_creating_volume_and_prepend
--				(monitor, volume, ent[index].f_fstyename, volumes);
-+				(monitor, volume, ent[index].f_fstypename, volumes);
+-				(monitor, volume, ent[index].f_fstypename, volumes);
++		    		(monitor, volume, ent[index].f_fstypename, volumes);
  		}
  	}
  #endif
@@ -95,20 +92,21 @@ $FreeBSD$
  		return NULL;
  	}
  	
-@@ -560,9 +584,21 @@
+@@ -589,9 +612,21 @@
  				(monitor, volume, ent->mnt_type, volumes);
  		}
  	}
 +#elif defined (HAVE_SETFSENT)
 +	while ((fsent = getfsent ()) != NULL) {
-+		if (strstr (fsent->fs_mntops, "noauto") == 0) {
-+			volume = create_volume (fsent->fs_spec, fsent->fs_file);
++	    	if (strstr (fsent->fs_mntops, "noauto") == 0) {
++		    	volume = create_volume (fsent->fs_spec, fsent->fs_file);
 +			volumes = finish_creating_volume_and_prepend
 +				(monitor, volume, fsent->fs_vfstype, volumes);
 +		}
 +	}
  #endif
- 			
+-			
++
 +#ifndef HAVE_SETFSENT
  	fclose (file);
 +#else
@@ -117,8 +115,8 @@ $FreeBSD$
  	
  #ifdef HAVE_CDDA
  	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
-@@ -575,7 +611,7 @@
- 	return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort);
+@@ -621,7 +656,7 @@
+       return result;
  }
  
 -#ifndef SOLARIS_MNT
@@ -126,7 +124,7 @@ $FreeBSD$
  
  static gboolean
  volume_is_removable (const NautilusVolume *volume)
-@@ -907,23 +943,34 @@
+@@ -945,23 +980,33 @@
  
  
  
@@ -139,14 +137,13 @@ $FreeBSD$
 -        FILE *fh;
          GList *volumes;
 +#ifndef HAVE_SETFSENT
-+        FILE *fh;
++	FILE *fh;
          MountTableEntry ent;
 +#else
 +	int fh;
 +	struct fstab *ent;
 +#endif
          NautilusVolume *volume;
-+        /*{static int b = 1; while (b);}*/
  
  	volumes = NULL;
          
@@ -163,20 +160,19 @@ $FreeBSD$
          while (! getmntent(fh, &ent)) {
                  volume = create_volume (ent.mnt_special, ent.mnt_mountp);
                  volume->is_removable = has_removable_mntent_options (&ent);
-@@ -932,6 +979,23 @@
+@@ -970,6 +1015,22 @@
          }
  
  	fclose (fh);
 +#else
 +	while ((ent = getfsent ()) != NULL) {
-+		/*{static int b = 1; while (b);}*/
-+		if (strcmp(ent->fs_vfstype, "swap") == 0)
-+			continue;
++	    	if (strcmp(ent->fs_vfstype, "swap") == 0)
++		    	continue;
 +		volume = create_volume (ent->fs_spec, ent->fs_file);
 +		if (strstr (ent->fs_mntops, "noauto") == 0)
-+			volume->is_removable = TRUE;
++		    	volume->is_removable = TRUE;
 +		else
-+			volume->is_removable = FALSE;
++		    	volume->is_removable = FALSE;
 +		volumes = finish_creating_volume_and_prepend
 +			(monitor, volume, ent->fs_vfstype, volumes);
 +	}
@@ -187,7 +183,7 @@ $FreeBSD$
  
          return volumes;
  }
-@@ -1668,7 +1732,7 @@
+@@ -1747,7 +1808,7 @@
  	for (node = volume_list; node != NULL; node = node->next) {
  		volume = node->data;
  		
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 87cc5522ce70..b9632a3138a8 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -1,11 +1,4 @@
 bin/nautilus
-bin/nautilus-adapter
-bin/nautilus-content-loser
-bin/nautilus-music-view
-bin/nautilus-sample-content-view
-bin/nautilus-sidebar-loser
-bin/nautilus-text-view
-bin/nautilus-throbber
 etc/X11/serverconfig/.directory
 etc/X11/starthere/.directory
 etc/X11/starthere/applications.desktop
@@ -18,7 +11,6 @@ etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/news/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/xalf/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
@@ -26,7 +18,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/xalf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree/%gconf.xml
 etc/gconf/schemas/apps_nautilus_preferences.schemas
@@ -40,15 +31,15 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+lib/bonobo/libnautilus-history-view.so
+lib/bonobo/libnautilus-notes-view.so
+lib/bonobo/libnautilus-tree-view.so
 lib/libnautilus-adapter.a
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.2
-lib/libnautilus-history-view.so
-lib/libnautilus-notes-view.so
 lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.2
-lib/libnautilus-tree-view.so
 lib/libnautilus.a
 lib/libnautilus.so
 lib/libnautilus.so.2
@@ -64,6 +55,13 @@ libdata/bonobo/servers/Nautilus_View_text.server
 libdata/bonobo/servers/Nautilus_View_tree.server
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus.pc
+libexec/nautilus-adapter
+libexec/nautilus-content-loser
+libexec/nautilus-music-view
+libexec/nautilus-sample-content-view
+libexec/nautilus-sidebar-loser
+libexec/nautilus-text-view
+libexec/nautilus-throbber
 share/gnome/applications/nautilus.desktop
 share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-content-loser-ui.xml
@@ -101,6 +99,7 @@ share/gnome/nautilus/emblems/special.png
 share/gnome/nautilus/emblems/urgent.png
 share/gnome/nautilus/emblems/web.png
 share/gnome/nautilus/filesystem-attributes.xml
+share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
 share/gnome/nautilus/nautilus-extras.placeholder
 share/gnome/nautilus/nautilus-suggested.placeholder
 share/gnome/nautilus/patterns/.striated.png
@@ -381,6 +380,8 @@ share/gnome/pixmaps/nautilus/default/side_bar_image.png
 share/gnome/pixmaps/nautilus/default/theme_preview.png
 share/gnome/pixmaps/nautilus/default/trash-empty.png
 share/gnome/pixmaps/nautilus/default/trash-full.png
+share/gnome/pixmaps/nautilus/default/trash-empty-192.png
+share/gnome/pixmaps/nautilus/default/trash-full-192.png
 share/gnome/pixmaps/nautilus/default/zoom_body.png
 share/gnome/pixmaps/nautilus/emblems.png
 share/gnome/pixmaps/nautilus/gnome/Services.png
@@ -443,15 +444,6 @@ share/gnome/pixmaps/nautilus/gnome/throbber/003.png
 share/gnome/pixmaps/nautilus/gnome/throbber/004.png
 share/gnome/pixmaps/nautilus/gnome/throbber/005.png
 share/gnome/pixmaps/nautilus/gnome/throbber/006.png
-share/gnome/pixmaps/nautilus/gnome/throbber/007.png
-share/gnome/pixmaps/nautilus/gnome/throbber/008.png
-share/gnome/pixmaps/nautilus/gnome/throbber/009.png
-share/gnome/pixmaps/nautilus/gnome/throbber/010.png
-share/gnome/pixmaps/nautilus/gnome/throbber/011.png
-share/gnome/pixmaps/nautilus/gnome/throbber/012.png
-share/gnome/pixmaps/nautilus/gnome/throbber/013.png
-share/gnome/pixmaps/nautilus/gnome/throbber/014.png
-share/gnome/pixmaps/nautilus/gnome/throbber/015.png
 share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
 share/gnome/pixmaps/nautilus/gnome/trash-empty-192.png
 share/gnome/pixmaps/nautilus/gnome/trash-empty-accept-192.png
@@ -612,12 +604,12 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/nautilus/services/text
 @dirrm share/gnome/nautilus/services
 @dirrm share/gnome/nautilus/patterns
+@dirrm share/gnome/nautilus/glade
 @dirrm share/gnome/nautilus/emblems
 @dirrm share/gnome/nautilus
 @dirrm include/libnautilus
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/xalf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
@@ -625,7 +617,6 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/xalf
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/news
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view