author: Maxim Sobolev <sobomax@FreeBSD.org> 2001-05-14 17:18:52 +0000
committer: Maxim Sobolev <sobomax@FreeBSD.org> 2001-05-14 17:18:52 +0000
commit: 1661005c13823e934a5c1267f261fd3a6a548591 (patch)
tree: 7c1290c0bf32e3eebd000525f91fe936f467091e /x11-fm
parent: a885c9056ad4a60f0d4c8e3a8182e9f129825e22 (diff)
download: ports-1661005c13823e934a5c1267f261fd3a6a548591.tar.gz
ports-1661005c13823e934a5c1267f261fd3a6a548591.zip
18 files changed, 812 insertions, 960 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index f1cf1d4d517b..2baa9abb7d2a 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
@@ -21,7 +20,11 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.6:${PORTSDIR}/print/freetype2 \
-		ghttp.1:${PORTSDIR}/www/libghttp
+		ghttp.1:${PORTSDIR}/www/libghttp \
+		eel.0:${PORTSDIR}/x11-toolkits/eel
+
+# Disable - I don't have a time to compile it now. Will be enabled back later.
+WITHOUT_MOZILLA=	yes
 
 .if !defined(WITHOUT_MOZILLA)
 MOZILLA=	mozilla
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 11d30f6f75f6..6fe59855dc7a 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (nautilus-1.0.2.tar.gz) = 9c6b11436e11d7dc184dd5748e7e82ac
+MD5 (nautilus-1.0.3.tar.gz) = 87db068765a72ca46b55ab6064ce3c00
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index 5c7b55cccce7..400eddbcaaaa 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,53 +1,23 @@
---- configure.orig	Mon Mar 12 19:48:16 2001
-+++ configure	Fri Mar 16 15:02:38 2001
-@@ -45,5 +45,5 @@
- ac_help="$ac_help
--  --with-freetype2-libraries=PATH		freetype2 library path"
-+  --with-freetype2-lib-place=PREFIX		freetype2 library path"
- ac_help="$ac_help
--  --with-freetype2-includes=PATH	freetype2 include path"
-+  --with-freetype2-include-place=PREFIX	freetype2 include path"
- ac_help="$ac_help
-@@ -3216,4 +3216,4 @@
- # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given.
--if test "${with_freetype2_libraries+set}" = set; then
--  withval="$with_freetype2_libraries"
-+if test "${with_freetype2_lib_place+set}" = set; then
-+  withval="$with_freetype2_lib_place"
-   freetype2_lib_prefix=$withval
-@@ -3223,4 +3223,4 @@
- # Check whether --with-freetype2-includes or --without-freetype2-includes was given.
--if test "${with_freetype2_includes+set}" = set; then
--  withval="$with_freetype2_includes"
-+if test "${with_freetype2_include_place+set}" = set; then
-+  withval="$with_freetype2_include_place"
-   freetype2_include_prefix=$withval
-@@ -3354,3 +3354,3 @@
-   ac_save_LIBS="$LIBS"
--LIBS="-lpam -ldl $LIBS"
-+LIBS="-lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
-@@ -3394,3 +3394,3 @@
-   ac_save_LIBS="$LIBS"
--LIBS="-lpam_misc -ldl -lpam $LIBS"
-+LIBS="-lpam_misc -lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
-@@ -3422,6 +3422,6 @@
-   echo "$ac_t""yes" 1>&6
--  PAM_LIBS="-ldl -lpam -lpam_misc"
-+  PAM_LIBS="-lpam -lpam_misc"
- else
-   echo "$ac_t""no" 1>&6
--PAM_LIBS="-ldl -lpam"
-+PAM_LIBS="-lpam"
- fi
-@@ -3662,3 +3662,3 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon May 14 16:42:41 2001
++++ configure	Mon May 14 16:42:42 2001
+@@ -3433,7 +3433,7 @@
+ 
+ CC="$_save_cc"
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
-@@ -6117,3 +6117,3 @@
+ echo "configure:3439: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
+ ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
+@@ -5472,7 +5472,7 @@
+ fi
+ 
  if test x$SCROLLKEEPER_CONFIG = xno; then
 -  { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; }
 +  echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2
  fi
+ 
+ 
diff --git a/x11-fm/nautilus/files/patch-ab b/x11-fm/nautilus/files/patch-ab
index 169e4d76349d..97f5bd09e83e 100644
--- a/x11-fm/nautilus/files/patch-ab
+++ b/x11-fm/nautilus/files/patch-ab
@@ -1,28 +1,37 @@
---- Makefile.in.orig	Mon Mar 12 19:49:51 2001
-+++ Makefile.in	Fri Mar 16 16:15:38 2001
-@@ -202,3 +202,3 @@
- 
--SUBDIRS =  	data 				icons 				intl 				cut-n-paste-code 		librsvg 			libnautilus 			libnautilus-adapter		libnautilus-extensions 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		nautilus-installer		test 				user-guide			help				po 				omf-install			$(NULL)
-+SUBDIRS =  	data 				icons 				intl 				cut-n-paste-code 		librsvg 			libnautilus 			libnautilus-adapter		libnautilus-extensions 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		nautilus-installer		test 				user-guide			help				po 				$(NULL)
- 
-@@ -607,4 +607,4 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Mon May 14 16:45:52 2001
++++ Makefile.in	Mon May 14 16:45:53 2001
+@@ -675,8 +675,8 @@
+ 	$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
+ 	@list='nautilus-clean.sh'; for p in $$list; do\
  	  if test -f $(srcdir)/$$p; then \
 -	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
 -	    $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
 +	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
 +	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
  	  else :; fi; \
-@@ -620,4 +620,4 @@
+ 	done
+ 
+@@ -688,16 +688,16 @@
+ 	@list='$(EAZEL_LOGOS_ICONS)'; \
+ 	for i in $$list; \
  	do \
 -		echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \
 -		$(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \
 +		echo $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \
 +		$(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \
  	done
-@@ -628,4 +628,4 @@
+ 
+ 	$(mkinstalldirs) $(throbberdir)
+ 	@list='$(EAZEL_LOGOS_THROBBER)'; \
+ 	for i in $$list; \
  	do \
 -		echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \
 -		$(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \
 +		echo $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \
 +		$(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \
  	done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11-fm/nautilus/files/patch-ac b/x11-fm/nautilus/files/patch-ac
index 8e4edd0bf3ab..02e917cf8592 100644
--- a/x11-fm/nautilus/files/patch-ac
+++ b/x11-fm/nautilus/files/patch-ac
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- libnautilus-extensions/nautilus-volume-monitor.c.orig	Sat Feb 24 01:54:34 2001
-+++ libnautilus-extensions/nautilus-volume-monitor.c	Sun Mar 11 15:46:11 2001
-@@ -68,6 +68,12 @@
- #include <mntent.h>
+--- libnautilus-private/nautilus-volume-monitor.c.orig	Fri Apr 27 04:19:07 2001
++++ libnautilus-private/nautilus-volume-monitor.c	Mon May 14 18:36:00 2001
+@@ -67,6 +67,12 @@
+ #define MOUNT_TABLE_PATH _PATH_MNTTAB
  #endif
  
 +#ifdef __FreeBSD__
@@ -16,29 +16,25 @@ $FreeBSD$
  #ifdef HAVE_SYS_MNTTAB_H
  #define SOLARIS_MNT 1
  #include <sys/mnttab.h>
-@@ -327,6 +333,12 @@
- has_removable_mntent_options (struct mnttab *ent)
- {
+@@ -119,6 +125,8 @@
  
-+#elif defined(__FreeBSD__)
-+
-+static gboolean
-+has_removable_mntent_options (struct fstab *ent)
-+{
-+
+ #ifdef HAVE_SYS_MNTTAB_H
+ typedef struct mnttab MountTableEntry;
++#elif defined __FreeBSD__
++typedef struct fstab MountTableEntry;
  #else
- 
+ typedef struct mntent MountTableEntry;
+ #endif
+@@ -349,12 +357,18 @@
  static gboolean
-@@ -335,12 +347,18 @@
- 
- #endif /* HAVE_SYS_MNTTAB_H */
- 
+ has_removable_mntent_options (MountTableEntry *ent)
+ {
 +#ifndef __FreeBSD__
  	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
  	if (hasmntopt (ent, "user") != NULL
  	    || hasmntopt (ent, "users") != NULL
  	    || hasmntopt (ent, "owner") != NULL) {
- 	    return TRUE;
+ 		return TRUE;
  	}
 +#else
 +	if (strstr (ent->fs_mntops, "noauto") != NULL) {
@@ -46,31 +42,22 @@ $FreeBSD$
 +	}
 +#endif
  
- #if SOLARIS_MNT && HAVE_VOL
-        if (strstr (ent->mnt_special, "/vol/") == ent->mnt_special) {
-@@ -360,23 +378,32 @@
- static GList *
- get_removable_volumes (void)
+ #ifdef SOLARIS_MNT
+ 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
+@@ -377,6 +391,7 @@
  {
-+#ifndef __FreeBSD__
  	FILE *file;
--	GList *volumes;
- #if HAVE_SYS_MNTTAB_H
-         struct mnttab dummy_ent;
-         struct mnttab *ent = &dummy_ent;
- #else
- 	struct mntent *ent;
- #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
-+struct fstab *ent;
-+#endif /* __FreeBSD__ */
-+	GList *volumes;
+ 	GList *volumes;
++
+ 	MountTableEntry *ent;
  	NautilusVolume *volume;
+ #ifdef HAVE_SYS_MNTTAB_H
+@@ -385,11 +400,16 @@
  	
  	volumes = NULL;
  	
 +#ifndef __FreeBSD__
- 	file = setmntent (PATH_MOUNT_TABLE, "r");
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
  	if (file == NULL) {
  		return NULL;
  	}
@@ -79,132 +66,115 @@ $FreeBSD$
 +#endif /* __FreeBSD__ */
  	
 +#ifndef __FreeBSD__
- #if HAVE_SYS_MNTTAB_H
+ #ifdef HAVE_SYS_MNTTAB_H
+         ent = &ent_storage;
  	while (! getmntent (file, ent)) {
- 		/* On Solaris look for /vol/ for determining a removable volume */
-@@ -396,12 +423,27 @@
- 			volume->filesystem = g_strdup (ent->mnt_type);
- 
+@@ -409,8 +429,20 @@
+ 		}
+ 	}
  #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
+-			
++
+ 	fclose (file);
++			
++#else	/* __FreeBSD__ */
 +	while ((ent = getfsent ()) != NULL) {
 +		/* Use noauto as our way of determining a removable volume */
 +		if (strstr (ent->fs_mntops, "noauto") != NULL) {
-+			volume = g_new0 (NautilusVolume, 1);
-+			volume->device_path = g_strdup (ent->fs_spec);
-+			volume->mount_path = g_strdup (ent->fs_file);
-+			volume->filesystem = g_strdup (ent->fs_vfstype);
-+			volume->is_removable = TRUE;
-+			volume->is_read_only = (strstr (ent->fs_type, FSTAB_RO) !=NULL);
-+#endif /* __FreeBSD__ */
- 
- 			volumes = mount_volume_add_filesystem (volume, volumes);
- 		}	
- 	}
- 			
-+#ifndef __FreeBSD__
- 	fclose (file);
-+#else
++			volume = create_volume (ent->fs_spec, ent->fs_file, ent->fs_vfstype);
++			volumes = mount_volume_add_filesystem (volume, volumes);
++		}
++	}
++
 +	endfsent();
-+#endif
++#endif /* __FreeBSD__ */
  	
- #ifdef MOUNT_AUDIO_CD
- 	volume = g_new0 (NautilusVolume, 1);
-@@ -419,6 +461,7 @@
+ #ifdef HAVE_CDDA
+ 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME);
+@@ -427,18 +459,27 @@
  static gboolean
  volume_is_removable (const NautilusVolume *volume)
  {
-+#ifndef __FreeBSD__
++#ifndef	__FreeBSD__
  	FILE *file;
- #if HAVE_SYS_MNTTAB_H
- 	struct mnttab dummy_ent;
-@@ -426,13 +469,21 @@
- #else
-      	struct mntent *ent;
- #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
+      	MountTableEntry *ent;
+ #ifdef HAVE_SYS_MNTTAB_H
+ 	MountTableEntry ent_storage;
+ #endif
++#else	/* __FreeBSD__ */
 +	struct fstab *ent;
-+#endif /* __FreeBSD__ */
- 	
++#endif	/* __FreeBSD__ */
+ 
 +#ifndef __FreeBSD__
- 	file = setmntent (PATH_MOUNT_TABLE, "r");
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
  	if (file == NULL) {
  		return FALSE;
  	}
 +#else
 +	setfsent();
-+#endif /* __FreeBSD__ */
++#endif	/* __FreeBSD__ */
  	
  	/* Search for our device in the fstab */
 +#ifndef __FreeBSD__
- #if HAVE_SYS_MNTTAB_H
+ #ifdef HAVE_SYS_MNTTAB_H
+ 	MountTableEntry *ent = &ent_storage;
  	while (!getmntent (file, ent)) {
- 		if (strcmp (volume->device_path, ent->mnt_special) == 0) {
-@@ -455,8 +506,23 @@
+@@ -460,8 +501,22 @@
+ 		}	
  	}
- 
  #endif /* HAVE_SYS_MNTTAB_H */
--	
 +#else  /* __FreeBSD__ */
 +	while ((ent = getfsent ()) != NULL) {
 +		/* Use noauto as our way of determining a removable volume */
 +		if (strcmp (volume->device_path, ent->fs_spec) == 0
 +		    && has_removable_mntent_options (ent)) {
-+		    	endfsent();
-+		    	return TRUE;
++			endfsent();
++			return TRUE;
 +		}
 +	}
-+#endif /* __FreeBSD__ */
-+			
 +
-+#ifndef __FreeBSD__	
- 	fclose (file);
-+#else
 +	endfsent();
++#endif	/* __FreeBSD__ */
+ 	
++#ifndef __FreeBSD__
+ 	fclose (file);
 +#endif
  	return FALSE;
  }
  
-@@ -484,14 +550,23 @@
+@@ -490,12 +545,17 @@
   		}
   	}
  #else
 +#ifndef __FreeBSD__
- 	struct mntent *ent;
--	
-+#else
-+	struct fstab *ent;
-+#endif
-+
-+#ifndef __FreeBSD__
- 	file = setmntent (PATH_MOUNT_TABLE, "r");
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
  	if (file == NULL) {
  		return FALSE;
  	}
--		
 +#else
 +	setfsent();
-+#endif /* __FreeBSD__ */
-+
++#endif	/* __FreeBSD__ */
+ 		
  	/* Search for our device in the fstab */
 +#ifndef __FreeBSD__
  	while ((ent = getmntent (file)) != NULL) {
  		if (strcmp (volume->device_path, ent->mnt_fsname) == 0) {
  			if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) {
-@@ -500,9 +575,21 @@
+@@ -504,9 +564,22 @@
  			}
          	 }
  	}
-+#else  /* __FreeBSD__ */
++#else	/* __FreeBSD__ */
 +	while ((ent = getfsent ()) != NULL) {
 +		if (strcmp (volume->device_path, ent->fs_spec) == 0
 +		    && strstr (ent->fs_type, FSTAB_RO) != NULL) {
-+		    	endfsent();
-+		    	return TRUE;
++			endfsent();
++			return TRUE;
 +		}
 +	}
++
 +	endfsent();
-+#endif
++#endif	/* __FreeBSD__ */
  #endif
  				
 +#ifndef __FreeBSD__
@@ -213,37 +183,47 @@ $FreeBSD$
  	return FALSE;
  }
  
-@@ -975,14 +1062,26 @@
-         
-        
+@@ -948,13 +1021,20 @@
+ 		}
+ 	}
  #else
 +#ifndef __FreeBSD__
+ 	const char *file_name;
+ 	const char *separator;
  	char line[PATH_MAX * 3];
  	char device_name[sizeof (line)];
- 	NautilusStringList *list;
-+#else  /* __FreeBSD__ */
+ 	EelStringList *list;
+ 	char *device_path, *mount_path, *filesystem;
++#else	/* __FreeBSD__ */
 +	struct statfs *mounted;
 +	int mounted_num;
 +	int i;
-+#endif /* __FreeBSD__ */
++#endif	/* __FreeBSD__ */
  
 +#ifndef __FreeBSD__
- 	/* Open /proc/mounts */
- 	fh = fopen (PATH_PROC_MOUNTS, "r");
- 	g_return_val_if_fail (fh != NULL, NULL);
-+#else   /* __FreeBSD__ */
+ 	if (mnttab_exists) { 
+ 		file_name = "/etc/mnttab";
+ 		separator = "\t";
+@@ -967,7 +1047,15 @@
+ 		g_warning ("Unable to open %s: %s", file_name, strerror (errno));
+ 		return NULL;
+ 	}
++#else	/* __FreeBSD__ */
 +	mounted_num = getmntinfo(&mounted, MNT_WAIT);
-+	g_return_val_if_fail (mounted_num > 0, NULL);
-+#endif  /* __FreeBSD__ */
++	if (mounted_num < 1) {
++		g_warning ("Unable to get info about mounted fs: %s", strerror (errno));
++		return NULL;
++	}
++#endif	/* __FreeBSD__ */
  
 +#ifndef __FreeBSD__
  	while (fgets (line, sizeof(line), fh)) {
  		if (sscanf (line, "%s", device_name) == 1) {
- 			list = nautilus_string_list_new_from_tokens (line, PROC_MOUNTS_SEPARATOR, FALSE);			
-@@ -995,11 +1094,20 @@
- 					volume->device_path = nautilus_string_list_nth (list, 0);
- 					volume->mount_path = nautilus_string_list_nth (list, 1);
- 					volume->filesystem = nautilus_string_list_nth (list, 2);
+ 			list = eel_string_list_new_from_tokens (line, separator, FALSE);
+@@ -983,17 +1071,28 @@
+ 					g_free (device_path);
+ 					g_free (mount_path);
+ 					g_free (filesystem);
 +#else /* __FreeBSD__ */
 +	for (i = 0; i < mounted_num; i++) {
 +		volume = g_new0 (NautilusVolume, 1);
@@ -254,44 +234,27 @@ $FreeBSD$
  					current_mounts = mount_volume_add_filesystem (volume, current_mounts);
 +#ifndef __FreeBSD__
  				}				
- 				nautilus_string_list_free (list);
+ 				eel_string_list_free (list);
  			}			
  		}
 +#endif /* __FreeBSD__ */
    	}
- 
  #endif /* SOLARIS_MNT */
-@@ -1019,7 +1127,9 @@
- 	}
- #endif
  
 +#ifndef __FreeBSD__
- 	fclose (fh);
-+#endif
- 	
- 	return current_mounts;
- 
-@@ -1375,6 +1485,14 @@
- 			break;
- 		}
- 	}
-+#ifdef __FreeBSD__
-+	struct fstab *ent;
-+
-+	setfsent ();
-+	while ((ent = getfsent ())) 
-+		fstab_add_mount_volume (monitor, ent);
-+	endfsent ();
-+#endif	/* __FreeBSD__ */
- }
- #endif
- 
-@@ -1869,7 +1987,7 @@
+ 	if (fh != NULL) {
+ 		fclose (fh);
  	}
++#endif
  	
- 	if (mounted) {
--#ifndef SOLARIS_MNT			
+ #ifdef HAVE_CDDA
+ 	/* CD Audio tricks */
+@@ -1888,7 +1987,7 @@
+ 	for (element = volume_list; element != NULL; element = element->next) {
+ 		volume = element->data;
+ 		
+-#ifndef SOLARIS_MNT
 +#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__)
+ 		/* These are set up by get_current_mount_list for Solaris. */
  		volume->is_removable = volume_is_removable (volume);
  		volume->is_read_only = volume_is_read_only (volume);
- #endif /* SOLARIS_MNT */
diff --git a/x11-fm/nautilus/files/patch-ak b/x11-fm/nautilus/files/patch-ak
deleted file mode 100644
index f5aa84593eaf..000000000000
--- a/x11-fm/nautilus/files/patch-ak
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnautilus-extensions/nautilus-sound.c.orig	Fri Oct  6 14:47:41 2000
-+++ libnautilus-extensions/nautilus-sound.c	Fri Jan 12 10:39:00 2001
-@@ -28,3 +28,7 @@
- #include <signal.h>
-+#ifdef __FreeBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #include <esd.h>
diff --git a/x11-fm/nautilus/files/patch-components::help::hyperbola-filefmt.c b/x11-fm/nautilus/files/patch-components::help::hyperbola-filefmt.c
new file mode 100644
index 000000000000..5331a9db1187
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-components::help::hyperbola-filefmt.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- components/help/hyperbola-filefmt.c	2001/05/14 15:56:20	1.1
++++ components/help/hyperbola-filefmt.c	2001/05/14 15:56:32
+@@ -30,6 +30,7 @@
+ #include <libgnome/gnome-util.h>
+ #include <limits.h>
+ #include <parser.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <string.h>
+ #include <tree.h>
diff --git a/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c
index 9874e0a31be6..68e98b1542e9 100644
--- a/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- libnautilus-extensions/nautilus-medusa-support.c	2001/05/10 11:39:29	1.1
-+++ libnautilus-extensions/nautilus-medusa-support.c	2001/05/10 11:40:00
-@@ -108,7 +108,7 @@
- 		/* Process files have numbers */
- 		if (nautilus_str_to_int (file->d_name,
- 					 &process_number)) {
--			stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
-+			stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
- 			stat_file = fopen (stat_file_name, "r");
- 			g_free (stat_file_name);
+--- libnautilus-private/nautilus-medusa-support.c.orig	Wed Apr 11 21:36:16 2001
++++ libnautilus-private/nautilus-medusa-support.c	Mon May 14 17:45:24 2001
+@@ -84,7 +84,7 @@
+ 		 */
+ 		status = NAUTILUS_CRON_STATUS_OFF;
  
+-		stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
++		stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
+ 		stat_file = fopen (stat_file_name, "r");
+ 		g_free (stat_file_name);
+ 		
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 5d4f6e3c0e56..5b03e0550044 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -4,16 +4,16 @@ bin/gnome-man2html2
 bin/hyperbola
 bin/nautilus
 bin/nautilus-adapter
-bin/nautilus-authenticate
 bin/nautilus-clean.sh
+bin/nautilus-config
 bin/nautilus-content-loser
 bin/nautilus-error-dialog
 bin/nautilus-hardware-view
 bin/nautilus-history-view
 bin/nautilus-image-view
 bin/nautilus-launcher-applet
-%%MOZILLA:%%bin/nautilus-mozilla-content-view
 bin/nautilus-music-view
+bin/nautilus-news
 bin/nautilus-notes
 bin/nautilus-preferences-applet
 bin/nautilus-restore-settings-to-default.sh
@@ -40,28 +40,29 @@ include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.0
-lib/libnautilus-extensions.so
-lib/libnautilus-extensions.so.0
+lib/libnautilus-private.so
+lib/libnautilus-private.so.0
 lib/libnautilus-tree-view.so
 lib/libnautilus-tree-view.so.0
 lib/libnautilus.so
 lib/libnautilus.so.0
+lib/nautilusConf.sh
 lib/vfs/modules/libvfs-help.so
 share/gnome/apps/Applications/nautilus.desktop
 share/gnome/help/gnufdl/C/gnufdl.sgml
 share/gnome/help/gnugpl/C/gnugpl.sgml
-share/gnome/help/nautilus-quick-reference/C/figures/emblems.png
+share/gnome/help/nautilus-quick-reference/C/figures/backgrounds_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/emblems_nqr.png
 share/gnome/help/nautilus-quick-reference/C/figures/find.png
-share/gnome/help/nautilus-quick-reference/C/figures/full.png
-share/gnome/help/nautilus-quick-reference/C/figures/locbar.png
-share/gnome/help/nautilus-quick-reference/C/figures/menubar.png
-share/gnome/help/nautilus-quick-reference/C/figures/music.png
-share/gnome/help/nautilus-quick-reference/C/figures/navbar.png
-share/gnome/help/nautilus-quick-reference/C/figures/patterns.png
-share/gnome/help/nautilus-quick-reference/C/figures/sidebar.png
+share/gnome/help/nautilus-quick-reference/C/figures/locationbar_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/menus_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/music_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/nautilus_window_full_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/sidebar_nqr.png
 share/gnome/help/nautilus-quick-reference/C/figures/softcat.png
 share/gnome/help/nautilus-quick-reference/C/figures/storage.png
-share/gnome/help/nautilus-quick-reference/C/figures/themes.png
+share/gnome/help/nautilus-quick-reference/C/figures/themes_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/toolbar_nqr.png
 share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png
 share/gnome/help/nautilus-quick-reference/C/index.html
 share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png
@@ -121,79 +122,70 @@ share/gnome/help/nautilus-quick-reference/sv/figures/themes.png
 share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png
 share/gnome/help/nautilus-quick-reference/sv/index.html
 share/gnome/help/nautilus-release-notes/C/beta.html
-share/gnome/help/nautilus-release-notes/C/docbook.css
 share/gnome/help/nautilus-release-notes/C/index.html
-share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
+share/gnome/help/nautilus-release-notes/C/ln7.html
+share/gnome/help/nautilus-release-notes/C/medusa.html
 share/gnome/help/nautilus-release-notes/C/mozilla.html
+share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
 share/gnome/help/nautilus-release-notes/C/new10.html
 share/gnome/help/nautilus-release-notes/C/new102.html
+share/gnome/help/nautilus-release-notes/C/new103.html
 share/gnome/help/nautilus-release-notes/C/require.html
 share/gnome/help/nautilus-release-notes/C/searching.html
 share/gnome/help/nautilus-release-notes/C/session.html
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/caution.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/home.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/important.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/next.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/note.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/prev.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/tip.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/up.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/warning.gif
+share/gnome/help/nautilus-screenshot-guidelines/C/callouts.html
+share/gnome/help/nautilus-screenshot-guidelines/C/circling.html
+share/gnome/help/nautilus-screenshot-guidelines/C/dropshadow.html
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/callout_after.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/callout_before.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/circle_callout_after.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/circle_callout_before.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/dropshadow_after.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/dropshadow_before.png
+share/gnome/help/nautilus-screenshot-guidelines/C/finishingtouches.html
+share/gnome/help/nautilus-screenshot-guidelines/C/generalguidelines.html
+share/gnome/help/nautilus-screenshot-guidelines/C/index.html
+share/gnome/help/nautilus-screenshot-guidelines/C/ln7.html
+share/gnome/help/nautilus-screenshot-guidelines/C/nautilus-screenshot-guidelines.sgml
+share/gnome/help/nautilus-screenshot-guidelines/C/resources.html
+share/gnome/help/nautilus-screenshot-guidelines/C/tools.html
 share/gnome/help/nautilus-user-manual/C/chapter1.html
 share/gnome/help/nautilus-user-manual/C/chapter2.html
-share/gnome/help/nautilus-user-manual/C/docbook.css
-share/gnome/help/nautilus-user-manual/C/figures/custicon.png
+share/gnome/help/nautilus-user-manual/C/figures/custom_icon_num.png
 share/gnome/help/nautilus-user-manual/C/figures/full-1.png
 share/gnome/help/nautilus-user-manual/C/figures/full-2.png
 share/gnome/help/nautilus-user-manual/C/figures/full-3.png
 share/gnome/help/nautilus-user-manual/C/figures/full-4.png
 share/gnome/help/nautilus-user-manual/C/figures/full-5.png
 share/gnome/help/nautilus-user-manual/C/figures/full-6.png
-share/gnome/help/nautilus-user-manual/C/figures/full.png
+share/gnome/help/nautilus-user-manual/C/figures/help_num.png
+share/gnome/help/nautilus-user-manual/C/figures/home_folder_num.png
 share/gnome/help/nautilus-user-manual/C/figures/link.png
-share/gnome/help/nautilus-user-manual/C/figures/locbar.png
+share/gnome/help/nautilus-user-manual/C/figures/locationbar_nqr.png
+share/gnome/help/nautilus-user-manual/C/figures/nautilus_window_full_num.png
+share/gnome/help/nautilus-user-manual/C/figures/news_num.png
 share/gnome/help/nautilus-user-manual/C/figures/noread.png
 share/gnome/help/nautilus-user-manual/C/figures/nowrite.png
-share/gnome/help/nautilus-user-manual/C/figures/part-1.png
-share/gnome/help/nautilus-user-manual/C/figures/part-2.png
-share/gnome/help/nautilus-user-manual/C/figures/part-3.png
-share/gnome/help/nautilus-user-manual/C/figures/part.png
 share/gnome/help/nautilus-user-manual/C/figures/player-1.png
 share/gnome/help/nautilus-user-manual/C/figures/player-2.png
 share/gnome/help/nautilus-user-manual/C/figures/player-3.png
 share/gnome/help/nautilus-user-manual/C/figures/player-4.png
 share/gnome/help/nautilus-user-manual/C/figures/player.png
-share/gnome/help/nautilus-user-manual/C/figures/prefmenu.png
-share/gnome/help/nautilus-user-manual/C/figures/sidebar.png
+share/gnome/help/nautilus-user-manual/C/figures/preferences_menu_num.png
+share/gnome/help/nautilus-user-manual/C/figures/sidebar_num.png
 share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png
 share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png
 share/gnome/help/nautilus-user-manual/C/gnome.html
-share/gnome/help/nautilus-user-manual/C/home.html
 share/gnome/help/nautilus-user-manual/C/index.html
 share/gnome/help/nautilus-user-manual/C/introdesktop.html
 share/gnome/help/nautilus-user-manual/C/ln21.html
 share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/C/navigating.html
 share/gnome/help/nautilus-user-manual/C/session.html
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/caution.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/home.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/important.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/next.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/note.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/prev.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/tip.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/up.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/warning.gif
+share/gnome/help/nautilus-user-manual/C/tree.html
+share/gnome/help/nautilus-user-manual/C/viewopen.html
 share/gnome/help/nautilus-user-manual/es/chapter1.html
 share/gnome/help/nautilus-user-manual/es/chapter2.html
-share/gnome/help/nautilus-user-manual/es/default.html
-share/gnome/help/nautilus-user-manual/es/docbook.css
 share/gnome/help/nautilus-user-manual/es/figures/custicon.png
 share/gnome/help/nautilus-user-manual/es/figures/full.png
 share/gnome/help/nautilus-user-manual/es/figures/link.png
@@ -213,23 +205,10 @@ share/gnome/help/nautilus-user-manual/es/introdesktop.html
 share/gnome/help/nautilus-user-manual/es/ln18.html
 share/gnome/help/nautilus-user-manual/es/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/es/navigating.html
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/caution.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/home.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/important.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/next.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/note.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/prev.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/tip.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/up.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/warning.gif
 share/gnome/help/nautilus-user-manual/es/tree.html
 share/gnome/help/nautilus-user-manual/es/viewopen.html
 share/gnome/help/nautilus-user-manual/ko/chapter1.html
 share/gnome/help/nautilus-user-manual/ko/chapter2.html
-share/gnome/help/nautilus-user-manual/ko/docbook.css
 share/gnome/help/nautilus-user-manual/ko/figures/custicon.png
 share/gnome/help/nautilus-user-manual/ko/figures/full-1.png
 share/gnome/help/nautilus-user-manual/ko/figures/full-2.png
@@ -262,18 +241,6 @@ share/gnome/help/nautilus-user-manual/ko/introdesktop.html
 share/gnome/help/nautilus-user-manual/ko/ln18.html
 share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/ko/navigating.html
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/caution.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/home.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/important.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/next.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/note.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/prev.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/tip.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/up.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/warning.gif
 share/gnome/help/nautilus-user-manual/ko/tree.html
 share/gnome/help/nautilus-user-manual/ko/viewopen.html
 share/gnome/nautilus/browser.xml
@@ -293,19 +260,6 @@ share/gnome/nautilus/emblems/ohno.png
 share/gnome/nautilus/emblems/personal.png
 share/gnome/nautilus/emblems/special.png
 share/gnome/nautilus/emblems/urgent.png
-share/gnome/nautilus/fonts/urw/fonts.dir
-share/gnome/nautilus/fonts/urw/n019003l.afm
-share/gnome/nautilus/fonts/urw/n019003l.pfb
-share/gnome/nautilus/fonts/urw/n019003l.pfm
-share/gnome/nautilus/fonts/urw/n019004l.afm
-share/gnome/nautilus/fonts/urw/n019004l.pfb
-share/gnome/nautilus/fonts/urw/n019004l.pfm
-share/gnome/nautilus/fonts/urw/n019023l.afm
-share/gnome/nautilus/fonts/urw/n019023l.pfb
-share/gnome/nautilus/fonts/urw/n019023l.pfm
-share/gnome/nautilus/fonts/urw/n019024l.afm
-share/gnome/nautilus/fonts/urw/n019024l.pfb
-share/gnome/nautilus/fonts/urw/n019024l.pfm
 share/gnome/nautilus/linksets/apps.xml
 share/gnome/nautilus/linksets/desktop.xml
 share/gnome/nautilus/linksets/home.xml
@@ -313,6 +267,7 @@ share/gnome/nautilus/linksets/portals.xml
 share/gnome/nautilus/linksets/search_engines.xml
 share/gnome/nautilus/nautilus-extras.placeholder
 share/gnome/nautilus/nautilus-suggested.placeholder
+share/gnome/nautilus/news_channels.xml
 share/gnome/nautilus/patterns/.striated.png
 share/gnome/nautilus/patterns/blue_gray_rough.png
 share/gnome/nautilus/patterns/blue_ridge.png
@@ -355,14 +310,23 @@ share/gnome/oaf/Nautilus_View_hardware.oaf
 share/gnome/oaf/Nautilus_View_help.oaf
 share/gnome/oaf/Nautilus_View_history.oaf
 share/gnome/oaf/Nautilus_View_image.oaf
-%%MOZILLA:%%share/gnome/oaf/Nautilus_View_mozilla.oaf
 share/gnome/oaf/Nautilus_View_music.oaf
+share/gnome/oaf/Nautilus_View_news.oaf
 share/gnome/oaf/Nautilus_View_notes.oaf
 share/gnome/oaf/Nautilus_View_sample.oaf
 share/gnome/oaf/Nautilus_View_sidebar-loser.oaf
 share/gnome/oaf/Nautilus_View_text.oaf
 share/gnome/oaf/Nautilus_View_tree.oaf
 share/gnome/oaf/Nautilus_shell.oaf
+share/gnome/omf/nautilus/nautilus-quick-reference-C.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-es.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-ko.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-no.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-sv.omf
+share/gnome/omf/nautilus/nautilus-release-notes-C.omf
+share/gnome/omf/nautilus/nautilus-user-manual-C.omf
+share/gnome/omf/nautilus/nautilus-user-manual-es.omf
+share/gnome/omf/nautilus/nautilus-user-manual-ko.omf
 share/gnome/pixmaps/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/About_Image.png
 share/gnome/pixmaps/nautilus/Back.png
@@ -376,134 +340,13 @@ share/gnome/pixmaps/nautilus/Services.png
 share/gnome/pixmaps/nautilus/Stop.png
 share/gnome/pixmaps/nautilus/Up.png
 share/gnome/pixmaps/nautilus/about_background.png
-share/gnome/pixmaps/nautilus/ardmore/ardmore.xml
-share/gnome/pixmaps/nautilus/ardmore/blueridge.png
-share/gnome/pixmaps/nautilus/ardmore/bluewall.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-12.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-24.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-36.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-72.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-96.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory.png
-share/gnome/pixmaps/nautilus/ardmore/number_strip.png
-share/gnome/pixmaps/nautilus/ardmore/theme_preview.png
-share/gnome/pixmaps/nautilus/arlo/Back.png
-share/gnome/pixmaps/nautilus/arlo/Forward.png
-share/gnome/pixmaps/nautilus/arlo/Home.png
-share/gnome/pixmaps/nautilus/arlo/Refresh.png
-share/gnome/pixmaps/nautilus/arlo/Search.png
-share/gnome/pixmaps/nautilus/arlo/SearchWeb.png
-share/gnome/pixmaps/nautilus/arlo/Stop.png
-share/gnome/pixmaps/nautilus/arlo/Up.png
-share/gnome/pixmaps/nautilus/arlo/arlo.xml
-share/gnome/pixmaps/nautilus/arlo/backgrounds/background_pattern.png
-share/gnome/pixmaps/nautilus/arlo/backgrounds/window_pattern.png
-share/gnome/pixmaps/nautilus/arlo/decrement-i.png
-share/gnome/pixmaps/nautilus/arlo/decrement.png
-share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/arlo/emblem-nowrite.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-12-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-12.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-192-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-192.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-20-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-20.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-24-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-24.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-36-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-36.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-72-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-72.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-96-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-96.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory.png
-share/gnome/pixmaps/nautilus/arlo/i-directory.xml
-share/gnome/pixmaps/nautilus/arlo/i-regular-12-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-12.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-192-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-192.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-20-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-20.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-24-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-24.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-36-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-36.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-72-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-72.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-96-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-96.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular.png
-share/gnome/pixmaps/nautilus/arlo/i-regular.xml
-share/gnome/pixmaps/nautilus/arlo/increment-i.png
-share/gnome/pixmaps/nautilus/arlo/increment.png
-share/gnome/pixmaps/nautilus/arlo/number_strip.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-active-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-active.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-empty-space.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper-active-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper-active.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/middle-normal-normal.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/middle-normal-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/middle-prelight-normal.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-bumper-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-bumper.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-empty-space.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top-active-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top-active.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top.png
-share/gnome/pixmaps/nautilus/arlo/theme_preview.png
-share/gnome/pixmaps/nautilus/arlo/throbber/001.png
-share/gnome/pixmaps/nautilus/arlo/throbber/002.png
-share/gnome/pixmaps/nautilus/arlo/throbber/003.png
-share/gnome/pixmaps/nautilus/arlo/throbber/004.png
-share/gnome/pixmaps/nautilus/arlo/throbber/005.png
-share/gnome/pixmaps/nautilus/arlo/throbber/006.png
-share/gnome/pixmaps/nautilus/arlo/throbber/007.png
-share/gnome/pixmaps/nautilus/arlo/throbber/008.png
-share/gnome/pixmaps/nautilus/arlo/throbber/009.png
-share/gnome/pixmaps/nautilus/arlo/throbber/010.png
-share/gnome/pixmaps/nautilus/arlo/throbber/011.png
-share/gnome/pixmaps/nautilus/arlo/throbber/012.png
-share/gnome/pixmaps/nautilus/arlo/throbber/013.png
-share/gnome/pixmaps/nautilus/arlo/throbber/014.png
-share/gnome/pixmaps/nautilus/arlo/throbber/015.png
-share/gnome/pixmaps/nautilus/arlo/throbber/016.png
-share/gnome/pixmaps/nautilus/arlo/throbber/017.png
-share/gnome/pixmaps/nautilus/arlo/throbber/018.png
-share/gnome/pixmaps/nautilus/arlo/throbber/019.png
-share/gnome/pixmaps/nautilus/arlo/throbber/020.png
-share/gnome/pixmaps/nautilus/arlo/throbber/021.png
-share/gnome/pixmaps/nautilus/arlo/throbber/022.png
-share/gnome/pixmaps/nautilus/arlo/throbber/023.png
-share/gnome/pixmaps/nautilus/arlo/throbber/024.png
-share/gnome/pixmaps/nautilus/arlo/throbber/025.png
-share/gnome/pixmaps/nautilus/arlo/throbber/026.png
-share/gnome/pixmaps/nautilus/arlo/throbber/027.png
-share/gnome/pixmaps/nautilus/arlo/throbber/028.png
-share/gnome/pixmaps/nautilus/arlo/throbber/029.png
-share/gnome/pixmaps/nautilus/arlo/throbber/030.png
-share/gnome/pixmaps/nautilus/arlo/throbber/rest.png
-share/gnome/pixmaps/nautilus/arlo/zoom_body.png
 share/gnome/pixmaps/nautilus/audio.png
 share/gnome/pixmaps/nautilus/backgrounds.png
 share/gnome/pixmaps/nautilus/bubble-LL.png
 share/gnome/pixmaps/nautilus/bubble-LR.png
 share/gnome/pixmaps/nautilus/bubble-UL.png
 share/gnome/pixmaps/nautilus/bubble-UR.png
+share/gnome/pixmaps/nautilus/changed_bullet.png
 share/gnome/pixmaps/nautilus/chit_frame.png
 share/gnome/pixmaps/nautilus/colors.png
 share/gnome/pixmaps/nautilus/computer.png
@@ -598,6 +441,111 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png
 share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png
 share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png
 share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png
+share/gnome/pixmaps/nautilus/crux_teal/Back.png
+share/gnome/pixmaps/nautilus/crux_teal/Forward.png
+share/gnome/pixmaps/nautilus/crux_teal/Home.png
+share/gnome/pixmaps/nautilus/crux_teal/Refresh.png
+share/gnome/pixmaps/nautilus/crux_teal/Search.png
+share/gnome/pixmaps/nautilus/crux_teal/SearchWeb.png
+share/gnome/pixmaps/nautilus/crux_teal/Stop.png
+share/gnome/pixmaps/nautilus/crux_teal/Up.png
+share/gnome/pixmaps/nautilus/crux_teal/backgrounds/background_pattern.png
+share/gnome/pixmaps/nautilus/crux_teal/backgrounds/window_pattern.png
+share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
+share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
+share/gnome/pixmaps/nautilus/crux_teal/decrement.png
+share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-72.png
+share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-96.png
+share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-12-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-12.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-192-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-192.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-20-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-20.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-24-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-24.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-36-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-36.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-72-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-72.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-96-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-96.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory.xml
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-12-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-12.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-192-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-192.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-20-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-20.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-24-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-24.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-36-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-36.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-72-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-72.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-96-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-96.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular.xml
+share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
+share/gnome/pixmaps/nautilus/crux_teal/increment.png
+share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-active-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-active.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-empty-space.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-active-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-active.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-normal-normal.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-normal-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-prelight-normal.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-bumper-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-bumper.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-empty-space.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-active-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-active.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top.png
+share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/003.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/004.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/005.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/006.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/007.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/008.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/009.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/010.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/011.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/012.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/013.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/014.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/015.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/016.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/017.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/018.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/019.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/020.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/021.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/022.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/023.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/024.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/025.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/026.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/027.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/028.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/029.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/030.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/rest.png
+share/gnome/pixmaps/nautilus/crux_teal/zoom_body.png
 share/gnome/pixmaps/nautilus/decrement.png
 share/gnome/pixmaps/nautilus/default.xml
 share/gnome/pixmaps/nautilus/druid_header.png
@@ -759,6 +707,12 @@ share/gnome/pixmaps/nautilus/hand-72.png
 share/gnome/pixmaps/nautilus/hand-96.png
 share/gnome/pixmaps/nautilus/hand.png
 share/gnome/pixmaps/nautilus/home.png
+share/gnome/pixmaps/nautilus/hyperbola-book-closed.png
+share/gnome/pixmaps/nautilus/hyperbola-book-open.png
+share/gnome/pixmaps/nautilus/hyperbola-folder-closed.png
+share/gnome/pixmaps/nautilus/hyperbola-folder-open.png
+share/gnome/pixmaps/nautilus/hyperbola-section-closed.png
+share/gnome/pixmaps/nautilus/hyperbola-section-open.png
 share/gnome/pixmaps/nautilus/i-blockdev.png
 share/gnome/pixmaps/nautilus/i-bookmark-20.png
 share/gnome/pixmaps/nautilus/i-bookmark-missing-20.png
@@ -846,7 +800,9 @@ share/gnome/pixmaps/nautilus/memory_chip.gif
 share/gnome/pixmaps/nautilus/multi-ok.png
 share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
 share/gnome/pixmaps/nautilus/netscape.png
+share/gnome/pixmaps/nautilus/news_bullet.png
 share/gnome/pixmaps/nautilus/not.png
+share/gnome/pixmaps/nautilus/note-indicator.png
 share/gnome/pixmaps/nautilus/novice-selected.png
 share/gnome/pixmaps/nautilus/novice.png
 share/gnome/pixmaps/nautilus/number_strip.png
@@ -873,7 +829,55 @@ share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active-prelight.png
 share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active.png
 share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-prelight.png
 share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top.png
+share/gnome/pixmaps/nautilus/sierra/Sierra_desktop.png
+share/gnome/pixmaps/nautilus/sierra/green_weave.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-12-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-12.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-24-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-24.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-36-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-36.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-72-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-72.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-96-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-96.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept.png
+share/gnome/pixmaps/nautilus/sierra/i-directory.png
+share/gnome/pixmaps/nautilus/sierra/number_strip.png
+share/gnome/pixmaps/nautilus/sierra/sierra.xml
+share/gnome/pixmaps/nautilus/sierra/sierra_green.png
+share/gnome/pixmaps/nautilus/sierra/theme_preview.png
+share/gnome/pixmaps/nautilus/tahoe/blueridge.png
+share/gnome/pixmaps/nautilus/tahoe/bluewall.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-12.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-24.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-36.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-72.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-96.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-12.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-24.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-36.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-72.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-96.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory.png
+share/gnome/pixmaps/nautilus/tahoe/number_strip.png
+share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
+share/gnome/pixmaps/nautilus/tahoe/theme_preview.png
 share/gnome/pixmaps/nautilus/temp-home.png
+share/gnome/pixmaps/nautilus/text-selection-frame-aa.png
 share/gnome/pixmaps/nautilus/text-selection-frame.png
 share/gnome/pixmaps/nautilus/theme_preview.png
 share/gnome/pixmaps/nautilus/throbber/001.png
@@ -913,43 +917,12 @@ share/gnome/pixmaps/nautilus/tiny-alert.png
 share/gnome/pixmaps/nautilus/trash-empty.png
 share/gnome/pixmaps/nautilus/trash-full.png
 share/gnome/pixmaps/nautilus/uparrow.png
-share/gnome/pixmaps/nautilus/villanova/Sierra_desktop.png
-share/gnome/pixmaps/nautilus/villanova/green_weave.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-12-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-12.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-24-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-24.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-36-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-36.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-72-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-72.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-96-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-96.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-12-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-24-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept.png
-share/gnome/pixmaps/nautilus/villanova/i-directory.png
-share/gnome/pixmaps/nautilus/villanova/number_strip.png
-share/gnome/pixmaps/nautilus/villanova/theme_preview.png
-share/gnome/pixmaps/nautilus/villanova/villanova.xml
-share/gnome/pixmaps/nautilus/villanova/villanova_green.png
 share/gnome/pixmaps/nautilus/zoom_body.png
 share/gnome/ui/nautilus-clipboard-ui.xml
 share/gnome/ui/nautilus-content-loser-ui.xml
 share/gnome/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/ui/nautilus-directory-view-ui.xml
 share/gnome/ui/nautilus-icon-view-ui.xml
-%%MOZILLA:%%share/gnome/ui/nautilus-mozilla-ui.xml
 share/gnome/ui/nautilus-sample-content-view-ui.xml
 share/gnome/ui/nautilus-search-list-view-ui.xml
 share/gnome/ui/nautilus-service-ui.xml
@@ -958,6 +931,7 @@ share/gnome/ui/nautilus-sidebar-loser-ui.xml
 share/gnome/ui/nautilus-text-view-ui.xml
 share/locale/az/LC_MESSAGES/nautilus.mo
 share/locale/ca/LC_MESSAGES/nautilus.mo
+share/locale/cs/LC_MESSAGES/nautilus.mo
 share/locale/da/LC_MESSAGES/nautilus.mo
 share/locale/de/LC_MESSAGES/nautilus.mo
 share/locale/el/LC_MESSAGES/nautilus.mo
@@ -971,6 +945,7 @@ share/locale/hu/LC_MESSAGES/nautilus.mo
 share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
+share/locale/lt/LC_MESSAGES/nautilus.mo
 share/locale/nl/LC_MESSAGES/nautilus.mo
 share/locale/nn/LC_MESSAGES/nautilus.mo
 share/locale/no/LC_MESSAGES/nautilus.mo
@@ -984,29 +959,28 @@ share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo
 share/locale/uk/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo
-@dirrm share/gnome/pixmaps/nautilus/villanova
 @dirrm share/gnome/pixmaps/nautilus/throbber
+@dirrm share/gnome/pixmaps/nautilus/tahoe
+@dirrm share/gnome/pixmaps/nautilus/sierra
 @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/gnome/throbber
 @dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds
+@dirrm share/gnome/pixmaps/nautilus/crux_teal
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant
-@dirrm share/gnome/pixmaps/nautilus/arlo/throbber
-@dirrm share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/arlo/backgrounds
-@dirrm share/gnome/pixmaps/nautilus/arlo
-@dirrm share/gnome/pixmaps/nautilus/ardmore
 @dirrm share/gnome/pixmaps/nautilus
+@dirrm share/gnome/omf/nautilus
 @dirrm share/gnome/nautilus/services/text
 @dirrm share/gnome/nautilus/services
 @dirrm share/gnome/nautilus/patterns
 @dirrm share/gnome/nautilus/linksets
-@dirrm share/gnome/nautilus/fonts/urw
-@dirrm share/gnome/nautilus/fonts
 @dirrm share/gnome/nautilus/emblems
 @dirrm share/gnome/nautilus/components/hyperbola/maps
 @dirrm share/gnome/nautilus/components/hyperbola
@@ -1022,6 +996,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/help/nautilus-user-manual/C/figures
 @dirrm share/gnome/help/nautilus-user-manual/C
 @dirrm share/gnome/help/nautilus-user-manual
+@dirrm share/gnome/help/nautilus-screenshot-guidelines/C/stylesheet-images
+@dirrm share/gnome/help/nautilus-screenshot-guidelines/C/figures
+@dirrm share/gnome/help/nautilus-screenshot-guidelines/C
+@dirrm share/gnome/help/nautilus-screenshot-guidelines
 @dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images
 @dirrm share/gnome/help/nautilus-release-notes/C/figures
 @dirrm share/gnome/help/nautilus-release-notes/C
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index f1cf1d4d517b..2baa9abb7d2a 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
@@ -21,7 +20,11 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.6:${PORTSDIR}/print/freetype2 \
-		ghttp.1:${PORTSDIR}/www/libghttp
+		ghttp.1:${PORTSDIR}/www/libghttp \
+		eel.0:${PORTSDIR}/x11-toolkits/eel
+
+# Disable - I don't have a time to compile it now. Will be enabled back later.
+WITHOUT_MOZILLA=	yes
 
 .if !defined(WITHOUT_MOZILLA)
 MOZILLA=	mozilla
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 11d30f6f75f6..6fe59855dc7a 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (nautilus-1.0.2.tar.gz) = 9c6b11436e11d7dc184dd5748e7e82ac
+MD5 (nautilus-1.0.3.tar.gz) = 87db068765a72ca46b55ab6064ce3c00
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 5c7b55cccce7..400eddbcaaaa 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,53 +1,23 @@
---- configure.orig	Mon Mar 12 19:48:16 2001
-+++ configure	Fri Mar 16 15:02:38 2001
-@@ -45,5 +45,5 @@
- ac_help="$ac_help
--  --with-freetype2-libraries=PATH		freetype2 library path"
-+  --with-freetype2-lib-place=PREFIX		freetype2 library path"
- ac_help="$ac_help
--  --with-freetype2-includes=PATH	freetype2 include path"
-+  --with-freetype2-include-place=PREFIX	freetype2 include path"
- ac_help="$ac_help
-@@ -3216,4 +3216,4 @@
- # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given.
--if test "${with_freetype2_libraries+set}" = set; then
--  withval="$with_freetype2_libraries"
-+if test "${with_freetype2_lib_place+set}" = set; then
-+  withval="$with_freetype2_lib_place"
-   freetype2_lib_prefix=$withval
-@@ -3223,4 +3223,4 @@
- # Check whether --with-freetype2-includes or --without-freetype2-includes was given.
--if test "${with_freetype2_includes+set}" = set; then
--  withval="$with_freetype2_includes"
-+if test "${with_freetype2_include_place+set}" = set; then
-+  withval="$with_freetype2_include_place"
-   freetype2_include_prefix=$withval
-@@ -3354,3 +3354,3 @@
-   ac_save_LIBS="$LIBS"
--LIBS="-lpam -ldl $LIBS"
-+LIBS="-lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
-@@ -3394,3 +3394,3 @@
-   ac_save_LIBS="$LIBS"
--LIBS="-lpam_misc -ldl -lpam $LIBS"
-+LIBS="-lpam_misc -lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
-@@ -3422,6 +3422,6 @@
-   echo "$ac_t""yes" 1>&6
--  PAM_LIBS="-ldl -lpam -lpam_misc"
-+  PAM_LIBS="-lpam -lpam_misc"
- else
-   echo "$ac_t""no" 1>&6
--PAM_LIBS="-ldl -lpam"
-+PAM_LIBS="-lpam"
- fi
-@@ -3662,3 +3662,3 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon May 14 16:42:41 2001
++++ configure	Mon May 14 16:42:42 2001
+@@ -3433,7 +3433,7 @@
+ 
+ CC="$_save_cc"
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
-@@ -6117,3 +6117,3 @@
+ echo "configure:3439: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
+ ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
+@@ -5472,7 +5472,7 @@
+ fi
+ 
  if test x$SCROLLKEEPER_CONFIG = xno; then
 -  { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; }
 +  echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2
  fi
+ 
+ 
diff --git a/x11-fm/nautilus2/files/patch-ab b/x11-fm/nautilus2/files/patch-ab
index 169e4d76349d..97f5bd09e83e 100644
--- a/x11-fm/nautilus2/files/patch-ab
+++ b/x11-fm/nautilus2/files/patch-ab
@@ -1,28 +1,37 @@
---- Makefile.in.orig	Mon Mar 12 19:49:51 2001
-+++ Makefile.in	Fri Mar 16 16:15:38 2001
-@@ -202,3 +202,3 @@
- 
--SUBDIRS =  	data 				icons 				intl 				cut-n-paste-code 		librsvg 			libnautilus 			libnautilus-adapter		libnautilus-extensions 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		nautilus-installer		test 				user-guide			help				po 				omf-install			$(NULL)
-+SUBDIRS =  	data 				icons 				intl 				cut-n-paste-code 		librsvg 			libnautilus 			libnautilus-adapter		libnautilus-extensions 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		nautilus-installer		test 				user-guide			help				po 				$(NULL)
- 
-@@ -607,4 +607,4 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Mon May 14 16:45:52 2001
++++ Makefile.in	Mon May 14 16:45:53 2001
+@@ -675,8 +675,8 @@
+ 	$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
+ 	@list='nautilus-clean.sh'; for p in $$list; do\
  	  if test -f $(srcdir)/$$p; then \
 -	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
 -	    $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
 +	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
 +	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
  	  else :; fi; \
-@@ -620,4 +620,4 @@
+ 	done
+ 
+@@ -688,16 +688,16 @@
+ 	@list='$(EAZEL_LOGOS_ICONS)'; \
+ 	for i in $$list; \
  	do \
 -		echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \
 -		$(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \
 +		echo $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \
 +		$(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \
  	done
-@@ -628,4 +628,4 @@
+ 
+ 	$(mkinstalldirs) $(throbberdir)
+ 	@list='$(EAZEL_LOGOS_THROBBER)'; \
+ 	for i in $$list; \
  	do \
 -		echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \
 -		$(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \
 +		echo $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \
 +		$(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \
  	done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11-fm/nautilus2/files/patch-ac b/x11-fm/nautilus2/files/patch-ac
index 8e4edd0bf3ab..02e917cf8592 100644
--- a/x11-fm/nautilus2/files/patch-ac
+++ b/x11-fm/nautilus2/files/patch-ac
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- libnautilus-extensions/nautilus-volume-monitor.c.orig	Sat Feb 24 01:54:34 2001
-+++ libnautilus-extensions/nautilus-volume-monitor.c	Sun Mar 11 15:46:11 2001
-@@ -68,6 +68,12 @@
- #include <mntent.h>
+--- libnautilus-private/nautilus-volume-monitor.c.orig	Fri Apr 27 04:19:07 2001
++++ libnautilus-private/nautilus-volume-monitor.c	Mon May 14 18:36:00 2001
+@@ -67,6 +67,12 @@
+ #define MOUNT_TABLE_PATH _PATH_MNTTAB
  #endif
  
 +#ifdef __FreeBSD__
@@ -16,29 +16,25 @@ $FreeBSD$
  #ifdef HAVE_SYS_MNTTAB_H
  #define SOLARIS_MNT 1
  #include <sys/mnttab.h>
-@@ -327,6 +333,12 @@
- has_removable_mntent_options (struct mnttab *ent)
- {
+@@ -119,6 +125,8 @@
  
-+#elif defined(__FreeBSD__)
-+
-+static gboolean
-+has_removable_mntent_options (struct fstab *ent)
-+{
-+
+ #ifdef HAVE_SYS_MNTTAB_H
+ typedef struct mnttab MountTableEntry;
++#elif defined __FreeBSD__
++typedef struct fstab MountTableEntry;
  #else
- 
+ typedef struct mntent MountTableEntry;
+ #endif
+@@ -349,12 +357,18 @@
  static gboolean
-@@ -335,12 +347,18 @@
- 
- #endif /* HAVE_SYS_MNTTAB_H */
- 
+ has_removable_mntent_options (MountTableEntry *ent)
+ {
 +#ifndef __FreeBSD__
  	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
  	if (hasmntopt (ent, "user") != NULL
  	    || hasmntopt (ent, "users") != NULL
  	    || hasmntopt (ent, "owner") != NULL) {
- 	    return TRUE;
+ 		return TRUE;
  	}
 +#else
 +	if (strstr (ent->fs_mntops, "noauto") != NULL) {
@@ -46,31 +42,22 @@ $FreeBSD$
 +	}
 +#endif
  
- #if SOLARIS_MNT && HAVE_VOL
-        if (strstr (ent->mnt_special, "/vol/") == ent->mnt_special) {
-@@ -360,23 +378,32 @@
- static GList *
- get_removable_volumes (void)
+ #ifdef SOLARIS_MNT
+ 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
+@@ -377,6 +391,7 @@
  {
-+#ifndef __FreeBSD__
  	FILE *file;
--	GList *volumes;
- #if HAVE_SYS_MNTTAB_H
-         struct mnttab dummy_ent;
-         struct mnttab *ent = &dummy_ent;
- #else
- 	struct mntent *ent;
- #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
-+struct fstab *ent;
-+#endif /* __FreeBSD__ */
-+	GList *volumes;
+ 	GList *volumes;
++
+ 	MountTableEntry *ent;
  	NautilusVolume *volume;
+ #ifdef HAVE_SYS_MNTTAB_H
+@@ -385,11 +400,16 @@
  	
  	volumes = NULL;
  	
 +#ifndef __FreeBSD__
- 	file = setmntent (PATH_MOUNT_TABLE, "r");
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
  	if (file == NULL) {
  		return NULL;
  	}
@@ -79,132 +66,115 @@ $FreeBSD$
 +#endif /* __FreeBSD__ */
  	
 +#ifndef __FreeBSD__
- #if HAVE_SYS_MNTTAB_H
+ #ifdef HAVE_SYS_MNTTAB_H
+         ent = &ent_storage;
  	while (! getmntent (file, ent)) {
- 		/* On Solaris look for /vol/ for determining a removable volume */
-@@ -396,12 +423,27 @@
- 			volume->filesystem = g_strdup (ent->mnt_type);
- 
+@@ -409,8 +429,20 @@
+ 		}
+ 	}
  #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
+-			
++
+ 	fclose (file);
++			
++#else	/* __FreeBSD__ */
 +	while ((ent = getfsent ()) != NULL) {
 +		/* Use noauto as our way of determining a removable volume */
 +		if (strstr (ent->fs_mntops, "noauto") != NULL) {
-+			volume = g_new0 (NautilusVolume, 1);
-+			volume->device_path = g_strdup (ent->fs_spec);
-+			volume->mount_path = g_strdup (ent->fs_file);
-+			volume->filesystem = g_strdup (ent->fs_vfstype);
-+			volume->is_removable = TRUE;
-+			volume->is_read_only = (strstr (ent->fs_type, FSTAB_RO) !=NULL);
-+#endif /* __FreeBSD__ */
- 
- 			volumes = mount_volume_add_filesystem (volume, volumes);
- 		}	
- 	}
- 			
-+#ifndef __FreeBSD__
- 	fclose (file);
-+#else
++			volume = create_volume (ent->fs_spec, ent->fs_file, ent->fs_vfstype);
++			volumes = mount_volume_add_filesystem (volume, volumes);
++		}
++	}
++
 +	endfsent();
-+#endif
++#endif /* __FreeBSD__ */
  	
- #ifdef MOUNT_AUDIO_CD
- 	volume = g_new0 (NautilusVolume, 1);
-@@ -419,6 +461,7 @@
+ #ifdef HAVE_CDDA
+ 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME);
+@@ -427,18 +459,27 @@
  static gboolean
  volume_is_removable (const NautilusVolume *volume)
  {
-+#ifndef __FreeBSD__
++#ifndef	__FreeBSD__
  	FILE *file;
- #if HAVE_SYS_MNTTAB_H
- 	struct mnttab dummy_ent;
-@@ -426,13 +469,21 @@
- #else
-      	struct mntent *ent;
- #endif /* HAVE_SYS_MNTTAB_H */
-+#else  /* __FreeBSD__ */
+      	MountTableEntry *ent;
+ #ifdef HAVE_SYS_MNTTAB_H
+ 	MountTableEntry ent_storage;
+ #endif
++#else	/* __FreeBSD__ */
 +	struct fstab *ent;
-+#endif /* __FreeBSD__ */
- 	
++#endif	/* __FreeBSD__ */
+ 
 +#ifndef __FreeBSD__
- 	file = setmntent (PATH_MOUNT_TABLE, "r");
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
  	if (file == NULL) {
  		return FALSE;
  	}
 +#else
 +	setfsent();
-+#endif /* __FreeBSD__ */
++#endif	/* __FreeBSD__ */
  	
  	/* Search for our device in the fstab */
 +#ifndef __FreeBSD__
- #if HAVE_SYS_MNTTAB_H
+ #ifdef HAVE_SYS_MNTTAB_H
+ 	MountTableEntry *ent = &ent_storage;
  	while (!getmntent (file, ent)) {
- 		if (strcmp (volume->device_path, ent->mnt_special) == 0) {
-@@ -455,8 +506,23 @@
+@@ -460,8 +501,22 @@
+ 		}	
  	}
- 
  #endif /* HAVE_SYS_MNTTAB_H */
--	
 +#else  /* __FreeBSD__ */
 +	while ((ent = getfsent ()) != NULL) {
 +		/* Use noauto as our way of determining a removable volume */
 +		if (strcmp (volume->device_path, ent->fs_spec) == 0
 +		    && has_removable_mntent_options (ent)) {
-+		    	endfsent();
-+		    	return TRUE;
++			endfsent();
++			return TRUE;
 +		}
 +	}
-+#endif /* __FreeBSD__ */
-+			
 +
-+#ifndef __FreeBSD__	
- 	fclose (file);
-+#else
 +	endfsent();
++#endif	/* __FreeBSD__ */
+ 	
++#ifndef __FreeBSD__
+ 	fclose (file);
 +#endif
  	return FALSE;
  }
  
-@@ -484,14 +550,23 @@
+@@ -490,12 +545,17 @@
   		}
   	}
  #else
 +#ifndef __FreeBSD__
- 	struct mntent *ent;
--	
-+#else
-+	struct fstab *ent;
-+#endif
-+
-+#ifndef __FreeBSD__
- 	file = setmntent (PATH_MOUNT_TABLE, "r");
+ 	file = setmntent (MOUNT_TABLE_PATH, "r");
  	if (file == NULL) {
  		return FALSE;
  	}
--		
 +#else
 +	setfsent();
-+#endif /* __FreeBSD__ */
-+
++#endif	/* __FreeBSD__ */
+ 		
  	/* Search for our device in the fstab */
 +#ifndef __FreeBSD__
  	while ((ent = getmntent (file)) != NULL) {
  		if (strcmp (volume->device_path, ent->mnt_fsname) == 0) {
  			if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) {
-@@ -500,9 +575,21 @@
+@@ -504,9 +564,22 @@
  			}
          	 }
  	}
-+#else  /* __FreeBSD__ */
++#else	/* __FreeBSD__ */
 +	while ((ent = getfsent ()) != NULL) {
 +		if (strcmp (volume->device_path, ent->fs_spec) == 0
 +		    && strstr (ent->fs_type, FSTAB_RO) != NULL) {
-+		    	endfsent();
-+		    	return TRUE;
++			endfsent();
++			return TRUE;
 +		}
 +	}
++
 +	endfsent();
-+#endif
++#endif	/* __FreeBSD__ */
  #endif
  				
 +#ifndef __FreeBSD__
@@ -213,37 +183,47 @@ $FreeBSD$
  	return FALSE;
  }
  
-@@ -975,14 +1062,26 @@
-         
-        
+@@ -948,13 +1021,20 @@
+ 		}
+ 	}
  #else
 +#ifndef __FreeBSD__
+ 	const char *file_name;
+ 	const char *separator;
  	char line[PATH_MAX * 3];
  	char device_name[sizeof (line)];
- 	NautilusStringList *list;
-+#else  /* __FreeBSD__ */
+ 	EelStringList *list;
+ 	char *device_path, *mount_path, *filesystem;
++#else	/* __FreeBSD__ */
 +	struct statfs *mounted;
 +	int mounted_num;
 +	int i;
-+#endif /* __FreeBSD__ */
++#endif	/* __FreeBSD__ */
  
 +#ifndef __FreeBSD__
- 	/* Open /proc/mounts */
- 	fh = fopen (PATH_PROC_MOUNTS, "r");
- 	g_return_val_if_fail (fh != NULL, NULL);
-+#else   /* __FreeBSD__ */
+ 	if (mnttab_exists) { 
+ 		file_name = "/etc/mnttab";
+ 		separator = "\t";
+@@ -967,7 +1047,15 @@
+ 		g_warning ("Unable to open %s: %s", file_name, strerror (errno));
+ 		return NULL;
+ 	}
++#else	/* __FreeBSD__ */
 +	mounted_num = getmntinfo(&mounted, MNT_WAIT);
-+	g_return_val_if_fail (mounted_num > 0, NULL);
-+#endif  /* __FreeBSD__ */
++	if (mounted_num < 1) {
++		g_warning ("Unable to get info about mounted fs: %s", strerror (errno));
++		return NULL;
++	}
++#endif	/* __FreeBSD__ */
  
 +#ifndef __FreeBSD__
  	while (fgets (line, sizeof(line), fh)) {
  		if (sscanf (line, "%s", device_name) == 1) {
- 			list = nautilus_string_list_new_from_tokens (line, PROC_MOUNTS_SEPARATOR, FALSE);			
-@@ -995,11 +1094,20 @@
- 					volume->device_path = nautilus_string_list_nth (list, 0);
- 					volume->mount_path = nautilus_string_list_nth (list, 1);
- 					volume->filesystem = nautilus_string_list_nth (list, 2);
+ 			list = eel_string_list_new_from_tokens (line, separator, FALSE);
+@@ -983,17 +1071,28 @@
+ 					g_free (device_path);
+ 					g_free (mount_path);
+ 					g_free (filesystem);
 +#else /* __FreeBSD__ */
 +	for (i = 0; i < mounted_num; i++) {
 +		volume = g_new0 (NautilusVolume, 1);
@@ -254,44 +234,27 @@ $FreeBSD$
  					current_mounts = mount_volume_add_filesystem (volume, current_mounts);
 +#ifndef __FreeBSD__
  				}				
- 				nautilus_string_list_free (list);
+ 				eel_string_list_free (list);
  			}			
  		}
 +#endif /* __FreeBSD__ */
    	}
- 
  #endif /* SOLARIS_MNT */
-@@ -1019,7 +1127,9 @@
- 	}
- #endif
  
 +#ifndef __FreeBSD__
- 	fclose (fh);
-+#endif
- 	
- 	return current_mounts;
- 
-@@ -1375,6 +1485,14 @@
- 			break;
- 		}
- 	}
-+#ifdef __FreeBSD__
-+	struct fstab *ent;
-+
-+	setfsent ();
-+	while ((ent = getfsent ())) 
-+		fstab_add_mount_volume (monitor, ent);
-+	endfsent ();
-+#endif	/* __FreeBSD__ */
- }
- #endif
- 
-@@ -1869,7 +1987,7 @@
+ 	if (fh != NULL) {
+ 		fclose (fh);
  	}
++#endif
  	
- 	if (mounted) {
--#ifndef SOLARIS_MNT			
+ #ifdef HAVE_CDDA
+ 	/* CD Audio tricks */
+@@ -1888,7 +1987,7 @@
+ 	for (element = volume_list; element != NULL; element = element->next) {
+ 		volume = element->data;
+ 		
+-#ifndef SOLARIS_MNT
 +#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__)
+ 		/* These are set up by get_current_mount_list for Solaris. */
  		volume->is_removable = volume_is_removable (volume);
  		volume->is_read_only = volume_is_read_only (volume);
- #endif /* SOLARIS_MNT */
diff --git a/x11-fm/nautilus2/files/patch-ak b/x11-fm/nautilus2/files/patch-ak
deleted file mode 100644
index f5aa84593eaf..000000000000
--- a/x11-fm/nautilus2/files/patch-ak
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnautilus-extensions/nautilus-sound.c.orig	Fri Oct  6 14:47:41 2000
-+++ libnautilus-extensions/nautilus-sound.c	Fri Jan 12 10:39:00 2001
-@@ -28,3 +28,7 @@
- #include <signal.h>
-+#ifdef __FreeBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #include <esd.h>
diff --git a/x11-fm/nautilus2/files/patch-components::help::hyperbola-filefmt.c b/x11-fm/nautilus2/files/patch-components::help::hyperbola-filefmt.c
new file mode 100644
index 000000000000..5331a9db1187
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-components::help::hyperbola-filefmt.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- components/help/hyperbola-filefmt.c	2001/05/14 15:56:20	1.1
++++ components/help/hyperbola-filefmt.c	2001/05/14 15:56:32
+@@ -30,6 +30,7 @@
+ #include <libgnome/gnome-util.h>
+ #include <limits.h>
+ #include <parser.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <string.h>
+ #include <tree.h>
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
index 9874e0a31be6..68e98b1542e9 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
+++ b/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- libnautilus-extensions/nautilus-medusa-support.c	2001/05/10 11:39:29	1.1
-+++ libnautilus-extensions/nautilus-medusa-support.c	2001/05/10 11:40:00
-@@ -108,7 +108,7 @@
- 		/* Process files have numbers */
- 		if (nautilus_str_to_int (file->d_name,
- 					 &process_number)) {
--			stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
-+			stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
- 			stat_file = fopen (stat_file_name, "r");
- 			g_free (stat_file_name);
+--- libnautilus-private/nautilus-medusa-support.c.orig	Wed Apr 11 21:36:16 2001
++++ libnautilus-private/nautilus-medusa-support.c	Mon May 14 17:45:24 2001
+@@ -84,7 +84,7 @@
+ 		 */
+ 		status = NAUTILUS_CRON_STATUS_OFF;
  
+-		stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
++		stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
+ 		stat_file = fopen (stat_file_name, "r");
+ 		g_free (stat_file_name);
+ 		
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 5d4f6e3c0e56..5b03e0550044 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -4,16 +4,16 @@ bin/gnome-man2html2
 bin/hyperbola
 bin/nautilus
 bin/nautilus-adapter
-bin/nautilus-authenticate
 bin/nautilus-clean.sh
+bin/nautilus-config
 bin/nautilus-content-loser
 bin/nautilus-error-dialog
 bin/nautilus-hardware-view
 bin/nautilus-history-view
 bin/nautilus-image-view
 bin/nautilus-launcher-applet
-%%MOZILLA:%%bin/nautilus-mozilla-content-view
 bin/nautilus-music-view
+bin/nautilus-news
 bin/nautilus-notes
 bin/nautilus-preferences-applet
 bin/nautilus-restore-settings-to-default.sh
@@ -40,28 +40,29 @@ include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.0
-lib/libnautilus-extensions.so
-lib/libnautilus-extensions.so.0
+lib/libnautilus-private.so
+lib/libnautilus-private.so.0
 lib/libnautilus-tree-view.so
 lib/libnautilus-tree-view.so.0
 lib/libnautilus.so
 lib/libnautilus.so.0
+lib/nautilusConf.sh
 lib/vfs/modules/libvfs-help.so
 share/gnome/apps/Applications/nautilus.desktop
 share/gnome/help/gnufdl/C/gnufdl.sgml
 share/gnome/help/gnugpl/C/gnugpl.sgml
-share/gnome/help/nautilus-quick-reference/C/figures/emblems.png
+share/gnome/help/nautilus-quick-reference/C/figures/backgrounds_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/emblems_nqr.png
 share/gnome/help/nautilus-quick-reference/C/figures/find.png
-share/gnome/help/nautilus-quick-reference/C/figures/full.png
-share/gnome/help/nautilus-quick-reference/C/figures/locbar.png
-share/gnome/help/nautilus-quick-reference/C/figures/menubar.png
-share/gnome/help/nautilus-quick-reference/C/figures/music.png
-share/gnome/help/nautilus-quick-reference/C/figures/navbar.png
-share/gnome/help/nautilus-quick-reference/C/figures/patterns.png
-share/gnome/help/nautilus-quick-reference/C/figures/sidebar.png
+share/gnome/help/nautilus-quick-reference/C/figures/locationbar_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/menus_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/music_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/nautilus_window_full_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/sidebar_nqr.png
 share/gnome/help/nautilus-quick-reference/C/figures/softcat.png
 share/gnome/help/nautilus-quick-reference/C/figures/storage.png
-share/gnome/help/nautilus-quick-reference/C/figures/themes.png
+share/gnome/help/nautilus-quick-reference/C/figures/themes_nqr.png
+share/gnome/help/nautilus-quick-reference/C/figures/toolbar_nqr.png
 share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png
 share/gnome/help/nautilus-quick-reference/C/index.html
 share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png
@@ -121,79 +122,70 @@ share/gnome/help/nautilus-quick-reference/sv/figures/themes.png
 share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png
 share/gnome/help/nautilus-quick-reference/sv/index.html
 share/gnome/help/nautilus-release-notes/C/beta.html
-share/gnome/help/nautilus-release-notes/C/docbook.css
 share/gnome/help/nautilus-release-notes/C/index.html
-share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
+share/gnome/help/nautilus-release-notes/C/ln7.html
+share/gnome/help/nautilus-release-notes/C/medusa.html
 share/gnome/help/nautilus-release-notes/C/mozilla.html
+share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
 share/gnome/help/nautilus-release-notes/C/new10.html
 share/gnome/help/nautilus-release-notes/C/new102.html
+share/gnome/help/nautilus-release-notes/C/new103.html
 share/gnome/help/nautilus-release-notes/C/require.html
 share/gnome/help/nautilus-release-notes/C/searching.html
 share/gnome/help/nautilus-release-notes/C/session.html
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/caution.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/home.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/important.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/next.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/note.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/prev.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/tip.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/up.gif
-share/gnome/help/nautilus-release-notes/C/stylesheet-images/warning.gif
+share/gnome/help/nautilus-screenshot-guidelines/C/callouts.html
+share/gnome/help/nautilus-screenshot-guidelines/C/circling.html
+share/gnome/help/nautilus-screenshot-guidelines/C/dropshadow.html
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/callout_after.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/callout_before.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/circle_callout_after.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/circle_callout_before.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/dropshadow_after.png
+share/gnome/help/nautilus-screenshot-guidelines/C/figures/dropshadow_before.png
+share/gnome/help/nautilus-screenshot-guidelines/C/finishingtouches.html
+share/gnome/help/nautilus-screenshot-guidelines/C/generalguidelines.html
+share/gnome/help/nautilus-screenshot-guidelines/C/index.html
+share/gnome/help/nautilus-screenshot-guidelines/C/ln7.html
+share/gnome/help/nautilus-screenshot-guidelines/C/nautilus-screenshot-guidelines.sgml
+share/gnome/help/nautilus-screenshot-guidelines/C/resources.html
+share/gnome/help/nautilus-screenshot-guidelines/C/tools.html
 share/gnome/help/nautilus-user-manual/C/chapter1.html
 share/gnome/help/nautilus-user-manual/C/chapter2.html
-share/gnome/help/nautilus-user-manual/C/docbook.css
-share/gnome/help/nautilus-user-manual/C/figures/custicon.png
+share/gnome/help/nautilus-user-manual/C/figures/custom_icon_num.png
 share/gnome/help/nautilus-user-manual/C/figures/full-1.png
 share/gnome/help/nautilus-user-manual/C/figures/full-2.png
 share/gnome/help/nautilus-user-manual/C/figures/full-3.png
 share/gnome/help/nautilus-user-manual/C/figures/full-4.png
 share/gnome/help/nautilus-user-manual/C/figures/full-5.png
 share/gnome/help/nautilus-user-manual/C/figures/full-6.png
-share/gnome/help/nautilus-user-manual/C/figures/full.png
+share/gnome/help/nautilus-user-manual/C/figures/help_num.png
+share/gnome/help/nautilus-user-manual/C/figures/home_folder_num.png
 share/gnome/help/nautilus-user-manual/C/figures/link.png
-share/gnome/help/nautilus-user-manual/C/figures/locbar.png
+share/gnome/help/nautilus-user-manual/C/figures/locationbar_nqr.png
+share/gnome/help/nautilus-user-manual/C/figures/nautilus_window_full_num.png
+share/gnome/help/nautilus-user-manual/C/figures/news_num.png
 share/gnome/help/nautilus-user-manual/C/figures/noread.png
 share/gnome/help/nautilus-user-manual/C/figures/nowrite.png
-share/gnome/help/nautilus-user-manual/C/figures/part-1.png
-share/gnome/help/nautilus-user-manual/C/figures/part-2.png
-share/gnome/help/nautilus-user-manual/C/figures/part-3.png
-share/gnome/help/nautilus-user-manual/C/figures/part.png
 share/gnome/help/nautilus-user-manual/C/figures/player-1.png
 share/gnome/help/nautilus-user-manual/C/figures/player-2.png
 share/gnome/help/nautilus-user-manual/C/figures/player-3.png
 share/gnome/help/nautilus-user-manual/C/figures/player-4.png
 share/gnome/help/nautilus-user-manual/C/figures/player.png
-share/gnome/help/nautilus-user-manual/C/figures/prefmenu.png
-share/gnome/help/nautilus-user-manual/C/figures/sidebar.png
+share/gnome/help/nautilus-user-manual/C/figures/preferences_menu_num.png
+share/gnome/help/nautilus-user-manual/C/figures/sidebar_num.png
 share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png
 share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png
 share/gnome/help/nautilus-user-manual/C/gnome.html
-share/gnome/help/nautilus-user-manual/C/home.html
 share/gnome/help/nautilus-user-manual/C/index.html
 share/gnome/help/nautilus-user-manual/C/introdesktop.html
 share/gnome/help/nautilus-user-manual/C/ln21.html
 share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/C/navigating.html
 share/gnome/help/nautilus-user-manual/C/session.html
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/caution.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/home.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/important.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/next.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/note.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/prev.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/tip.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/up.gif
-share/gnome/help/nautilus-user-manual/C/stylesheet-images/warning.gif
+share/gnome/help/nautilus-user-manual/C/tree.html
+share/gnome/help/nautilus-user-manual/C/viewopen.html
 share/gnome/help/nautilus-user-manual/es/chapter1.html
 share/gnome/help/nautilus-user-manual/es/chapter2.html
-share/gnome/help/nautilus-user-manual/es/default.html
-share/gnome/help/nautilus-user-manual/es/docbook.css
 share/gnome/help/nautilus-user-manual/es/figures/custicon.png
 share/gnome/help/nautilus-user-manual/es/figures/full.png
 share/gnome/help/nautilus-user-manual/es/figures/link.png
@@ -213,23 +205,10 @@ share/gnome/help/nautilus-user-manual/es/introdesktop.html
 share/gnome/help/nautilus-user-manual/es/ln18.html
 share/gnome/help/nautilus-user-manual/es/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/es/navigating.html
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/caution.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/home.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/important.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/next.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/note.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/prev.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/tip.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/up.gif
-share/gnome/help/nautilus-user-manual/es/stylesheet-images/warning.gif
 share/gnome/help/nautilus-user-manual/es/tree.html
 share/gnome/help/nautilus-user-manual/es/viewopen.html
 share/gnome/help/nautilus-user-manual/ko/chapter1.html
 share/gnome/help/nautilus-user-manual/ko/chapter2.html
-share/gnome/help/nautilus-user-manual/ko/docbook.css
 share/gnome/help/nautilus-user-manual/ko/figures/custicon.png
 share/gnome/help/nautilus-user-manual/ko/figures/full-1.png
 share/gnome/help/nautilus-user-manual/ko/figures/full-2.png
@@ -262,18 +241,6 @@ share/gnome/help/nautilus-user-manual/ko/introdesktop.html
 share/gnome/help/nautilus-user-manual/ko/ln18.html
 share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml
 share/gnome/help/nautilus-user-manual/ko/navigating.html
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/caution.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/home.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/important.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/next.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/note.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/prev.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/tip.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-blank.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-minus.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-plus.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/up.gif
-share/gnome/help/nautilus-user-manual/ko/stylesheet-images/warning.gif
 share/gnome/help/nautilus-user-manual/ko/tree.html
 share/gnome/help/nautilus-user-manual/ko/viewopen.html
 share/gnome/nautilus/browser.xml
@@ -293,19 +260,6 @@ share/gnome/nautilus/emblems/ohno.png
 share/gnome/nautilus/emblems/personal.png
 share/gnome/nautilus/emblems/special.png
 share/gnome/nautilus/emblems/urgent.png
-share/gnome/nautilus/fonts/urw/fonts.dir
-share/gnome/nautilus/fonts/urw/n019003l.afm
-share/gnome/nautilus/fonts/urw/n019003l.pfb
-share/gnome/nautilus/fonts/urw/n019003l.pfm
-share/gnome/nautilus/fonts/urw/n019004l.afm
-share/gnome/nautilus/fonts/urw/n019004l.pfb
-share/gnome/nautilus/fonts/urw/n019004l.pfm
-share/gnome/nautilus/fonts/urw/n019023l.afm
-share/gnome/nautilus/fonts/urw/n019023l.pfb
-share/gnome/nautilus/fonts/urw/n019023l.pfm
-share/gnome/nautilus/fonts/urw/n019024l.afm
-share/gnome/nautilus/fonts/urw/n019024l.pfb
-share/gnome/nautilus/fonts/urw/n019024l.pfm
 share/gnome/nautilus/linksets/apps.xml
 share/gnome/nautilus/linksets/desktop.xml
 share/gnome/nautilus/linksets/home.xml
@@ -313,6 +267,7 @@ share/gnome/nautilus/linksets/portals.xml
 share/gnome/nautilus/linksets/search_engines.xml
 share/gnome/nautilus/nautilus-extras.placeholder
 share/gnome/nautilus/nautilus-suggested.placeholder
+share/gnome/nautilus/news_channels.xml
 share/gnome/nautilus/patterns/.striated.png
 share/gnome/nautilus/patterns/blue_gray_rough.png
 share/gnome/nautilus/patterns/blue_ridge.png
@@ -355,14 +310,23 @@ share/gnome/oaf/Nautilus_View_hardware.oaf
 share/gnome/oaf/Nautilus_View_help.oaf
 share/gnome/oaf/Nautilus_View_history.oaf
 share/gnome/oaf/Nautilus_View_image.oaf
-%%MOZILLA:%%share/gnome/oaf/Nautilus_View_mozilla.oaf
 share/gnome/oaf/Nautilus_View_music.oaf
+share/gnome/oaf/Nautilus_View_news.oaf
 share/gnome/oaf/Nautilus_View_notes.oaf
 share/gnome/oaf/Nautilus_View_sample.oaf
 share/gnome/oaf/Nautilus_View_sidebar-loser.oaf
 share/gnome/oaf/Nautilus_View_text.oaf
 share/gnome/oaf/Nautilus_View_tree.oaf
 share/gnome/oaf/Nautilus_shell.oaf
+share/gnome/omf/nautilus/nautilus-quick-reference-C.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-es.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-ko.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-no.omf
+share/gnome/omf/nautilus/nautilus-quick-reference-sv.omf
+share/gnome/omf/nautilus/nautilus-release-notes-C.omf
+share/gnome/omf/nautilus/nautilus-user-manual-C.omf
+share/gnome/omf/nautilus/nautilus-user-manual-es.omf
+share/gnome/omf/nautilus/nautilus-user-manual-ko.omf
 share/gnome/pixmaps/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/About_Image.png
 share/gnome/pixmaps/nautilus/Back.png
@@ -376,134 +340,13 @@ share/gnome/pixmaps/nautilus/Services.png
 share/gnome/pixmaps/nautilus/Stop.png
 share/gnome/pixmaps/nautilus/Up.png
 share/gnome/pixmaps/nautilus/about_background.png
-share/gnome/pixmaps/nautilus/ardmore/ardmore.xml
-share/gnome/pixmaps/nautilus/ardmore/blueridge.png
-share/gnome/pixmaps/nautilus/ardmore/bluewall.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-12.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-24.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-36.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-72.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-96.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory-accept.png
-share/gnome/pixmaps/nautilus/ardmore/i-directory.png
-share/gnome/pixmaps/nautilus/ardmore/number_strip.png
-share/gnome/pixmaps/nautilus/ardmore/theme_preview.png
-share/gnome/pixmaps/nautilus/arlo/Back.png
-share/gnome/pixmaps/nautilus/arlo/Forward.png
-share/gnome/pixmaps/nautilus/arlo/Home.png
-share/gnome/pixmaps/nautilus/arlo/Refresh.png
-share/gnome/pixmaps/nautilus/arlo/Search.png
-share/gnome/pixmaps/nautilus/arlo/SearchWeb.png
-share/gnome/pixmaps/nautilus/arlo/Stop.png
-share/gnome/pixmaps/nautilus/arlo/Up.png
-share/gnome/pixmaps/nautilus/arlo/arlo.xml
-share/gnome/pixmaps/nautilus/arlo/backgrounds/background_pattern.png
-share/gnome/pixmaps/nautilus/arlo/backgrounds/window_pattern.png
-share/gnome/pixmaps/nautilus/arlo/decrement-i.png
-share/gnome/pixmaps/nautilus/arlo/decrement.png
-share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/arlo/emblem-nowrite.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-12-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-12.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-192-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-192.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-20-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-20.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-24-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-24.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-36-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-36.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-72-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-72.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-96-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-96.png
-share/gnome/pixmaps/nautilus/arlo/i-directory-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-directory.png
-share/gnome/pixmaps/nautilus/arlo/i-directory.xml
-share/gnome/pixmaps/nautilus/arlo/i-regular-12-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-12.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-192-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-192.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-20-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-20.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-24-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-24.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-36-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-36.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-72-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-72.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-96-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-96.png
-share/gnome/pixmaps/nautilus/arlo/i-regular-aa.png
-share/gnome/pixmaps/nautilus/arlo/i-regular.png
-share/gnome/pixmaps/nautilus/arlo/i-regular.xml
-share/gnome/pixmaps/nautilus/arlo/increment-i.png
-share/gnome/pixmaps/nautilus/arlo/increment.png
-share/gnome/pixmaps/nautilus/arlo/number_strip.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-active-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-active.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-empty-space.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/fill.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper-active-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper-active.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/left-bumper.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/middle-normal-normal.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/middle-normal-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/middle-prelight-normal.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-bumper-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-bumper.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-empty-space.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top-active-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top-active.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top-prelight.png
-share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces/right-top.png
-share/gnome/pixmaps/nautilus/arlo/theme_preview.png
-share/gnome/pixmaps/nautilus/arlo/throbber/001.png
-share/gnome/pixmaps/nautilus/arlo/throbber/002.png
-share/gnome/pixmaps/nautilus/arlo/throbber/003.png
-share/gnome/pixmaps/nautilus/arlo/throbber/004.png
-share/gnome/pixmaps/nautilus/arlo/throbber/005.png
-share/gnome/pixmaps/nautilus/arlo/throbber/006.png
-share/gnome/pixmaps/nautilus/arlo/throbber/007.png
-share/gnome/pixmaps/nautilus/arlo/throbber/008.png
-share/gnome/pixmaps/nautilus/arlo/throbber/009.png
-share/gnome/pixmaps/nautilus/arlo/throbber/010.png
-share/gnome/pixmaps/nautilus/arlo/throbber/011.png
-share/gnome/pixmaps/nautilus/arlo/throbber/012.png
-share/gnome/pixmaps/nautilus/arlo/throbber/013.png
-share/gnome/pixmaps/nautilus/arlo/throbber/014.png
-share/gnome/pixmaps/nautilus/arlo/throbber/015.png
-share/gnome/pixmaps/nautilus/arlo/throbber/016.png
-share/gnome/pixmaps/nautilus/arlo/throbber/017.png
-share/gnome/pixmaps/nautilus/arlo/throbber/018.png
-share/gnome/pixmaps/nautilus/arlo/throbber/019.png
-share/gnome/pixmaps/nautilus/arlo/throbber/020.png
-share/gnome/pixmaps/nautilus/arlo/throbber/021.png
-share/gnome/pixmaps/nautilus/arlo/throbber/022.png
-share/gnome/pixmaps/nautilus/arlo/throbber/023.png
-share/gnome/pixmaps/nautilus/arlo/throbber/024.png
-share/gnome/pixmaps/nautilus/arlo/throbber/025.png
-share/gnome/pixmaps/nautilus/arlo/throbber/026.png
-share/gnome/pixmaps/nautilus/arlo/throbber/027.png
-share/gnome/pixmaps/nautilus/arlo/throbber/028.png
-share/gnome/pixmaps/nautilus/arlo/throbber/029.png
-share/gnome/pixmaps/nautilus/arlo/throbber/030.png
-share/gnome/pixmaps/nautilus/arlo/throbber/rest.png
-share/gnome/pixmaps/nautilus/arlo/zoom_body.png
 share/gnome/pixmaps/nautilus/audio.png
 share/gnome/pixmaps/nautilus/backgrounds.png
 share/gnome/pixmaps/nautilus/bubble-LL.png
 share/gnome/pixmaps/nautilus/bubble-LR.png
 share/gnome/pixmaps/nautilus/bubble-UL.png
 share/gnome/pixmaps/nautilus/bubble-UR.png
+share/gnome/pixmaps/nautilus/changed_bullet.png
 share/gnome/pixmaps/nautilus/chit_frame.png
 share/gnome/pixmaps/nautilus/colors.png
 share/gnome/pixmaps/nautilus/computer.png
@@ -598,6 +441,111 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png
 share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png
 share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png
 share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png
+share/gnome/pixmaps/nautilus/crux_teal/Back.png
+share/gnome/pixmaps/nautilus/crux_teal/Forward.png
+share/gnome/pixmaps/nautilus/crux_teal/Home.png
+share/gnome/pixmaps/nautilus/crux_teal/Refresh.png
+share/gnome/pixmaps/nautilus/crux_teal/Search.png
+share/gnome/pixmaps/nautilus/crux_teal/SearchWeb.png
+share/gnome/pixmaps/nautilus/crux_teal/Stop.png
+share/gnome/pixmaps/nautilus/crux_teal/Up.png
+share/gnome/pixmaps/nautilus/crux_teal/backgrounds/background_pattern.png
+share/gnome/pixmaps/nautilus/crux_teal/backgrounds/window_pattern.png
+share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
+share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
+share/gnome/pixmaps/nautilus/crux_teal/decrement.png
+share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-72.png
+share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-96.png
+share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-12-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-12.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-192-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-192.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-20-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-20.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-24-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-24.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-36-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-36.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-72-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-72.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-96-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-96.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory.png
+share/gnome/pixmaps/nautilus/crux_teal/i-directory.xml
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-12-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-12.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-192-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-192.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-20-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-20.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-24-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-24.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-36-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-36.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-72-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-72.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-96-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-96.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular-aa.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular.png
+share/gnome/pixmaps/nautilus/crux_teal/i-regular.xml
+share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
+share/gnome/pixmaps/nautilus/crux_teal/increment.png
+share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-active-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-active.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-empty-space.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-active-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-active.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-normal-normal.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-normal-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-prelight-normal.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-bumper-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-bumper.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-empty-space.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-active-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-active.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-prelight.png
+share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top.png
+share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/003.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/004.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/005.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/006.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/007.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/008.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/009.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/010.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/011.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/012.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/013.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/014.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/015.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/016.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/017.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/018.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/019.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/020.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/021.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/022.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/023.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/024.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/025.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/026.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/027.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/028.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/029.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/030.png
+share/gnome/pixmaps/nautilus/crux_teal/throbber/rest.png
+share/gnome/pixmaps/nautilus/crux_teal/zoom_body.png
 share/gnome/pixmaps/nautilus/decrement.png
 share/gnome/pixmaps/nautilus/default.xml
 share/gnome/pixmaps/nautilus/druid_header.png
@@ -759,6 +707,12 @@ share/gnome/pixmaps/nautilus/hand-72.png
 share/gnome/pixmaps/nautilus/hand-96.png
 share/gnome/pixmaps/nautilus/hand.png
 share/gnome/pixmaps/nautilus/home.png
+share/gnome/pixmaps/nautilus/hyperbola-book-closed.png
+share/gnome/pixmaps/nautilus/hyperbola-book-open.png
+share/gnome/pixmaps/nautilus/hyperbola-folder-closed.png
+share/gnome/pixmaps/nautilus/hyperbola-folder-open.png
+share/gnome/pixmaps/nautilus/hyperbola-section-closed.png
+share/gnome/pixmaps/nautilus/hyperbola-section-open.png
 share/gnome/pixmaps/nautilus/i-blockdev.png
 share/gnome/pixmaps/nautilus/i-bookmark-20.png
 share/gnome/pixmaps/nautilus/i-bookmark-missing-20.png
@@ -846,7 +800,9 @@ share/gnome/pixmaps/nautilus/memory_chip.gif
 share/gnome/pixmaps/nautilus/multi-ok.png
 share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
 share/gnome/pixmaps/nautilus/netscape.png
+share/gnome/pixmaps/nautilus/news_bullet.png
 share/gnome/pixmaps/nautilus/not.png
+share/gnome/pixmaps/nautilus/note-indicator.png
 share/gnome/pixmaps/nautilus/novice-selected.png
 share/gnome/pixmaps/nautilus/novice.png
 share/gnome/pixmaps/nautilus/number_strip.png
@@ -873,7 +829,55 @@ share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active-prelight.png
 share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active.png
 share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-prelight.png
 share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top.png
+share/gnome/pixmaps/nautilus/sierra/Sierra_desktop.png
+share/gnome/pixmaps/nautilus/sierra/green_weave.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-12-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-12.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-24-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-24.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-36-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-36.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-72-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-72.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-96-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-96.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept-aa.png
+share/gnome/pixmaps/nautilus/sierra/i-directory-accept.png
+share/gnome/pixmaps/nautilus/sierra/i-directory.png
+share/gnome/pixmaps/nautilus/sierra/number_strip.png
+share/gnome/pixmaps/nautilus/sierra/sierra.xml
+share/gnome/pixmaps/nautilus/sierra/sierra_green.png
+share/gnome/pixmaps/nautilus/sierra/theme_preview.png
+share/gnome/pixmaps/nautilus/tahoe/blueridge.png
+share/gnome/pixmaps/nautilus/tahoe/bluewall.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-12.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-24.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-36.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-72.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-96.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-12.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-24.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-36.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-72.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-96.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory-accept.png
+share/gnome/pixmaps/nautilus/tahoe/i-directory.png
+share/gnome/pixmaps/nautilus/tahoe/number_strip.png
+share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
+share/gnome/pixmaps/nautilus/tahoe/theme_preview.png
 share/gnome/pixmaps/nautilus/temp-home.png
+share/gnome/pixmaps/nautilus/text-selection-frame-aa.png
 share/gnome/pixmaps/nautilus/text-selection-frame.png
 share/gnome/pixmaps/nautilus/theme_preview.png
 share/gnome/pixmaps/nautilus/throbber/001.png
@@ -913,43 +917,12 @@ share/gnome/pixmaps/nautilus/tiny-alert.png
 share/gnome/pixmaps/nautilus/trash-empty.png
 share/gnome/pixmaps/nautilus/trash-full.png
 share/gnome/pixmaps/nautilus/uparrow.png
-share/gnome/pixmaps/nautilus/villanova/Sierra_desktop.png
-share/gnome/pixmaps/nautilus/villanova/green_weave.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-12-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-12.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-24-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-24.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-36-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-36.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-72-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-72.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-96-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-96.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-12-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-24-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept-aa.png
-share/gnome/pixmaps/nautilus/villanova/i-directory-accept.png
-share/gnome/pixmaps/nautilus/villanova/i-directory.png
-share/gnome/pixmaps/nautilus/villanova/number_strip.png
-share/gnome/pixmaps/nautilus/villanova/theme_preview.png
-share/gnome/pixmaps/nautilus/villanova/villanova.xml
-share/gnome/pixmaps/nautilus/villanova/villanova_green.png
 share/gnome/pixmaps/nautilus/zoom_body.png
 share/gnome/ui/nautilus-clipboard-ui.xml
 share/gnome/ui/nautilus-content-loser-ui.xml
 share/gnome/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/ui/nautilus-directory-view-ui.xml
 share/gnome/ui/nautilus-icon-view-ui.xml
-%%MOZILLA:%%share/gnome/ui/nautilus-mozilla-ui.xml
 share/gnome/ui/nautilus-sample-content-view-ui.xml
 share/gnome/ui/nautilus-search-list-view-ui.xml
 share/gnome/ui/nautilus-service-ui.xml
@@ -958,6 +931,7 @@ share/gnome/ui/nautilus-sidebar-loser-ui.xml
 share/gnome/ui/nautilus-text-view-ui.xml
 share/locale/az/LC_MESSAGES/nautilus.mo
 share/locale/ca/LC_MESSAGES/nautilus.mo
+share/locale/cs/LC_MESSAGES/nautilus.mo
 share/locale/da/LC_MESSAGES/nautilus.mo
 share/locale/de/LC_MESSAGES/nautilus.mo
 share/locale/el/LC_MESSAGES/nautilus.mo
@@ -971,6 +945,7 @@ share/locale/hu/LC_MESSAGES/nautilus.mo
 share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
+share/locale/lt/LC_MESSAGES/nautilus.mo
 share/locale/nl/LC_MESSAGES/nautilus.mo
 share/locale/nn/LC_MESSAGES/nautilus.mo
 share/locale/no/LC_MESSAGES/nautilus.mo
@@ -984,29 +959,28 @@ share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo
 share/locale/uk/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo
-@dirrm share/gnome/pixmaps/nautilus/villanova
 @dirrm share/gnome/pixmaps/nautilus/throbber
+@dirrm share/gnome/pixmaps/nautilus/tahoe
+@dirrm share/gnome/pixmaps/nautilus/sierra
 @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/gnome/throbber
 @dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber
 @dirrm share/gnome/pixmaps/nautilus/eazel-logos
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds
+@dirrm share/gnome/pixmaps/nautilus/crux_teal
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant
-@dirrm share/gnome/pixmaps/nautilus/arlo/throbber
-@dirrm share/gnome/pixmaps/nautilus/arlo/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/arlo/backgrounds
-@dirrm share/gnome/pixmaps/nautilus/arlo
-@dirrm share/gnome/pixmaps/nautilus/ardmore
 @dirrm share/gnome/pixmaps/nautilus
+@dirrm share/gnome/omf/nautilus
 @dirrm share/gnome/nautilus/services/text
 @dirrm share/gnome/nautilus/services
 @dirrm share/gnome/nautilus/patterns
 @dirrm share/gnome/nautilus/linksets
-@dirrm share/gnome/nautilus/fonts/urw
-@dirrm share/gnome/nautilus/fonts
 @dirrm share/gnome/nautilus/emblems
 @dirrm share/gnome/nautilus/components/hyperbola/maps
 @dirrm share/gnome/nautilus/components/hyperbola
@@ -1022,6 +996,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/help/nautilus-user-manual/C/figures
 @dirrm share/gnome/help/nautilus-user-manual/C
 @dirrm share/gnome/help/nautilus-user-manual
+@dirrm share/gnome/help/nautilus-screenshot-guidelines/C/stylesheet-images
+@dirrm share/gnome/help/nautilus-screenshot-guidelines/C/figures
+@dirrm share/gnome/help/nautilus-screenshot-guidelines/C
+@dirrm share/gnome/help/nautilus-screenshot-guidelines
 @dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images
 @dirrm share/gnome/help/nautilus-release-notes/C/figures
 @dirrm share/gnome/help/nautilus-release-notes/C
author	Maxim Sobolev <sobomax@FreeBSD.org>	2001-05-14 17:18:52 +0000
committer	Maxim Sobolev <sobomax@FreeBSD.org>	2001-05-14 17:18:52 +0000
commit	1661005c13823e934a5c1267f261fd3a6a548591 (patch)
tree	7c1290c0bf32e3eebd000525f91fe936f467091e /x11-fm
parent	a885c9056ad4a60f0d4c8e3a8182e9f129825e22 (diff)
download	ports-1661005c13823e934a5c1267f261fd3a6a548591.tar.gz ports-1661005c13823e934a5c1267f261fd3a6a548591.zip