author: Ade Lovett <ade@FreeBSD.org> 2001-01-12 19:59:39 +0000
committer: Ade Lovett <ade@FreeBSD.org> 2001-01-12 19:59:39 +0000
commit: 8d590d9928b801e3fa9dfbd457a954a701a2de9f (patch)
tree: 0248b61f6e409b6fcefe5d04976412b55b944392 /x11-fm
parent: 8eab677955e80c4559cf3e5a5eb89ed3c72574e6 (diff)
download: ports-8d590d9928b801e3fa9dfbd457a954a701a2de9f.tar.gz
ports-8d590d9928b801e3fa9dfbd457a954a701a2de9f.zip
28 files changed, 1290 insertions, 776 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index b270ce8b42c6..2a97c4d2a8fa 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/nautilus
@@ -18,9 +17,8 @@ BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		gtkhtml.6:${PORTSDIR}/www/gtkhtml \
 		ghttp.1:${PORTSDIR}/www/libghttp \
-		bz2.1:${PORTSDIR}/archivers/bzip2
-
-BROKEN=		"Build failures with new bonobo"
+		bz2.1:${PORTSDIR}/archivers/bzip2 \
+		freetype.6:${PORTSDIR}/print/freetype2
 
 .if defined(WITH_MOZILLA)
 MOZILLA=	mozilla-embedded
@@ -35,6 +33,8 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-pthread -L${LOCALBASE}/lib" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
+CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
+		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
 
 .if defined(WITH_MOZILLA)
 CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
@@ -42,6 +42,7 @@ CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
 MOZILLA_LIBS=	"-L${X11BASE}/lib/${MOZILLA}"
 PLIST_SUB+=	MOZILLA:=""
 .else
+CONFIGURE_ARGS+= --disable-mozilla-component
 MOZILLA_LIBS=	""
 PLIST_SUB+=	MOZILLA:="@comment "
 .endif
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 80f3e2f50189..4c0c2201fdff 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (nautilus-0.1.0.tar.gz) = 4c4ebd3d136cf234ed80235f65feca6a
+MD5 (nautilus-0.5.tar.gz) = bc8d5b3277a8ecf561dd38bb977baa94
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index ff17f0b7066d..7f494061e6fd 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,26 +1,41 @@
---- configure.orig	Mon Aug 14 19:47:02 2000
-+++ configure	Mon Aug 28 13:34:38 2000
-@@ -2368,7 +2368,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
+--- configure.orig	Tue Nov  7 08:28:46 2000
++++ configure	Fri Jan 12 10:20:32 2001
+@@ -39,5 +39,5 @@
+ ac_help="$ac_help
+-  --with-freetype2-lib-prefix=PREFIX		freetype2 library path"
++  --with-freetype2-lib-place=PREFIX		freetype2 library path"
+ ac_help="$ac_help
+-  --with-freetype2-include-prefix=PREFIX	freetype2 include path"
++  --with-freetype2-include-place=PREFIX	freetype2 include path"
+ ac_help="$ac_help
+@@ -2545,5 +2545,4 @@
+ 
+-# Check whether --with-freetype2 or --without-freetype2 was given.
+-if test "${with_freetype2+set}" = set; then
+-  withval="$with_freetype2"
++if test "${with_freetype2_lib_place+set}" = set; then
++  withval="$with_freetype2_lib_place"
+   freetype2_lib_prefix=$withval
+@@ -2553,6 +2552,4 @@
+ 
+-
+-# Check whether --with-freetype2 or --without-freetype2 was given.
+-if test "${with_freetype2+set}" = set; then
+-  withval="$with_freetype2"
++if test "${with_freetype2_include_place+set}" = set; then
++  withval="$with_freetype2_include_place"
+   freetype2_include_prefix=$withval
+@@ -2670,3 +2667,3 @@
    ac_save_LIBS="$LIBS"
 -LIBS="-lpam -ldl $LIBS"
-+LIBS="-lpam  $LIBS"
++LIBS="-lpam $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2374 "configure"
- #include "confdefs.h"
-@@ -2408,7 +2408,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
+@@ -2710,3 +2707,3 @@
    ac_save_LIBS="$LIBS"
 -LIBS="-lpam_misc -ldl -lpam $LIBS"
 +LIBS="-lpam_misc -lpam $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2414 "configure"
- #include "confdefs.h"
-@@ -2436,10 +2436,10 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -2738,6 +2735,6 @@
    echo "$ac_t""yes" 1>&6
 -  PAM_LIBS="-ldl -lpam -lpam_misc"
 +  PAM_LIBS="-lpam -lpam_misc"
@@ -29,72 +44,13 @@
 -PAM_LIBS="-ldl -lpam"
 +PAM_LIBS="-lpam"
  fi
-  
- else
-@@ -2657,7 +2657,7 @@
- 
- CC=$_save_cc
+@@ -2978,3 +2975,3 @@
  
--LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
-+LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
+-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
- echo "configure:2663: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
- ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
-@@ -2979,7 +2979,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -3337,3 +3334,3 @@
    echo "$ac_t""yes" 1>&6
 -  rpm_libs=-lbz2
 +  rpm_libs="-lrpm -lbz2"
  else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -3019,7 +3019,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  rpm_libs=-lbz2
-+  rpm_libs="-lrpm -lbz2"
- 			cat >> confdefs.h <<\EOF
- #define bzread BZ2_bzread
- EOF
-@@ -3109,24 +3109,24 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for rpmRunTransactions in -lrpm""... $ac_c" 1>&6
--echo "configure:3114: checking for rpmRunTransactions in -lrpm" >&5
--ac_lib_var=`echo rpm'_'rpmRunTransactions | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for rpmReadPackageInfo in -lrpm""... $ac_c" 1>&6
-+echo "configure:3114: checking for rpmReadPackageInfo in -lrpm" >&5
-+ac_lib_var=`echo rpm'_'rpmReadPackageInfo | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lrpm -lz $rpm_libs -ldb $LIBS"
-+LIBS="-lrpm -lz $rpm_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3122 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char rpmRunTransactions();
-+char rpmReadPackageInfo();
- 
- int main() {
--rpmRunTransactions()
-+rpmReadPackageInfo()
- ; return 0; }
- EOF
- if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -3156,7 +3156,7 @@
- #define HAVE_RPM 1
- EOF
- 
--  RPM_LIBS="-lrpm -lz $rpm_libs -ldb"
-+  RPM_LIBS="-lrpm -lz $rpm_libs"
- fi
- 
- 
diff --git a/x11-fm/nautilus/files/patch-ac b/x11-fm/nautilus/files/patch-ac
index 708c7d4175cd..ab6106eec066 100644
--- a/x11-fm/nautilus/files/patch-ac
+++ b/x11-fm/nautilus/files/patch-ac
@@ -1,152 +1,79 @@
---- libnautilus-extensions/nautilus-volume-monitor.c.orig	Thu Aug  3 17:15:57 2000
-+++ libnautilus-extensions/nautilus-volume-monitor.c	Tue Aug 22 17:45:07 2000
-@@ -22,6 +22,9 @@
-    Authors: Gene Z. Ragan <gzr@eazel.com>
- */
- 
+--- libnautilus-extensions/nautilus-volume-monitor.c.orig	Thu Oct 19 16:51:16 2000
++++ libnautilus-extensions/nautilus-volume-monitor.c	Fri Jan 12 11:05:57 2001
+@@ -60,4 +60,9 @@
+ #else
++#ifdef __FreeBSD__
 +#include <sys/param.h>
 +#include <sys/mount.h>
++#else
+ #include <mntent.h>
+ #endif
++#endif
+ 
+@@ -935,2 +940,40 @@
+ 
++#ifdef __FreeBSD__
++static void
++fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent)
++{
++	NautilusVolume *volume;
++	gboolean mounted;
++
++	volume = g_new0 (NautilusVolume, 1);
++	volume->fsname = g_strdup(ent->fs_spec);
++	volume->mount_path = g_strdup(ent->fs_file);
++
++	mounted = FALSE;
++
++	if (nautilus_str_has_prefix (ent->fs_spec, "/dev/fd")) {
++		mounted = mount_volume_floppy_add (monitor, volume);
++	} else if (strcmp (ent->fs_vfstype, "ufs") == 0) {
++		mounted = mount_volume_ext2_add (volume);
++	} else if (strcmp (ent->fs_vfstype, "nfs") == 0) {
++		mounted = mount_volume_nfs_add (volume);
++	} else if (strcmp (ent->fs_vfstype, "cd9660") == 0) {
++		mounted = mount_volume_iso9660_add (volume);
++	} else if (strcmp (ent->fs_vfstype, "msdos") == 0) {
++		mounted = mount_volume_msdos_add (volume);
++	}
++
++	if (mounted) {
++		volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL;
++		monitor->details->volumes = g_list_append (monitor->details->volumes, volume);
++		mount_volume_add_aliases (monitor, volume->fsname, volume);
++	} else {
++		g_free (volume->fsname);
++		g_free (volume->mount_path);
++		g_free (volume);
++	}
++}
++
++#else
 +
- #include <config.h>
- 
- #include <errno.h>
-@@ -31,7 +34,6 @@
- #include <gnome.h>
- #include <libgnome/gnome-i18n.h>
- #include <libgnomevfs/gnome-vfs.h>
--#include <mntent.h>
- #include <libnautilus-extensions/nautilus-cdrom-extensions.h>
- #include <libnautilus-extensions/nautilus-directory-private.h>
- #include <libnautilus-extensions/nautilus-file-utilities.h>
-@@ -48,6 +50,11 @@
- #include <sys/types.h>
- #include <xmlmemory.h>
- 
-+#undef MOUNT_TYPE_ISO9660
-+#define MOUNT_TYPE_ISO9660	"cd9660"
-+#undef MOUNT_TYPE_EXT2
-+#define MOUNT_TYPE_EXT2		"ufs"		/* really ufs */
-+#define _PATH_MOUNTED		"/etc/fstab"
- 
- /* FIXME: Remove messages when this code is done. */
- #define MESSAGE g_message
-@@ -91,7 +98,7 @@
- 									 DeviceInfo             	*device);
- static void     mount_device_activate_floppy                          	(NautilusVolumeMonitor      	*view,
- 									 DeviceInfo             	*device);
--static gboolean	mntent_is_removable_fs					(struct mntent 	  		*ent);
-+static gboolean	mntent_is_removable_fs					(struct fstab 	  		*ent);
- static void	free_device_info             				(DeviceInfo             	*device,
- 						 	 	 	 NautilusVolumeMonitor      	*monitor);
- static gboolean	add_mount_link_property 				(const char 			*path);
-@@ -197,21 +204,19 @@
- fm_desktop_get_removable_volume_list (void)
- {
- 	GList *list;
--	FILE *mef;
--	struct mntent *ent;
-+	struct fstab *ent;
- 
- 	list = NULL;
- 
--	mef = setmntent (_PATH_FSTAB, "r");
--	g_return_val_if_fail (mef, NULL);
-+	setfsent();
- 
--	while ((ent = getmntent (mef))) {
-+	while ((ent = getfsent ())) {
- 		if (mntent_is_removable_fs (ent)) {
--			list = g_list_append (list, g_strdup (ent->mnt_dir));
-+			list = g_list_append (list, g_strdup (ent->fs_file));
- 			continue;
- 		}
- 	}
--  	endmntent (mef);
-+  	endfsent ();
- 
- 	/* Move all floppy mounts to top of list */
- 	list = g_list_sort (list, (GCompareFunc) floppy_sort);
-@@ -754,7 +759,7 @@
- 
- 
  static void
--add_mount_device (NautilusVolumeMonitor *monitor, struct mntent *ent)
-+add_mount_device (NautilusVolumeMonitor *monitor, struct fstab *ent)
- {
- 	DeviceInfo *newdev = NULL;
- 	gboolean mounted;
-@@ -762,23 +767,23 @@
- 	newdev = g_new0 (DeviceInfo, 1);
- 	g_assert (newdev);
- 	newdev->device_fd   = -1;
--	newdev->fsname 	    = g_strdup (ent->mnt_fsname);
--	newdev->mount_path  = g_strdup (ent->mnt_dir);
-+	newdev->fsname 	    = g_strdup (ent->fs_spec);
-+	newdev->mount_path  = g_strdup (ent->fs_file);
- 	newdev->volume_name = NULL;
- 	newdev->link_uri    = NULL;
- 	newdev->state 	    = STATE_EMPTY;
- 
+@@ -946,3 +989,3 @@
  	mounted = FALSE;
- 	
--	if (strcmp (ent->mnt_type, MOUNT_TYPE_ISO9660) == 0) {		
-+	if (strcmp (ent->fs_type, MOUNT_TYPE_ISO9660) == 0) {		
-     		mounted = mount_device_iso9660_add (monitor, newdev); 
--	} else if (strncmp (ent->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0) {		
-+	} else if (strncmp (ent->fs_file, "/dev/fd", strlen("/dev/fd")) == 0) {		
- 		mounted = mount_device_floppy_add (monitor, newdev);
--	} else if (strcmp (ent->mnt_type, MOUNT_TYPE_EXT2) == 0) {		
-+	} else if (strcmp (ent->fs_type, MOUNT_TYPE_EXT2) == 0) {		
- 		mounted = mount_device_ext2_add (newdev);
- 	} else {
- 		/* FIXME: Is this a reasonable way to report this error? */
--		MESSAGE ("Unknown file system: %s", ent->mnt_type);
-+		MESSAGE ("Unknown file system: %s", ent->fs_type);
- 	}
- 	
- 	if (mounted) {
-@@ -794,13 +799,13 @@
+-	
++
+ 	if (nautilus_str_has_prefix (ent->mnt_fsname, FLOPPY_DEVICE_PATH_PREFIX)) {		
+@@ -993,2 +1036,3 @@
  }
- 
- static gboolean
--mntent_is_removable_fs (struct mntent *ent)
-+mntent_is_removable_fs (struct fstab *ent)
- {
--	if (strcmp (ent->mnt_type, MOUNT_TYPE_ISO9660) == 0) {
-+	if (strcmp (ent->fs_type, MOUNT_TYPE_ISO9660) == 0) {
- 		return TRUE;
- 	}
- 	
--	if (strncmp (ent->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0) {
-+	if (strncmp (ent->fs_file, "/dev/fd", strlen("/dev/fd")) == 0) {
- 		return TRUE;
- 	}
- 	
-@@ -833,14 +838,12 @@
- void
- nautilus_volume_monitor_find_mount_devices (NautilusVolumeMonitor *monitor)
++#endif /* __FreeBSD__ */
+ #endif /* HAVE_SYS_MNTTAB_H */
+@@ -1021,2 +1065,11 @@
  {
--	FILE *mef;
--	struct mntent *ent;
++#ifdef __FreeBSD__
 +	struct fstab *ent;
- 
--	mef = setmntent (_PATH_MNTTAB, "r");
--	g_return_if_fail (mef);
++
 +	setfsent ();
- 
--	while ((ent = getmntent (mef))) {
--		MESSAGE ("Checking device %s", ent->mnt_fsname);
-+	while ((ent = getfsent ())) {
-+		MESSAGE ("Checking device %s", ent->fs_spec);
- 
- #if 0
- 		/* Think some more about these checks */
-@@ -859,7 +862,7 @@
- 	}
- 
- 
--  	endmntent (mef);
-+  	endfsent ();
- 
- 	g_list_foreach (monitor->details->devices, (GFunc) mount_device_set_state, monitor);
++	while ((ent = getfsent ())) 
++		fstab_add_mount_volume (monitor, ent);
++	endfsent ();
++#else
++
+ 	FILE *mef;
+@@ -1055,2 +1108,4 @@
+ #endif
++
++#endif	/* __FreeBSD__ */
  
diff --git a/x11-fm/nautilus/files/patch-ad b/x11-fm/nautilus/files/patch-ad
index 5f1fee5478fb..bc6672a0e58b 100644
--- a/x11-fm/nautilus/files/patch-ad
+++ b/x11-fm/nautilus/files/patch-ad
@@ -1,30 +1,31 @@
---- components/rpmview/nautilus-rpm-view.c.orig	Mon Aug  7 18:31:00 2000
-+++ components/rpmview/nautilus-rpm-view.c	Tue Aug 22 18:21:25 2000
-@@ -52,6 +52,10 @@
- #include <libgnorba/gnorba.h>
- #include <limits.h>
+--- components/rpmview/nautilus-rpm-view.c.orig	Tue Oct  3 01:33:39 2000
++++ components/rpmview/nautilus-rpm-view.c	Fri Jan 12 10:04:04 2001
+@@ -57,2 +57,8 @@
  
-+#define FD_t		int
-+#define	fdOpen		open
-+#define	fdClose		close
++#ifdef __FreeBSD__
++#define	FD_t	int
++#define	fdOpen	open
++#define	fdClose	close
++#endif
 +
  #ifdef EAZEL_SERVICES
- #include <libeazelinstall.h>
- #include "nautilus-rpm-view-install.h"
-@@ -399,7 +403,6 @@
- 	gint result = 0;
- 	gchar *version_ptr, *release_ptr;
+@@ -483,4 +489,5 @@
  	
-- 	rpmReadConfigFiles (NULL, NULL);   
+-	
++#ifndef __FreeBSD__	
+  	rpmReadConfigFiles (NULL, NULL);   
++#endif
      	rpm_result = rpmdbOpen ("", &rpm_db, O_RDONLY, 0644);
- 	if (rpm_result != 0) {
- 		g_message ("couldn't open package database: %d", rpm_result);
-@@ -467,7 +470,7 @@
- 	
- 	file_descriptor = fdOpen (path_name, O_RDONLY, 0644);
- 	 
--	if (file_descriptor != NULL) {
-+	if (file_descriptor != -1) {
-                 
+@@ -571,4 +578,10 @@
+ 	g_free (path_name);
+-	
+-	if (file_descriptor != NULL) {    
++
++	if (file_descriptor !=
++#ifdef __FreeBSD_
++	if (file_descriptor != -1)
++#else
++	if (file_descriptor != NULL)
++#endif
++	{
  		/* read out the appropriate fields, and set them up in the view */
- 		result = rpmReadPackageInfo (file_descriptor, &signature, &header_info);
diff --git a/x11-fm/nautilus/files/patch-ae b/x11-fm/nautilus/files/patch-ae
deleted file mode 100644
index 5feacc5b592c..000000000000
--- a/x11-fm/nautilus/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/file-manager/fm-desktop-icon-view.c.orig	Thu Aug  3 17:15:58 2000
-+++ src/file-manager/fm-desktop-icon-view.c	Tue Aug 22 18:55:18 2000
-@@ -41,7 +41,6 @@
- #include <libnautilus-extensions/nautilus-link.h>
- #include <libnautilus-extensions/nautilus-volume-monitor.h>
- #include <limits.h>
--#include <mntent.h>
- #include <stddef.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/x11-fm/nautilus/files/patch-af b/x11-fm/nautilus/files/patch-af
deleted file mode 100644
index f5c2357db171..000000000000
--- a/x11-fm/nautilus/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Wed Aug 16 08:29:15 2000
-+++ tools/Makefile.in	Thu Aug 24 10:35:27 2000
-@@ -154,7 +154,7 @@
- 
- NULL = 
- 
--SUBDIRS =  	leak-checker 	$(NULL)
-+SUBDIRS =  	$(NULL)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/x11-fm/nautilus/files/patch-ag b/x11-fm/nautilus/files/patch-ag
index b8000d55cb57..d66452a0c070 100644
--- a/x11-fm/nautilus/files/patch-ag
+++ b/x11-fm/nautilus/files/patch-ag
@@ -1,13 +1,9 @@
---- src/Makefile.in.orig	Wed Aug 16 08:29:06 2000
-+++ src/Makefile.in	Wed Aug 23 14:53:30 2000
-@@ -573,8 +573,8 @@
- 	$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
- 	@list='run-nautilus'; for p in $$list; do\
- 	  if test -f $(srcdir)/$$p; then \
+--- src/Makefile.in.orig	Tue Nov  7 08:30:29 2000
++++ src/Makefile.in	Fri Jan 12 10:05:21 2001
+@@ -661,4 +661,4 @@
+ 	  if test -f $$p; then \
 -	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
--	    $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
 +	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
-+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
++	    $(INSTALL_SCRIPT) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
  	  else :; fi; \
- 	done
- 
diff --git a/x11-fm/nautilus/files/patch-ah b/x11-fm/nautilus/files/patch-ah
deleted file mode 100644
index a0bb2bb4685a..000000000000
--- a/x11-fm/nautilus/files/patch-ah
+++ /dev/null
@@ -1,69 +0,0 @@
---- libnautilus-extensions/nautilus-preferences.c.orig	Wed Jul 12 03:03:32 2000
-+++ libnautilus-extensions/nautilus-preferences.c	Tue Oct  3 11:59:02 2000
-@@ -594,3 +594,3 @@
- 	if (!gconf_is_initialized ()) {
--		GConfError	  *error = NULL;
-+		GError		  *error = NULL;
- 		char		  *argv[] = { "nautilus", NULL };
-@@ -601,5 +601,5 @@
- 			/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
--			g_warning ("GConf init failed:\n  %s", error->str);
-+			g_warning ("GConf init failed:\n  %s", error->message);
- 			
--			gconf_error_destroy (error);
-+			g_error_free (error);
- 			
---- libnautilus-extensions/nautilus-user-level-manager.c.orig	Wed Jul 12 03:03:32 2000
-+++ libnautilus-extensions/nautilus-user-level-manager.c	Tue Oct  3 12:06:04 2000
-@@ -111,3 +111,3 @@
- 	if (!gconf_is_initialized ()) {
--		GConfError	  *error = NULL;
-+		GError		  *error = NULL;
- 		char		  *argv[] = { "nautilus", NULL };
-@@ -118,5 +118,5 @@
- 			/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
--			g_warning ("GConf init failed:\n  %s", error->str);
-+			g_warning ("GConf init failed:\n  %s", error->message);
- 			
--			gconf_error_destroy (error);
-+			g_error_free (error);
- 			
-@@ -245,3 +245,3 @@
- 
--	gconf_value_destroy (value);
-+	gconf_value_free (value);
- }
-@@ -460,3 +460,3 @@
- 	if (value) {
--		gconf_value_destroy (value);
-+		gconf_value_free (value);
- 	}
-@@ -499,5 +499,5 @@
- 		case GCONF_VALUE_STRING:
--			result = (gconf_value_string (value_a)
--				  && gconf_value_string (value_b)
--				  && (strcmp (gconf_value_string (value_a), gconf_value_string (value_b)) == 0));
-+			result = (gconf_value_get_string (value_a)
-+				  && gconf_value_get_string (value_b)
-+				  && (strcmp (gconf_value_get_string (value_a), gconf_value_get_string (value_b)) == 0));
- 			break;
-@@ -505,3 +505,3 @@
- 		case GCONF_VALUE_INT:
--			result = (gconf_value_int (value_a) == gconf_value_int (value_b));
-+			result = (gconf_value_get_int (value_a) == gconf_value_get_int (value_b));
- 			break;
-@@ -509,3 +509,3 @@
- 		case GCONF_VALUE_BOOL:
--			result = (gconf_value_bool (value_a) == gconf_value_bool (value_b));
-+			result = (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b));
- 			break;
-@@ -522,3 +522,3 @@
- 	if (value_a) {
--		gconf_value_destroy (value_a);
-+		gconf_value_free (value_a);
- 	}
-@@ -526,3 +526,3 @@
- 	if (value_b) {
--		gconf_value_destroy (value_b);
-+		gconf_value_free (value_b);
- 	}
diff --git a/x11-fm/nautilus/files/patch-ai b/x11-fm/nautilus/files/patch-ai
new file mode 100644
index 000000000000..ffa17f0d6094
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-ai
@@ -0,0 +1,175 @@
+--- libnautilus-adapter/nautilus-adapter-factory.h.orig	Tue Nov  7 08:30:23 2000
++++ libnautilus-adapter/nautilus-adapter-factory.h	Fri Jan 12 11:15:24 2001
+@@ -91,3 +91,3 @@
+ #define Nautilus_ComponentAdapterFactory_unref Bonobo_Unknown_unref
+-#define Nautilus_ComponentAdapterFactory_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_ComponentAdapterFactory_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_View
+--- libnautilus/nautilus-distributed-undo.h.orig	Tue Nov  7 08:30:22 2000
++++ libnautilus/nautilus-distributed-undo.h	Fri Jan 12 11:16:13 2001
+@@ -262,3 +262,3 @@
+ #define Nautilus_Undo_Transaction_unref Bonobo_Unknown_unref
+-#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_Undo_MenuItem
+@@ -279,3 +279,3 @@
+ #define Nautilus_Undo_Manager_unref Bonobo_Unknown_unref
+-#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_Undo_Manager_append(Nautilus_Undo_Manager _obj,
+@@ -290,3 +290,3 @@
+ #define Nautilus_Undo_Context_unref Bonobo_Unknown_unref
+-#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_Undo_Manager
+--- libnautilus/nautilus-view-component.h.orig	Tue Nov  7 08:30:21 2000
++++ libnautilus/nautilus-view-component.h	Fri Jan 12 11:17:01 2001
+@@ -783,3 +783,3 @@
+ #define Nautilus_View_unref Bonobo_Unknown_unref
+-#define Nautilus_View_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_View_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_View_load_location(Nautilus_View _obj,
+@@ -797,3 +797,3 @@
+ #define Nautilus_ViewFrame_unref Bonobo_Unknown_unref
+-#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_ViewFrame_open_location(Nautilus_ViewFrame _obj,
+@@ -831,3 +831,3 @@
+ #define Nautilus_Zoomable_unref Bonobo_Unknown_unref
+-#define Nautilus_Zoomable_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Zoomable_query_interface Bonobo_Unknown_queryInterface
+    CORBA_float Nautilus_Zoomable__get_zoom_level(Nautilus_Zoomable _obj,
+@@ -854,3 +854,3 @@
+ #define Nautilus_ZoomableFrame_unref Bonobo_Unknown_unref
+-#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_queryInterface
+    void
+@@ -864,3 +864,3 @@
+ #define Nautilus_HistoryFrame_unref Bonobo_Unknown_unref
+-#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_HistoryList
+--- libnautilus/nautilus-view.c.orig	Thu Oct  5 18:47:43 2000
++++ libnautilus/nautilus-view.c	Fri Jan 12 11:17:28 2001
+@@ -314,3 +314,3 @@
+ 
+-	view_frame = Bonobo_Unknown_query_interface 
++	view_frame = Bonobo_Unknown_queryInterface 
+ 		(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
+--- libnautilus/nautilus-zoomable.c.orig	Thu Sep 14 12:10:16 2000
++++ libnautilus/nautilus-zoomable.c	Fri Jan 12 11:17:58 2001
+@@ -540,3 +540,3 @@
+ 	if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) {
+-		view->details->zoomable_frame = Bonobo_Unknown_query_interface 
++		view->details->zoomable_frame = Bonobo_Unknown_queryInterface 
+ 			(bonobo_control_get_control_frame 
+--- src/nautilus-shell-interface.h.orig	Tue Nov  7 08:30:27 2000
++++ src/nautilus-shell-interface.h	Fri Jan 12 11:18:21 2001
+@@ -93,3 +93,3 @@
+ #define Nautilus_Shell_unref Bonobo_Unknown_unref
+-#define Nautilus_Shell_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Shell_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_Shell_open_windows(Nautilus_Shell _obj,
+--- libnautilus/nautilus-undo.c.orig	Thu Oct  5 18:47:43 2000
++++ libnautilus/nautilus-undo.c	Fri Jan 12 11:29:48 2001
+@@ -257,3 +257,3 @@
+ 	if (!CORBA_Object_is_nil (control_frame, &ev)) {
+-		undo_context = Bonobo_Control_query_interface
++		undo_context = Bonobo_Control_queryInterface
+ 			(control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev);
+--- src/nautilus-window.h.orig	Fri Oct  6 19:34:52 2000
++++ src/nautilus-window.h	Fri Jan 12 11:47:43 2001
+@@ -51,3 +51,3 @@
+ typedef struct {
+-        BonoboWinClass parent_spot;
++        BonoboWindowClass parent_spot;
+ } NautilusWindowClass;
+@@ -66,3 +66,3 @@
+ struct NautilusWindow {
+-        BonoboWin parent_object;
++        BonoboWindow parent_object;
+         
+--- src/nautilus-window.c.orig	Mon Nov  6 07:41:55 2000
++++ src/nautilus-window.c	Fri Jan 12 11:51:20 2001
+@@ -127,3 +127,3 @@
+ 				   nautilus_window,
+-				   BONOBO_TYPE_WIN)
++				   BONOBO_TYPE_WINDOW)
+ 
+@@ -343,3 +343,3 @@
+ 	bonobo_ui_container_set_win (window->details->ui_container,
+-				     BONOBO_WIN (window));
++				     BONOBO_WINDOW (window));
+ 
+@@ -422,3 +422,3 @@
+ 	gtk_widget_show (window->content_hbox);
+-	bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
++	bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
+ 	
+@@ -498,4 +498,4 @@
+ 		}
+-		old_name = bonobo_win_get_name (BONOBO_WIN (object));
+-		bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg));
++		old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
++		bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
+ 		/* This hack of using the time when the name first
+@@ -523,3 +523,3 @@
+ 	case ARG_APP_ID:
+-		GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
++		GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
+ 		break;
+--- components/adapter/nautilus-adapter-embed-strategy.c.orig	Mon Oct 23 09:36:53 2000
++++ components/adapter/nautilus-adapter-embed-strategy.c	Fri Jan 12 11:55:01 2001
+@@ -122,3 +122,3 @@
+ 
+-	control = Bonobo_Unknown_query_interface (component,
++	control = Bonobo_Unknown_queryInterface (component,
+ 						  "IDL:Bonobo/Control:1.0", &ev);
+@@ -132,3 +132,3 @@
+ 
+-	embeddable = Bonobo_Unknown_query_interface (component,
++	embeddable = Bonobo_Unknown_queryInterface (component,
+ 						     "IDL:Bonobo/Embeddable:1.0", &ev);
+--- components/adapter/nautilus-adapter-load-strategy.c.orig	Mon Oct  2 23:12:50 2000
++++ components/adapter/nautilus-adapter-load-strategy.c	Fri Jan 12 11:55:47 2001
+@@ -138,3 +138,3 @@
+ 
+-	progressive_data_sink = Bonobo_Unknown_query_interface (component,
++	progressive_data_sink = Bonobo_Unknown_queryInterface (component,
+ 								"IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
+@@ -149,3 +149,3 @@
+ 
+-	persist_stream = Bonobo_Unknown_query_interface (component,
++	persist_stream = Bonobo_Unknown_queryInterface (component,
+ 							 "IDL:Bonobo/PersistStream:1.0", &ev);
+@@ -159,3 +159,3 @@
+ 
+-	persist_file = Bonobo_Unknown_query_interface (component,
++	persist_file = Bonobo_Unknown_queryInterface (component,
+ 						       "IDL:Bonobo/PersistFile:1.0", &ev);
+--- components/adapter/nautilus-adapter-progressive-load-strategy.c.orig	Fri Oct 20 03:45:48 2000
++++ components/adapter/nautilus-adapter-progressive-load-strategy.c	Fri Jan 12 11:56:27 2001
+@@ -210,3 +210,3 @@
+ 	if (result == GNOME_VFS_OK && file_info.valid_fields | GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
+-		Bonobo_ProgressiveDataSink_set_size (strategy->details->progressive_data_sink, 
++		Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink, 
+ 						     (long) file_info.size, &ev);
+@@ -221,3 +221,3 @@
+ 
+-			Bonobo_ProgressiveDataSink_add_data (strategy->details->progressive_data_sink, iobuf, &ev);
++			Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev);
+ 			
+--- components/history/nautilus-history-view.c.orig	Thu Oct  5 18:47:34 2000
++++ components/history/nautilus-history-view.c	Fri Jan 12 11:59:20 2001
+@@ -71,3 +71,3 @@
+ 	CORBA_exception_init (ev);
+-	return Bonobo_Unknown_query_interface 
++	return Bonobo_Unknown_queryInterface 
+ 		(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
+--- components/image-viewer/nautilus-image-view.c.orig	Mon Oct 23 20:13:27 2000
++++ components/image-viewer/nautilus-image-view.c	Fri Jan 12 12:00:35 2001
+@@ -597,3 +597,3 @@
+ 	g_return_val_if_fail (this != NULL, NULL);
+-	g_return_val_if_fail (this->goad_id != NULL, NULL);
++/*	g_return_val_if_fail (this->goad_id != NULL, NULL);*/
+ 
diff --git a/x11-fm/nautilus/files/patch-aj b/x11-fm/nautilus/files/patch-aj
new file mode 100644
index 000000000000..7f5c52a5c307
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-aj
@@ -0,0 +1,10 @@
+--- librsvg/rsvg-ft.c.orig	Sun Oct 22 05:24:29 2000
++++ librsvg/rsvg-ft.c	Fri Jan 12 10:32:10 2001
+@@ -30,3 +30,7 @@
+ 
++#ifdef __FreeBSD__
++#include <freetype2/freetype/freetype.h>
++#else
+ #include <freetype/freetype.h>
++#endif
+ 
diff --git a/x11-fm/nautilus/files/patch-ak b/x11-fm/nautilus/files/patch-ak
new file mode 100644
index 000000000000..f5aa84593eaf
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-ak
@@ -0,0 +1,10 @@
+--- 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-al b/x11-fm/nautilus/files/patch-al
new file mode 100644
index 000000000000..6134eb8abee3
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-al
@@ -0,0 +1,9 @@
+--- helper-scripts/Makefile.in.orig	Fri Jan 12 12:04:47 2001
++++ helper-scripts/Makefile.in	Fri Jan 12 12:24:05 2001
+@@ -267,4 +267,4 @@
+ 	  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; \
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index fb74c3ecd75b..19e6f2c358ed 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -3,26 +3,25 @@ bin/gnome-info2html2
 bin/gnome-man2html2
 bin/hyperbola
 bin/nautilus
+bin/nautilus-adapter
 bin/nautilus-authenticate
 bin/nautilus-clean.sh
 bin/nautilus-content-loser
+bin/nautilus-error-dialog
 bin/nautilus-hardware-view
 bin/nautilus-history-view
+bin/nautilus-image-view
 %%MOZILLA:%%bin/nautilus-mozilla-content-view
 bin/nautilus-music-view
 bin/nautilus-notes
-bin/nautilus-rpm-view
 bin/nautilus-sample-content-view
 bin/nautilus-sidebar-loser
-bin/nautilus-tree-view
-bin/ntl-web-browser
-bin/ntl-web-search
+bin/nautilus-verify-rpm.sh
 bin/run-nautilus
-bin/test-ft
-bin/test-rsvg
 etc/vfs/modules/help-methods.conf
 include/libnautilus/libnautilus.h
 include/libnautilus/nautilus-bonobo-ui.h
+include/libnautilus/nautilus-bonobo-workarounds.h
 include/libnautilus/nautilus-clipboard.h
 include/libnautilus/nautilus-distributed-undo.h
 include/libnautilus/nautilus-undo-private.h
@@ -30,12 +29,80 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view.h
 include/libnautilus/nautilus-zoomable.h
+lib/libnautilus-adapter.so
+lib/libnautilus-adapter.so.0
 lib/libnautilus-extensions.so
 lib/libnautilus-extensions.so.0
+lib/libnautilus-tree-view.so
+lib/libnautilus-tree-view.so.0
 lib/libnautilus.so
 lib/libnautilus.so.0
 lib/vfs/modules/libvfs-help.so
 share/gnome/apps/Applications/nautilus.desktop
+share/gnome/help/fdl/C/fdl.sgml
+share/gnome/help/nautilus/C/ch1-README.png
+share/gnome/help/nautilus/C/ch1-cnn.png
+share/gnome/help/nautilus/C/ch1-complex-search.png
+share/gnome/help/nautilus/C/ch1-connect.png
+share/gnome/help/nautilus/C/ch1-duplicate.png
+share/gnome/help/nautilus/C/ch1-google.png
+share/gnome/help/nautilus/C/ch1-hardware.png
+share/gnome/help/nautilus/C/ch1-history.png
+share/gnome/help/nautilus/C/ch1-home-john.png
+share/gnome/help/nautilus/C/ch1-home.png
+share/gnome/help/nautilus/C/ch1-icon-view-150.png
+share/gnome/help/nautilus/C/ch1-icon-view-demo.png
+share/gnome/help/nautilus/C/ch1-inadequate-permissions.png
+share/gnome/help/nautilus/C/ch1-list-mydoc.png
+share/gnome/help/nautilus/C/ch1-music-control.png
+share/gnome/help/nautilus/C/ch1-nautiluslogo.png
+share/gnome/help/nautilus/C/ch1-new-window.png
+share/gnome/help/nautilus/C/ch1-open-with.png
+share/gnome/help/nautilus/C/ch1-panel.png
+share/gnome/help/nautilus/C/ch1-permissions.png
+share/gnome/help/nautilus/C/ch1-pluck.png
+share/gnome/help/nautilus/C/ch1-samba.png
+share/gnome/help/nautilus/C/ch1-slash.png
+share/gnome/help/nautilus/C/ch1-toolbar.png
+share/gnome/help/nautilus/C/ch1-toshiba.png
+share/gnome/help/nautilus/C/ch1-tree-demo.png
+share/gnome/help/nautilus/C/ch1-tree-doc-1.png
+share/gnome/help/nautilus/C/ch1-tree-doc.png
+share/gnome/help/nautilus/C/ch1-tree-etc.png
+share/gnome/help/nautilus/C/ch1-tree-slash.png
+share/gnome/help/nautilus/C/ch1-view-as.png
+share/gnome/help/nautilus/C/ch1-zoom-control.png
+share/gnome/help/nautilus/C/ch2-colors.png
+share/gnome/help/nautilus/C/ch2-edit-settings-folder.png
+share/gnome/help/nautilus/C/ch2-emblems.png
+share/gnome/help/nautilus/C/ch2-home-john-mydoc.png
+share/gnome/help/nautilus/C/ch2-icon-captions-alone.png
+share/gnome/help/nautilus/C/ch2-icon-captions.png
+share/gnome/help/nautilus/C/ch2-john.png
+share/gnome/help/nautilus/C/ch2-music.png
+share/gnome/help/nautilus/C/ch2-open-with-other.png
+share/gnome/help/nautilus/C/ch2-open-with.png
+share/gnome/help/nautilus/C/ch2-photos-john.png
+share/gnome/help/nautilus/C/ch2-right-click-open-with.png
+share/gnome/help/nautilus/C/ch2-search-settings.png
+share/gnome/help/nautilus/C/ch2-ski-intermediate-menu.png
+share/gnome/help/nautilus/C/ch2-theme-eazel.png
+share/gnome/help/nautilus/C/ch2-view-layout-menu.png
+share/gnome/help/nautilus/C/ch3-account-info.png
+share/gnome/help/nautilus/C/ch3-online-storage.png
+share/gnome/help/nautilus/C/ch3-package-titles.png
+share/gnome/help/nautilus/C/ch3-sign-up.png
+share/gnome/help/nautilus/C/ch3-welcome-screen.png
+share/gnome/help/nautilus/C/chapter-1.sgml
+share/gnome/help/nautilus/C/chapter-2.sgml
+share/gnome/help/nautilus/C/chapter-3.sgml
+share/gnome/help/nautilus/C/install-update.png
+share/gnome/help/nautilus/C/install-user-level.png
+share/gnome/help/nautilus/C/install.sgml
+share/gnome/help/nautilus/C/intro.sgml
+share/gnome/help/nautilus/C/license.html
+share/gnome/help/nautilus/C/model.sgml
+share/gnome/help/nautilus/C/nautilus.sgml
 share/gnome/hyperbola/maps/pages.map
 share/gnome/nautilus/backgrounds/.striated.png
 share/gnome/nautilus/backgrounds/50s.png
@@ -78,57 +145,121 @@ share/gnome/nautilus/backgrounds/white_ribs.png
 share/gnome/nautilus/backgrounds/yellow_paper.jpg
 share/gnome/nautilus/browser.xml
 share/gnome/nautilus/emblems/OK.png
-share/gnome/nautilus/emblems/confidential.gif
+share/gnome/nautilus/emblems/certified.png
+share/gnome/nautilus/emblems/cool.png
 share/gnome/nautilus/emblems/distinguished.png
 share/gnome/nautilus/emblems/draft.png
+share/gnome/nautilus/emblems/erase.png
 share/gnome/nautilus/emblems/favorite.png
 share/gnome/nautilus/emblems/important.png
 share/gnome/nautilus/emblems/new.png
 share/gnome/nautilus/emblems/ohno.png
 share/gnome/nautilus/emblems/personal.png
+share/gnome/nautilus/emblems/secret.png
+share/gnome/nautilus/emblems/shared.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/portals.xml
 share/gnome/nautilus/linksets/search_engines.xml
+share/gnome/nautilus/nautilus-extras.placeholder
+share/gnome/nautilus/nautilus-suggested.placeholder
 share/gnome/nautilus/static_bookmarks.xml
 share/gnome/nautilus/top/.nautilus-metafile.xml
-share/gnome/nautilus/top/About.html
 share/gnome/nautilus/top/Computer
 share/gnome/nautilus/top/Services
 share/gnome/oaf/help-contents.oafinfo
 share/gnome/oaf/help-factory.oafinfo
+share/gnome/oaf/nautilus-adapter.oafinfo
 share/gnome/oaf/nautilus-content-loser.oafinfo
 share/gnome/oaf/nautilus-hardware-view.oafinfo
 share/gnome/oaf/nautilus-history-view.oafinfo
+share/gnome/oaf/nautilus-image-view.oafinfo
 %%MOZILLA:%%share/gnome/oaf/nautilus-mozilla-content-view.oafinfo
 share/gnome/oaf/nautilus-music-view.oafinfo
 share/gnome/oaf/nautilus-notes.oafinfo
-share/gnome/oaf/nautilus-rpm-view.oafinfo
 share/gnome/oaf/nautilus-sample-content-view.oafinfo
 share/gnome/oaf/nautilus-sidebar-loser.oafinfo
 share/gnome/oaf/nautilus-tree-view.oafinfo
 share/gnome/oaf/nautilus.oafinfo
-share/gnome/oaf/ntl-web-browser.oafinfo
-share/gnome/oaf/ntl-web-search.oafinfo
-share/gnome/pixmaps/nautilus.png
+share/gnome/pixmaps/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/About_Image.png
+share/gnome/pixmaps/nautilus/CD_drive.png
+share/gnome/pixmaps/nautilus/SearchWeb.png
+share/gnome/pixmaps/nautilus/Services.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-192-aa.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-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-192-aa.png
+share/gnome/pixmaps/nautilus/arlo/i-regular-192.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
@@ -138,10 +269,40 @@ 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/rest.png
 share/gnome/pixmaps/nautilus/arlo/zoom_body.png
 share/gnome/pixmaps/nautilus/audio.png
 share/gnome/pixmaps/nautilus/backgrounds.png
@@ -152,12 +313,16 @@ share/gnome/pixmaps/nautilus/computer.svg
 share/gnome/pixmaps/nautilus/cpu.png
 share/gnome/pixmaps/nautilus/decrement.png
 share/gnome/pixmaps/nautilus/default.xml
+share/gnome/pixmaps/nautilus/druid_header.png
+share/gnome/pixmaps/nautilus/druid_header_stretch.png
+share/gnome/pixmaps/nautilus/druid_sidebar.png
 share/gnome/pixmaps/nautilus/eazel-logo.gif
 share/gnome/pixmaps/nautilus/eazel/Back.png
 share/gnome/pixmaps/nautilus/eazel/Forward.png
 share/gnome/pixmaps/nautilus/eazel/Home.png
 share/gnome/pixmaps/nautilus/eazel/Refresh.png
 share/gnome/pixmaps/nautilus/eazel/Search.png
+share/gnome/pixmaps/nautilus/eazel/SearchWeb.png
 share/gnome/pixmaps/nautilus/eazel/Services.png
 share/gnome/pixmaps/nautilus/eazel/Stop.png
 share/gnome/pixmaps/nautilus/eazel/Up.png
@@ -188,26 +353,13 @@ share/gnome/pixmaps/nautilus/eazel/i-directory-accept.png
 share/gnome/pixmaps/nautilus/eazel/i-directory-accept.xml
 share/gnome/pixmaps/nautilus/eazel/i-directory.png
 share/gnome/pixmaps/nautilus/eazel/i-directory.xml
-share/gnome/pixmaps/nautilus/eazel/i-regular-12-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-12.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-24-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-24.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-36-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-36.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-72-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-72.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-96-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-96.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular.png
-share/gnome/pixmaps/nautilus/eazel/i-regular.xml
 share/gnome/pixmaps/nautilus/eazel/number_strip.png
 share/gnome/pixmaps/nautilus/eazel/theme_preview.png
 share/gnome/pixmaps/nautilus/eazel/zoom_body.png
 share/gnome/pixmaps/nautilus/emblem-OK.svg
-share/gnome/pixmaps/nautilus/emblem-certified.gif
+share/gnome/pixmaps/nautilus/emblem-certified.svg
 share/gnome/pixmaps/nautilus/emblem-changed.gif
-share/gnome/pixmaps/nautilus/emblem-confidential.gif
+share/gnome/pixmaps/nautilus/emblem-cool.svg
 share/gnome/pixmaps/nautilus/emblem-distinguished.svg
 share/gnome/pixmaps/nautilus/emblem-draft.svg
 share/gnome/pixmaps/nautilus/emblem-encrypted.gif
@@ -216,10 +368,13 @@ share/gnome/pixmaps/nautilus/emblem-generic.png
 share/gnome/pixmaps/nautilus/emblem-important.svg
 share/gnome/pixmaps/nautilus/emblem-new.svg
 share/gnome/pixmaps/nautilus/emblem-noread.svg
-share/gnome/pixmaps/nautilus/emblem-nowrite.png
+share/gnome/pixmaps/nautilus/emblem-nowrite.svg
 share/gnome/pixmaps/nautilus/emblem-ohno.svg
 share/gnome/pixmaps/nautilus/emblem-personal.svg
 share/gnome/pixmaps/nautilus/emblem-remote.gif
+share/gnome/pixmaps/nautilus/emblem-secret.svg
+share/gnome/pixmaps/nautilus/emblem-shared.svg
+share/gnome/pixmaps/nautilus/emblem-special.svg
 share/gnome/pixmaps/nautilus/emblem-symbolic-link.png
 share/gnome/pixmaps/nautilus/emblem-trash.png
 share/gnome/pixmaps/nautilus/emblem-urgent.svg
@@ -247,7 +402,6 @@ share/gnome/pixmaps/nautilus/gnome-audio-midi.png
 share/gnome/pixmaps/nautilus/gnome-audio-ulaw.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-aiff.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-mod.png
-share/gnome/pixmaps/nautilus/gnome-audio-x-mp3.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-pn-realaudio.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-s3m.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-stm.png
@@ -257,7 +411,6 @@ share/gnome/pixmaps/nautilus/gnome-audio-x-xi.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-xm.png
 share/gnome/pixmaps/nautilus/gnome-audio.png
 share/gnome/pixmaps/nautilus/gnome-compressed.png
-share/gnome/pixmaps/nautilus/gnome-core.png
 share/gnome/pixmaps/nautilus/gnome-font-afm.png
 share/gnome/pixmaps/nautilus/gnome-font-ttf.png
 share/gnome/pixmaps/nautilus/gnome-font-x-pcf.png
@@ -302,6 +455,34 @@ share/gnome/pixmaps/nautilus/gnome-textfile.png
 share/gnome/pixmaps/nautilus/gnome-video-mpeg.png
 share/gnome/pixmaps/nautilus/gnome-video-quicktime.png
 share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png
+share/gnome/pixmaps/nautilus/gnome/gnome.xml
+share/gnome/pixmaps/nautilus/gnome/i-directory-12.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-192.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-24.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-36.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-72.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-96.png
+share/gnome/pixmaps/nautilus/gnome/i-directory.png
+share/gnome/pixmaps/nautilus/gnome/i-music.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-12.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-192.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-24.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-36.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-72.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-96.png
+share/gnome/pixmaps/nautilus/gnome/i-regular.png
+share/gnome/pixmaps/nautilus/gnome/theme_preview.png
+share/gnome/pixmaps/nautilus/gnome/throbber/001.png
+share/gnome/pixmaps/nautilus/gnome/throbber/002.png
+share/gnome/pixmaps/nautilus/gnome/throbber/003.png
+share/gnome/pixmaps/nautilus/gnome/throbber/004.png
+share/gnome/pixmaps/nautilus/gnome/throbber/005.png
+share/gnome/pixmaps/nautilus/gnome/throbber/006.png
+share/gnome/pixmaps/nautilus/gnome/throbber/007.png
+share/gnome/pixmaps/nautilus/gnome/throbber/008.png
+share/gnome/pixmaps/nautilus/gnome/throbber/009.png
+share/gnome/pixmaps/nautilus/gnome/throbber/010.png
+share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
 share/gnome/pixmaps/nautilus/hand.svg
 share/gnome/pixmaps/nautilus/home.png
 share/gnome/pixmaps/nautilus/i-blockdev.png
@@ -309,6 +490,7 @@ share/gnome/pixmaps/nautilus/i-bookmark-20.png
 share/gnome/pixmaps/nautilus/i-bookmark-missing-20.png
 share/gnome/pixmaps/nautilus/i-bookmark-missing.png
 share/gnome/pixmaps/nautilus/i-bookmark.png
+share/gnome/pixmaps/nautilus/i-broken-image.png
 share/gnome/pixmaps/nautilus/i-cdrom.png
 share/gnome/pixmaps/nautilus/i-chardev.png
 share/gnome/pixmaps/nautilus/i-core.png
@@ -324,18 +506,31 @@ share/gnome/pixmaps/nautilus/i-directory.png
 share/gnome/pixmaps/nautilus/i-executable.png
 share/gnome/pixmaps/nautilus/i-fifo.png
 share/gnome/pixmaps/nautilus/i-floppy.png
+share/gnome/pixmaps/nautilus/i-harddisk.png
+share/gnome/pixmaps/nautilus/i-music-aa.png
+share/gnome/pixmaps/nautilus/i-music.png
 share/gnome/pixmaps/nautilus/i-nfs.png
 share/gnome/pixmaps/nautilus/i-printer.png
+share/gnome/pixmaps/nautilus/i-regular-12-aa.png
 share/gnome/pixmaps/nautilus/i-regular-12.png
-share/gnome/pixmaps/nautilus/i-regular-192.png
+share/gnome/pixmaps/nautilus/i-regular-24-aa.png
 share/gnome/pixmaps/nautilus/i-regular-24.png
+share/gnome/pixmaps/nautilus/i-regular-36-aa.png
 share/gnome/pixmaps/nautilus/i-regular-36.png
+share/gnome/pixmaps/nautilus/i-regular-72-aa.png
 share/gnome/pixmaps/nautilus/i-regular-72.png
+share/gnome/pixmaps/nautilus/i-regular-96-aa.png
 share/gnome/pixmaps/nautilus/i-regular-96.png
+share/gnome/pixmaps/nautilus/i-regular-aa.png
 share/gnome/pixmaps/nautilus/i-regular.png
+share/gnome/pixmaps/nautilus/i-regular.xml
+share/gnome/pixmaps/nautilus/i-search-72.png
 share/gnome/pixmaps/nautilus/i-sock.png
+share/gnome/pixmaps/nautilus/i-spreadsheet-aa.png
+share/gnome/pixmaps/nautilus/i-spreadsheet.png
 share/gnome/pixmaps/nautilus/i-stalled.png
 share/gnome/pixmaps/nautilus/i-symlink.png
+share/gnome/pixmaps/nautilus/i-web-72.png
 share/gnome/pixmaps/nautilus/i-zipdisk.png
 share/gnome/pixmaps/nautilus/i-zipdisk2.png
 share/gnome/pixmaps/nautilus/increment.png
@@ -343,7 +538,9 @@ share/gnome/pixmaps/nautilus/intermediate-selected.png
 share/gnome/pixmaps/nautilus/intermediate.png
 share/gnome/pixmaps/nautilus/knob.png
 share/gnome/pixmaps/nautilus/leftarrow.png
+share/gnome/pixmaps/nautilus/loading-aa.png
 share/gnome/pixmaps/nautilus/loading.png
+share/gnome/pixmaps/nautilus/manual.png
 share/gnome/pixmaps/nautilus/memory_chip.gif
 share/gnome/pixmaps/nautilus/multi-ok.png
 share/gnome/pixmaps/nautilus/nautilus-logo.png
@@ -354,10 +551,26 @@ share/gnome/pixmaps/nautilus/novice-selected.png
 share/gnome/pixmaps/nautilus/novice.png
 share/gnome/pixmaps/nautilus/rightarrow.png
 share/gnome/pixmaps/nautilus/search.png
-share/gnome/pixmaps/nautilus/tableft.png
-share/gnome/pixmaps/nautilus/tabright.png
+share/gnome/pixmaps/nautilus/services-rpm-72.png
 share/gnome/pixmaps/nautilus/temp-home.png
-share/gnome/pixmaps/nautilus/themes.png
+share/gnome/pixmaps/nautilus/text-selection-frame.png
+share/gnome/pixmaps/nautilus/theme_preview.png
+share/gnome/pixmaps/nautilus/throbber/001.png
+share/gnome/pixmaps/nautilus/throbber/002.png
+share/gnome/pixmaps/nautilus/throbber/003.png
+share/gnome/pixmaps/nautilus/throbber/004.png
+share/gnome/pixmaps/nautilus/throbber/005.png
+share/gnome/pixmaps/nautilus/throbber/006.png
+share/gnome/pixmaps/nautilus/throbber/007.png
+share/gnome/pixmaps/nautilus/throbber/008.png
+share/gnome/pixmaps/nautilus/throbber/009.png
+share/gnome/pixmaps/nautilus/throbber/010.png
+share/gnome/pixmaps/nautilus/throbber/011.png
+share/gnome/pixmaps/nautilus/throbber/012.png
+share/gnome/pixmaps/nautilus/throbber/013.png
+share/gnome/pixmaps/nautilus/throbber/014.png
+share/gnome/pixmaps/nautilus/throbber/015.png
+share/gnome/pixmaps/nautilus/throbber/rest.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.aa.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.png
 share/gnome/pixmaps/nautilus/trash-empty.png
@@ -368,32 +581,81 @@ share/gnome/pixmaps/nautilus/vector/i-directory.svg
 share/gnome/pixmaps/nautilus/vector/i-regular.svg
 share/gnome/pixmaps/nautilus/vector/i-regular.xml
 share/gnome/pixmaps/nautilus/vector/vector.xml
-share/gnome/pixmaps/nautilus/vector/zoom_body.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-24-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-aa.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/websearch/standard.eng
+share/gnome/ui/nautilus-clipboard-ui.xml
+share/gnome/ui/nautilus-content-loser-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
+share/gnome/ui/nautilus-shell-ui.xml
+share/gnome/ui/nautilus-sidebar-loser-ui.xml
+share/locale/ca/LC_MESSAGES/nautilus.mo
 share/locale/da/LC_MESSAGES/nautilus.mo
 share/locale/de/LC_MESSAGES/nautilus.mo
+share/locale/en_GB/LC_MESSAGES/nautilus.mo
 share/locale/fr/LC_MESSAGES/nautilus.mo
+share/locale/ga/LC_MESSAGES/nautilus.mo
 share/locale/gl/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/no/LC_MESSAGES/nautilus.mo
+share/locale/pl/LC_MESSAGES/nautilus.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/sv/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/websearch
+@dirrm share/gnome/pixmaps/nautilus/villanova
 @dirrm share/gnome/pixmaps/nautilus/vector
+@dirrm share/gnome/pixmaps/nautilus/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/eazel
+@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/nautilus/top
 @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/backgrounds
 @dirrm share/gnome/nautilus
 @dirrm share/gnome/hyperbola/maps
 @dirrm share/gnome/hyperbola
+@dirrm share/gnome/help/nautilus/C
+@dirrm share/gnome/help/nautilus
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
 @dirrm include/libnautilus
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index b270ce8b42c6..2a97c4d2a8fa 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/nautilus
@@ -18,9 +17,8 @@ BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		gtkhtml.6:${PORTSDIR}/www/gtkhtml \
 		ghttp.1:${PORTSDIR}/www/libghttp \
-		bz2.1:${PORTSDIR}/archivers/bzip2
-
-BROKEN=		"Build failures with new bonobo"
+		bz2.1:${PORTSDIR}/archivers/bzip2 \
+		freetype.6:${PORTSDIR}/print/freetype2
 
 .if defined(WITH_MOZILLA)
 MOZILLA=	mozilla-embedded
@@ -35,6 +33,8 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-pthread -L${LOCALBASE}/lib" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
+CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
+		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
 
 .if defined(WITH_MOZILLA)
 CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
@@ -42,6 +42,7 @@ CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
 MOZILLA_LIBS=	"-L${X11BASE}/lib/${MOZILLA}"
 PLIST_SUB+=	MOZILLA:=""
 .else
+CONFIGURE_ARGS+= --disable-mozilla-component
 MOZILLA_LIBS=	""
 PLIST_SUB+=	MOZILLA:="@comment "
 .endif
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 80f3e2f50189..4c0c2201fdff 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (nautilus-0.1.0.tar.gz) = 4c4ebd3d136cf234ed80235f65feca6a
+MD5 (nautilus-0.5.tar.gz) = bc8d5b3277a8ecf561dd38bb977baa94
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index ff17f0b7066d..7f494061e6fd 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,26 +1,41 @@
---- configure.orig	Mon Aug 14 19:47:02 2000
-+++ configure	Mon Aug 28 13:34:38 2000
-@@ -2368,7 +2368,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
+--- configure.orig	Tue Nov  7 08:28:46 2000
++++ configure	Fri Jan 12 10:20:32 2001
+@@ -39,5 +39,5 @@
+ ac_help="$ac_help
+-  --with-freetype2-lib-prefix=PREFIX		freetype2 library path"
++  --with-freetype2-lib-place=PREFIX		freetype2 library path"
+ ac_help="$ac_help
+-  --with-freetype2-include-prefix=PREFIX	freetype2 include path"
++  --with-freetype2-include-place=PREFIX	freetype2 include path"
+ ac_help="$ac_help
+@@ -2545,5 +2545,4 @@
+ 
+-# Check whether --with-freetype2 or --without-freetype2 was given.
+-if test "${with_freetype2+set}" = set; then
+-  withval="$with_freetype2"
++if test "${with_freetype2_lib_place+set}" = set; then
++  withval="$with_freetype2_lib_place"
+   freetype2_lib_prefix=$withval
+@@ -2553,6 +2552,4 @@
+ 
+-
+-# Check whether --with-freetype2 or --without-freetype2 was given.
+-if test "${with_freetype2+set}" = set; then
+-  withval="$with_freetype2"
++if test "${with_freetype2_include_place+set}" = set; then
++  withval="$with_freetype2_include_place"
+   freetype2_include_prefix=$withval
+@@ -2670,3 +2667,3 @@
    ac_save_LIBS="$LIBS"
 -LIBS="-lpam -ldl $LIBS"
-+LIBS="-lpam  $LIBS"
++LIBS="-lpam $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2374 "configure"
- #include "confdefs.h"
-@@ -2408,7 +2408,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
+@@ -2710,3 +2707,3 @@
    ac_save_LIBS="$LIBS"
 -LIBS="-lpam_misc -ldl -lpam $LIBS"
 +LIBS="-lpam_misc -lpam $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2414 "configure"
- #include "confdefs.h"
-@@ -2436,10 +2436,10 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -2738,6 +2735,6 @@
    echo "$ac_t""yes" 1>&6
 -  PAM_LIBS="-ldl -lpam -lpam_misc"
 +  PAM_LIBS="-lpam -lpam_misc"
@@ -29,72 +44,13 @@
 -PAM_LIBS="-ldl -lpam"
 +PAM_LIBS="-lpam"
  fi
-  
- else
-@@ -2657,7 +2657,7 @@
- 
- CC=$_save_cc
+@@ -2978,3 +2975,3 @@
  
--LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
-+LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
+-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
- echo "configure:2663: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
- ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
-@@ -2979,7 +2979,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -3337,3 +3334,3 @@
    echo "$ac_t""yes" 1>&6
 -  rpm_libs=-lbz2
 +  rpm_libs="-lrpm -lbz2"
  else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -3019,7 +3019,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  rpm_libs=-lbz2
-+  rpm_libs="-lrpm -lbz2"
- 			cat >> confdefs.h <<\EOF
- #define bzread BZ2_bzread
- EOF
-@@ -3109,24 +3109,24 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for rpmRunTransactions in -lrpm""... $ac_c" 1>&6
--echo "configure:3114: checking for rpmRunTransactions in -lrpm" >&5
--ac_lib_var=`echo rpm'_'rpmRunTransactions | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for rpmReadPackageInfo in -lrpm""... $ac_c" 1>&6
-+echo "configure:3114: checking for rpmReadPackageInfo in -lrpm" >&5
-+ac_lib_var=`echo rpm'_'rpmReadPackageInfo | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lrpm -lz $rpm_libs -ldb $LIBS"
-+LIBS="-lrpm -lz $rpm_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3122 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char rpmRunTransactions();
-+char rpmReadPackageInfo();
- 
- int main() {
--rpmRunTransactions()
-+rpmReadPackageInfo()
- ; return 0; }
- EOF
- if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -3156,7 +3156,7 @@
- #define HAVE_RPM 1
- EOF
- 
--  RPM_LIBS="-lrpm -lz $rpm_libs -ldb"
-+  RPM_LIBS="-lrpm -lz $rpm_libs"
- fi
- 
- 
diff --git a/x11-fm/nautilus2/files/patch-ac b/x11-fm/nautilus2/files/patch-ac
index 708c7d4175cd..ab6106eec066 100644
--- a/x11-fm/nautilus2/files/patch-ac
+++ b/x11-fm/nautilus2/files/patch-ac
@@ -1,152 +1,79 @@
---- libnautilus-extensions/nautilus-volume-monitor.c.orig	Thu Aug  3 17:15:57 2000
-+++ libnautilus-extensions/nautilus-volume-monitor.c	Tue Aug 22 17:45:07 2000
-@@ -22,6 +22,9 @@
-    Authors: Gene Z. Ragan <gzr@eazel.com>
- */
- 
+--- libnautilus-extensions/nautilus-volume-monitor.c.orig	Thu Oct 19 16:51:16 2000
++++ libnautilus-extensions/nautilus-volume-monitor.c	Fri Jan 12 11:05:57 2001
+@@ -60,4 +60,9 @@
+ #else
++#ifdef __FreeBSD__
 +#include <sys/param.h>
 +#include <sys/mount.h>
++#else
+ #include <mntent.h>
+ #endif
++#endif
+ 
+@@ -935,2 +940,40 @@
+ 
++#ifdef __FreeBSD__
++static void
++fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent)
++{
++	NautilusVolume *volume;
++	gboolean mounted;
++
++	volume = g_new0 (NautilusVolume, 1);
++	volume->fsname = g_strdup(ent->fs_spec);
++	volume->mount_path = g_strdup(ent->fs_file);
++
++	mounted = FALSE;
++
++	if (nautilus_str_has_prefix (ent->fs_spec, "/dev/fd")) {
++		mounted = mount_volume_floppy_add (monitor, volume);
++	} else if (strcmp (ent->fs_vfstype, "ufs") == 0) {
++		mounted = mount_volume_ext2_add (volume);
++	} else if (strcmp (ent->fs_vfstype, "nfs") == 0) {
++		mounted = mount_volume_nfs_add (volume);
++	} else if (strcmp (ent->fs_vfstype, "cd9660") == 0) {
++		mounted = mount_volume_iso9660_add (volume);
++	} else if (strcmp (ent->fs_vfstype, "msdos") == 0) {
++		mounted = mount_volume_msdos_add (volume);
++	}
++
++	if (mounted) {
++		volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL;
++		monitor->details->volumes = g_list_append (monitor->details->volumes, volume);
++		mount_volume_add_aliases (monitor, volume->fsname, volume);
++	} else {
++		g_free (volume->fsname);
++		g_free (volume->mount_path);
++		g_free (volume);
++	}
++}
++
++#else
 +
- #include <config.h>
- 
- #include <errno.h>
-@@ -31,7 +34,6 @@
- #include <gnome.h>
- #include <libgnome/gnome-i18n.h>
- #include <libgnomevfs/gnome-vfs.h>
--#include <mntent.h>
- #include <libnautilus-extensions/nautilus-cdrom-extensions.h>
- #include <libnautilus-extensions/nautilus-directory-private.h>
- #include <libnautilus-extensions/nautilus-file-utilities.h>
-@@ -48,6 +50,11 @@
- #include <sys/types.h>
- #include <xmlmemory.h>
- 
-+#undef MOUNT_TYPE_ISO9660
-+#define MOUNT_TYPE_ISO9660	"cd9660"
-+#undef MOUNT_TYPE_EXT2
-+#define MOUNT_TYPE_EXT2		"ufs"		/* really ufs */
-+#define _PATH_MOUNTED		"/etc/fstab"
- 
- /* FIXME: Remove messages when this code is done. */
- #define MESSAGE g_message
-@@ -91,7 +98,7 @@
- 									 DeviceInfo             	*device);
- static void     mount_device_activate_floppy                          	(NautilusVolumeMonitor      	*view,
- 									 DeviceInfo             	*device);
--static gboolean	mntent_is_removable_fs					(struct mntent 	  		*ent);
-+static gboolean	mntent_is_removable_fs					(struct fstab 	  		*ent);
- static void	free_device_info             				(DeviceInfo             	*device,
- 						 	 	 	 NautilusVolumeMonitor      	*monitor);
- static gboolean	add_mount_link_property 				(const char 			*path);
-@@ -197,21 +204,19 @@
- fm_desktop_get_removable_volume_list (void)
- {
- 	GList *list;
--	FILE *mef;
--	struct mntent *ent;
-+	struct fstab *ent;
- 
- 	list = NULL;
- 
--	mef = setmntent (_PATH_FSTAB, "r");
--	g_return_val_if_fail (mef, NULL);
-+	setfsent();
- 
--	while ((ent = getmntent (mef))) {
-+	while ((ent = getfsent ())) {
- 		if (mntent_is_removable_fs (ent)) {
--			list = g_list_append (list, g_strdup (ent->mnt_dir));
-+			list = g_list_append (list, g_strdup (ent->fs_file));
- 			continue;
- 		}
- 	}
--  	endmntent (mef);
-+  	endfsent ();
- 
- 	/* Move all floppy mounts to top of list */
- 	list = g_list_sort (list, (GCompareFunc) floppy_sort);
-@@ -754,7 +759,7 @@
- 
- 
  static void
--add_mount_device (NautilusVolumeMonitor *monitor, struct mntent *ent)
-+add_mount_device (NautilusVolumeMonitor *monitor, struct fstab *ent)
- {
- 	DeviceInfo *newdev = NULL;
- 	gboolean mounted;
-@@ -762,23 +767,23 @@
- 	newdev = g_new0 (DeviceInfo, 1);
- 	g_assert (newdev);
- 	newdev->device_fd   = -1;
--	newdev->fsname 	    = g_strdup (ent->mnt_fsname);
--	newdev->mount_path  = g_strdup (ent->mnt_dir);
-+	newdev->fsname 	    = g_strdup (ent->fs_spec);
-+	newdev->mount_path  = g_strdup (ent->fs_file);
- 	newdev->volume_name = NULL;
- 	newdev->link_uri    = NULL;
- 	newdev->state 	    = STATE_EMPTY;
- 
+@@ -946,3 +989,3 @@
  	mounted = FALSE;
- 	
--	if (strcmp (ent->mnt_type, MOUNT_TYPE_ISO9660) == 0) {		
-+	if (strcmp (ent->fs_type, MOUNT_TYPE_ISO9660) == 0) {		
-     		mounted = mount_device_iso9660_add (monitor, newdev); 
--	} else if (strncmp (ent->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0) {		
-+	} else if (strncmp (ent->fs_file, "/dev/fd", strlen("/dev/fd")) == 0) {		
- 		mounted = mount_device_floppy_add (monitor, newdev);
--	} else if (strcmp (ent->mnt_type, MOUNT_TYPE_EXT2) == 0) {		
-+	} else if (strcmp (ent->fs_type, MOUNT_TYPE_EXT2) == 0) {		
- 		mounted = mount_device_ext2_add (newdev);
- 	} else {
- 		/* FIXME: Is this a reasonable way to report this error? */
--		MESSAGE ("Unknown file system: %s", ent->mnt_type);
-+		MESSAGE ("Unknown file system: %s", ent->fs_type);
- 	}
- 	
- 	if (mounted) {
-@@ -794,13 +799,13 @@
+-	
++
+ 	if (nautilus_str_has_prefix (ent->mnt_fsname, FLOPPY_DEVICE_PATH_PREFIX)) {		
+@@ -993,2 +1036,3 @@
  }
- 
- static gboolean
--mntent_is_removable_fs (struct mntent *ent)
-+mntent_is_removable_fs (struct fstab *ent)
- {
--	if (strcmp (ent->mnt_type, MOUNT_TYPE_ISO9660) == 0) {
-+	if (strcmp (ent->fs_type, MOUNT_TYPE_ISO9660) == 0) {
- 		return TRUE;
- 	}
- 	
--	if (strncmp (ent->mnt_fsname, "/dev/fd", strlen("/dev/fd")) == 0) {
-+	if (strncmp (ent->fs_file, "/dev/fd", strlen("/dev/fd")) == 0) {
- 		return TRUE;
- 	}
- 	
-@@ -833,14 +838,12 @@
- void
- nautilus_volume_monitor_find_mount_devices (NautilusVolumeMonitor *monitor)
++#endif /* __FreeBSD__ */
+ #endif /* HAVE_SYS_MNTTAB_H */
+@@ -1021,2 +1065,11 @@
  {
--	FILE *mef;
--	struct mntent *ent;
++#ifdef __FreeBSD__
 +	struct fstab *ent;
- 
--	mef = setmntent (_PATH_MNTTAB, "r");
--	g_return_if_fail (mef);
++
 +	setfsent ();
- 
--	while ((ent = getmntent (mef))) {
--		MESSAGE ("Checking device %s", ent->mnt_fsname);
-+	while ((ent = getfsent ())) {
-+		MESSAGE ("Checking device %s", ent->fs_spec);
- 
- #if 0
- 		/* Think some more about these checks */
-@@ -859,7 +862,7 @@
- 	}
- 
- 
--  	endmntent (mef);
-+  	endfsent ();
- 
- 	g_list_foreach (monitor->details->devices, (GFunc) mount_device_set_state, monitor);
++	while ((ent = getfsent ())) 
++		fstab_add_mount_volume (monitor, ent);
++	endfsent ();
++#else
++
+ 	FILE *mef;
+@@ -1055,2 +1108,4 @@
+ #endif
++
++#endif	/* __FreeBSD__ */
  
diff --git a/x11-fm/nautilus2/files/patch-ad b/x11-fm/nautilus2/files/patch-ad
index 5f1fee5478fb..bc6672a0e58b 100644
--- a/x11-fm/nautilus2/files/patch-ad
+++ b/x11-fm/nautilus2/files/patch-ad
@@ -1,30 +1,31 @@
---- components/rpmview/nautilus-rpm-view.c.orig	Mon Aug  7 18:31:00 2000
-+++ components/rpmview/nautilus-rpm-view.c	Tue Aug 22 18:21:25 2000
-@@ -52,6 +52,10 @@
- #include <libgnorba/gnorba.h>
- #include <limits.h>
+--- components/rpmview/nautilus-rpm-view.c.orig	Tue Oct  3 01:33:39 2000
++++ components/rpmview/nautilus-rpm-view.c	Fri Jan 12 10:04:04 2001
+@@ -57,2 +57,8 @@
  
-+#define FD_t		int
-+#define	fdOpen		open
-+#define	fdClose		close
++#ifdef __FreeBSD__
++#define	FD_t	int
++#define	fdOpen	open
++#define	fdClose	close
++#endif
 +
  #ifdef EAZEL_SERVICES
- #include <libeazelinstall.h>
- #include "nautilus-rpm-view-install.h"
-@@ -399,7 +403,6 @@
- 	gint result = 0;
- 	gchar *version_ptr, *release_ptr;
+@@ -483,4 +489,5 @@
  	
-- 	rpmReadConfigFiles (NULL, NULL);   
+-	
++#ifndef __FreeBSD__	
+  	rpmReadConfigFiles (NULL, NULL);   
++#endif
      	rpm_result = rpmdbOpen ("", &rpm_db, O_RDONLY, 0644);
- 	if (rpm_result != 0) {
- 		g_message ("couldn't open package database: %d", rpm_result);
-@@ -467,7 +470,7 @@
- 	
- 	file_descriptor = fdOpen (path_name, O_RDONLY, 0644);
- 	 
--	if (file_descriptor != NULL) {
-+	if (file_descriptor != -1) {
-                 
+@@ -571,4 +578,10 @@
+ 	g_free (path_name);
+-	
+-	if (file_descriptor != NULL) {    
++
++	if (file_descriptor !=
++#ifdef __FreeBSD_
++	if (file_descriptor != -1)
++#else
++	if (file_descriptor != NULL)
++#endif
++	{
  		/* read out the appropriate fields, and set them up in the view */
- 		result = rpmReadPackageInfo (file_descriptor, &signature, &header_info);
diff --git a/x11-fm/nautilus2/files/patch-ae b/x11-fm/nautilus2/files/patch-ae
deleted file mode 100644
index 5feacc5b592c..000000000000
--- a/x11-fm/nautilus2/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/file-manager/fm-desktop-icon-view.c.orig	Thu Aug  3 17:15:58 2000
-+++ src/file-manager/fm-desktop-icon-view.c	Tue Aug 22 18:55:18 2000
-@@ -41,7 +41,6 @@
- #include <libnautilus-extensions/nautilus-link.h>
- #include <libnautilus-extensions/nautilus-volume-monitor.h>
- #include <limits.h>
--#include <mntent.h>
- #include <stddef.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/x11-fm/nautilus2/files/patch-af b/x11-fm/nautilus2/files/patch-af
deleted file mode 100644
index f5c2357db171..000000000000
--- a/x11-fm/nautilus2/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Wed Aug 16 08:29:15 2000
-+++ tools/Makefile.in	Thu Aug 24 10:35:27 2000
-@@ -154,7 +154,7 @@
- 
- NULL = 
- 
--SUBDIRS =  	leak-checker 	$(NULL)
-+SUBDIRS =  	$(NULL)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/x11-fm/nautilus2/files/patch-ag b/x11-fm/nautilus2/files/patch-ag
index b8000d55cb57..d66452a0c070 100644
--- a/x11-fm/nautilus2/files/patch-ag
+++ b/x11-fm/nautilus2/files/patch-ag
@@ -1,13 +1,9 @@
---- src/Makefile.in.orig	Wed Aug 16 08:29:06 2000
-+++ src/Makefile.in	Wed Aug 23 14:53:30 2000
-@@ -573,8 +573,8 @@
- 	$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
- 	@list='run-nautilus'; for p in $$list; do\
- 	  if test -f $(srcdir)/$$p; then \
+--- src/Makefile.in.orig	Tue Nov  7 08:30:29 2000
++++ src/Makefile.in	Fri Jan 12 10:05:21 2001
+@@ -661,4 +661,4 @@
+ 	  if test -f $$p; then \
 -	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
--	    $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
+-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
 +	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
-+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \
++	    $(INSTALL_SCRIPT) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
  	  else :; fi; \
- 	done
- 
diff --git a/x11-fm/nautilus2/files/patch-ah b/x11-fm/nautilus2/files/patch-ah
deleted file mode 100644
index a0bb2bb4685a..000000000000
--- a/x11-fm/nautilus2/files/patch-ah
+++ /dev/null
@@ -1,69 +0,0 @@
---- libnautilus-extensions/nautilus-preferences.c.orig	Wed Jul 12 03:03:32 2000
-+++ libnautilus-extensions/nautilus-preferences.c	Tue Oct  3 11:59:02 2000
-@@ -594,3 +594,3 @@
- 	if (!gconf_is_initialized ()) {
--		GConfError	  *error = NULL;
-+		GError		  *error = NULL;
- 		char		  *argv[] = { "nautilus", NULL };
-@@ -601,5 +601,5 @@
- 			/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
--			g_warning ("GConf init failed:\n  %s", error->str);
-+			g_warning ("GConf init failed:\n  %s", error->message);
- 			
--			gconf_error_destroy (error);
-+			g_error_free (error);
- 			
---- libnautilus-extensions/nautilus-user-level-manager.c.orig	Wed Jul 12 03:03:32 2000
-+++ libnautilus-extensions/nautilus-user-level-manager.c	Tue Oct  3 12:06:04 2000
-@@ -111,3 +111,3 @@
- 	if (!gconf_is_initialized ()) {
--		GConfError	  *error = NULL;
-+		GError		  *error = NULL;
- 		char		  *argv[] = { "nautilus", NULL };
-@@ -118,5 +118,5 @@
- 			/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
--			g_warning ("GConf init failed:\n  %s", error->str);
-+			g_warning ("GConf init failed:\n  %s", error->message);
- 			
--			gconf_error_destroy (error);
-+			g_error_free (error);
- 			
-@@ -245,3 +245,3 @@
- 
--	gconf_value_destroy (value);
-+	gconf_value_free (value);
- }
-@@ -460,3 +460,3 @@
- 	if (value) {
--		gconf_value_destroy (value);
-+		gconf_value_free (value);
- 	}
-@@ -499,5 +499,5 @@
- 		case GCONF_VALUE_STRING:
--			result = (gconf_value_string (value_a)
--				  && gconf_value_string (value_b)
--				  && (strcmp (gconf_value_string (value_a), gconf_value_string (value_b)) == 0));
-+			result = (gconf_value_get_string (value_a)
-+				  && gconf_value_get_string (value_b)
-+				  && (strcmp (gconf_value_get_string (value_a), gconf_value_get_string (value_b)) == 0));
- 			break;
-@@ -505,3 +505,3 @@
- 		case GCONF_VALUE_INT:
--			result = (gconf_value_int (value_a) == gconf_value_int (value_b));
-+			result = (gconf_value_get_int (value_a) == gconf_value_get_int (value_b));
- 			break;
-@@ -509,3 +509,3 @@
- 		case GCONF_VALUE_BOOL:
--			result = (gconf_value_bool (value_a) == gconf_value_bool (value_b));
-+			result = (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b));
- 			break;
-@@ -522,3 +522,3 @@
- 	if (value_a) {
--		gconf_value_destroy (value_a);
-+		gconf_value_free (value_a);
- 	}
-@@ -526,3 +526,3 @@
- 	if (value_b) {
--		gconf_value_destroy (value_b);
-+		gconf_value_free (value_b);
- 	}
diff --git a/x11-fm/nautilus2/files/patch-ai b/x11-fm/nautilus2/files/patch-ai
new file mode 100644
index 000000000000..ffa17f0d6094
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-ai
@@ -0,0 +1,175 @@
+--- libnautilus-adapter/nautilus-adapter-factory.h.orig	Tue Nov  7 08:30:23 2000
++++ libnautilus-adapter/nautilus-adapter-factory.h	Fri Jan 12 11:15:24 2001
+@@ -91,3 +91,3 @@
+ #define Nautilus_ComponentAdapterFactory_unref Bonobo_Unknown_unref
+-#define Nautilus_ComponentAdapterFactory_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_ComponentAdapterFactory_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_View
+--- libnautilus/nautilus-distributed-undo.h.orig	Tue Nov  7 08:30:22 2000
++++ libnautilus/nautilus-distributed-undo.h	Fri Jan 12 11:16:13 2001
+@@ -262,3 +262,3 @@
+ #define Nautilus_Undo_Transaction_unref Bonobo_Unknown_unref
+-#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_Undo_MenuItem
+@@ -279,3 +279,3 @@
+ #define Nautilus_Undo_Manager_unref Bonobo_Unknown_unref
+-#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_Undo_Manager_append(Nautilus_Undo_Manager _obj,
+@@ -290,3 +290,3 @@
+ #define Nautilus_Undo_Context_unref Bonobo_Unknown_unref
+-#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_Undo_Manager
+--- libnautilus/nautilus-view-component.h.orig	Tue Nov  7 08:30:21 2000
++++ libnautilus/nautilus-view-component.h	Fri Jan 12 11:17:01 2001
+@@ -783,3 +783,3 @@
+ #define Nautilus_View_unref Bonobo_Unknown_unref
+-#define Nautilus_View_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_View_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_View_load_location(Nautilus_View _obj,
+@@ -797,3 +797,3 @@
+ #define Nautilus_ViewFrame_unref Bonobo_Unknown_unref
+-#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_ViewFrame_open_location(Nautilus_ViewFrame _obj,
+@@ -831,3 +831,3 @@
+ #define Nautilus_Zoomable_unref Bonobo_Unknown_unref
+-#define Nautilus_Zoomable_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Zoomable_query_interface Bonobo_Unknown_queryInterface
+    CORBA_float Nautilus_Zoomable__get_zoom_level(Nautilus_Zoomable _obj,
+@@ -854,3 +854,3 @@
+ #define Nautilus_ZoomableFrame_unref Bonobo_Unknown_unref
+-#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_queryInterface
+    void
+@@ -864,3 +864,3 @@
+ #define Nautilus_HistoryFrame_unref Bonobo_Unknown_unref
+-#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_queryInterface
+    Nautilus_HistoryList
+--- libnautilus/nautilus-view.c.orig	Thu Oct  5 18:47:43 2000
++++ libnautilus/nautilus-view.c	Fri Jan 12 11:17:28 2001
+@@ -314,3 +314,3 @@
+ 
+-	view_frame = Bonobo_Unknown_query_interface 
++	view_frame = Bonobo_Unknown_queryInterface 
+ 		(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
+--- libnautilus/nautilus-zoomable.c.orig	Thu Sep 14 12:10:16 2000
++++ libnautilus/nautilus-zoomable.c	Fri Jan 12 11:17:58 2001
+@@ -540,3 +540,3 @@
+ 	if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) {
+-		view->details->zoomable_frame = Bonobo_Unknown_query_interface 
++		view->details->zoomable_frame = Bonobo_Unknown_queryInterface 
+ 			(bonobo_control_get_control_frame 
+--- src/nautilus-shell-interface.h.orig	Tue Nov  7 08:30:27 2000
++++ src/nautilus-shell-interface.h	Fri Jan 12 11:18:21 2001
+@@ -93,3 +93,3 @@
+ #define Nautilus_Shell_unref Bonobo_Unknown_unref
+-#define Nautilus_Shell_query_interface Bonobo_Unknown_query_interface
++#define Nautilus_Shell_query_interface Bonobo_Unknown_queryInterface
+    void Nautilus_Shell_open_windows(Nautilus_Shell _obj,
+--- libnautilus/nautilus-undo.c.orig	Thu Oct  5 18:47:43 2000
++++ libnautilus/nautilus-undo.c	Fri Jan 12 11:29:48 2001
+@@ -257,3 +257,3 @@
+ 	if (!CORBA_Object_is_nil (control_frame, &ev)) {
+-		undo_context = Bonobo_Control_query_interface
++		undo_context = Bonobo_Control_queryInterface
+ 			(control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev);
+--- src/nautilus-window.h.orig	Fri Oct  6 19:34:52 2000
++++ src/nautilus-window.h	Fri Jan 12 11:47:43 2001
+@@ -51,3 +51,3 @@
+ typedef struct {
+-        BonoboWinClass parent_spot;
++        BonoboWindowClass parent_spot;
+ } NautilusWindowClass;
+@@ -66,3 +66,3 @@
+ struct NautilusWindow {
+-        BonoboWin parent_object;
++        BonoboWindow parent_object;
+         
+--- src/nautilus-window.c.orig	Mon Nov  6 07:41:55 2000
++++ src/nautilus-window.c	Fri Jan 12 11:51:20 2001
+@@ -127,3 +127,3 @@
+ 				   nautilus_window,
+-				   BONOBO_TYPE_WIN)
++				   BONOBO_TYPE_WINDOW)
+ 
+@@ -343,3 +343,3 @@
+ 	bonobo_ui_container_set_win (window->details->ui_container,
+-				     BONOBO_WIN (window));
++				     BONOBO_WINDOW (window));
+ 
+@@ -422,3 +422,3 @@
+ 	gtk_widget_show (window->content_hbox);
+-	bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
++	bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
+ 	
+@@ -498,4 +498,4 @@
+ 		}
+-		old_name = bonobo_win_get_name (BONOBO_WIN (object));
+-		bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg));
++		old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
++		bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
+ 		/* This hack of using the time when the name first
+@@ -523,3 +523,3 @@
+ 	case ARG_APP_ID:
+-		GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
++		GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
+ 		break;
+--- components/adapter/nautilus-adapter-embed-strategy.c.orig	Mon Oct 23 09:36:53 2000
++++ components/adapter/nautilus-adapter-embed-strategy.c	Fri Jan 12 11:55:01 2001
+@@ -122,3 +122,3 @@
+ 
+-	control = Bonobo_Unknown_query_interface (component,
++	control = Bonobo_Unknown_queryInterface (component,
+ 						  "IDL:Bonobo/Control:1.0", &ev);
+@@ -132,3 +132,3 @@
+ 
+-	embeddable = Bonobo_Unknown_query_interface (component,
++	embeddable = Bonobo_Unknown_queryInterface (component,
+ 						     "IDL:Bonobo/Embeddable:1.0", &ev);
+--- components/adapter/nautilus-adapter-load-strategy.c.orig	Mon Oct  2 23:12:50 2000
++++ components/adapter/nautilus-adapter-load-strategy.c	Fri Jan 12 11:55:47 2001
+@@ -138,3 +138,3 @@
+ 
+-	progressive_data_sink = Bonobo_Unknown_query_interface (component,
++	progressive_data_sink = Bonobo_Unknown_queryInterface (component,
+ 								"IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
+@@ -149,3 +149,3 @@
+ 
+-	persist_stream = Bonobo_Unknown_query_interface (component,
++	persist_stream = Bonobo_Unknown_queryInterface (component,
+ 							 "IDL:Bonobo/PersistStream:1.0", &ev);
+@@ -159,3 +159,3 @@
+ 
+-	persist_file = Bonobo_Unknown_query_interface (component,
++	persist_file = Bonobo_Unknown_queryInterface (component,
+ 						       "IDL:Bonobo/PersistFile:1.0", &ev);
+--- components/adapter/nautilus-adapter-progressive-load-strategy.c.orig	Fri Oct 20 03:45:48 2000
++++ components/adapter/nautilus-adapter-progressive-load-strategy.c	Fri Jan 12 11:56:27 2001
+@@ -210,3 +210,3 @@
+ 	if (result == GNOME_VFS_OK && file_info.valid_fields | GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
+-		Bonobo_ProgressiveDataSink_set_size (strategy->details->progressive_data_sink, 
++		Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink, 
+ 						     (long) file_info.size, &ev);
+@@ -221,3 +221,3 @@
+ 
+-			Bonobo_ProgressiveDataSink_add_data (strategy->details->progressive_data_sink, iobuf, &ev);
++			Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev);
+ 			
+--- components/history/nautilus-history-view.c.orig	Thu Oct  5 18:47:34 2000
++++ components/history/nautilus-history-view.c	Fri Jan 12 11:59:20 2001
+@@ -71,3 +71,3 @@
+ 	CORBA_exception_init (ev);
+-	return Bonobo_Unknown_query_interface 
++	return Bonobo_Unknown_queryInterface 
+ 		(bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
+--- components/image-viewer/nautilus-image-view.c.orig	Mon Oct 23 20:13:27 2000
++++ components/image-viewer/nautilus-image-view.c	Fri Jan 12 12:00:35 2001
+@@ -597,3 +597,3 @@
+ 	g_return_val_if_fail (this != NULL, NULL);
+-	g_return_val_if_fail (this->goad_id != NULL, NULL);
++/*	g_return_val_if_fail (this->goad_id != NULL, NULL);*/
+ 
diff --git a/x11-fm/nautilus2/files/patch-aj b/x11-fm/nautilus2/files/patch-aj
new file mode 100644
index 000000000000..7f5c52a5c307
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-aj
@@ -0,0 +1,10 @@
+--- librsvg/rsvg-ft.c.orig	Sun Oct 22 05:24:29 2000
++++ librsvg/rsvg-ft.c	Fri Jan 12 10:32:10 2001
+@@ -30,3 +30,7 @@
+ 
++#ifdef __FreeBSD__
++#include <freetype2/freetype/freetype.h>
++#else
+ #include <freetype/freetype.h>
++#endif
+ 
diff --git a/x11-fm/nautilus2/files/patch-ak b/x11-fm/nautilus2/files/patch-ak
new file mode 100644
index 000000000000..f5aa84593eaf
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-ak
@@ -0,0 +1,10 @@
+--- 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-al b/x11-fm/nautilus2/files/patch-al
new file mode 100644
index 000000000000..6134eb8abee3
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-al
@@ -0,0 +1,9 @@
+--- helper-scripts/Makefile.in.orig	Fri Jan 12 12:04:47 2001
++++ helper-scripts/Makefile.in	Fri Jan 12 12:24:05 2001
+@@ -267,4 +267,4 @@
+ 	  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; \
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index fb74c3ecd75b..19e6f2c358ed 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -3,26 +3,25 @@ bin/gnome-info2html2
 bin/gnome-man2html2
 bin/hyperbola
 bin/nautilus
+bin/nautilus-adapter
 bin/nautilus-authenticate
 bin/nautilus-clean.sh
 bin/nautilus-content-loser
+bin/nautilus-error-dialog
 bin/nautilus-hardware-view
 bin/nautilus-history-view
+bin/nautilus-image-view
 %%MOZILLA:%%bin/nautilus-mozilla-content-view
 bin/nautilus-music-view
 bin/nautilus-notes
-bin/nautilus-rpm-view
 bin/nautilus-sample-content-view
 bin/nautilus-sidebar-loser
-bin/nautilus-tree-view
-bin/ntl-web-browser
-bin/ntl-web-search
+bin/nautilus-verify-rpm.sh
 bin/run-nautilus
-bin/test-ft
-bin/test-rsvg
 etc/vfs/modules/help-methods.conf
 include/libnautilus/libnautilus.h
 include/libnautilus/nautilus-bonobo-ui.h
+include/libnautilus/nautilus-bonobo-workarounds.h
 include/libnautilus/nautilus-clipboard.h
 include/libnautilus/nautilus-distributed-undo.h
 include/libnautilus/nautilus-undo-private.h
@@ -30,12 +29,80 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view.h
 include/libnautilus/nautilus-zoomable.h
+lib/libnautilus-adapter.so
+lib/libnautilus-adapter.so.0
 lib/libnautilus-extensions.so
 lib/libnautilus-extensions.so.0
+lib/libnautilus-tree-view.so
+lib/libnautilus-tree-view.so.0
 lib/libnautilus.so
 lib/libnautilus.so.0
 lib/vfs/modules/libvfs-help.so
 share/gnome/apps/Applications/nautilus.desktop
+share/gnome/help/fdl/C/fdl.sgml
+share/gnome/help/nautilus/C/ch1-README.png
+share/gnome/help/nautilus/C/ch1-cnn.png
+share/gnome/help/nautilus/C/ch1-complex-search.png
+share/gnome/help/nautilus/C/ch1-connect.png
+share/gnome/help/nautilus/C/ch1-duplicate.png
+share/gnome/help/nautilus/C/ch1-google.png
+share/gnome/help/nautilus/C/ch1-hardware.png
+share/gnome/help/nautilus/C/ch1-history.png
+share/gnome/help/nautilus/C/ch1-home-john.png
+share/gnome/help/nautilus/C/ch1-home.png
+share/gnome/help/nautilus/C/ch1-icon-view-150.png
+share/gnome/help/nautilus/C/ch1-icon-view-demo.png
+share/gnome/help/nautilus/C/ch1-inadequate-permissions.png
+share/gnome/help/nautilus/C/ch1-list-mydoc.png
+share/gnome/help/nautilus/C/ch1-music-control.png
+share/gnome/help/nautilus/C/ch1-nautiluslogo.png
+share/gnome/help/nautilus/C/ch1-new-window.png
+share/gnome/help/nautilus/C/ch1-open-with.png
+share/gnome/help/nautilus/C/ch1-panel.png
+share/gnome/help/nautilus/C/ch1-permissions.png
+share/gnome/help/nautilus/C/ch1-pluck.png
+share/gnome/help/nautilus/C/ch1-samba.png
+share/gnome/help/nautilus/C/ch1-slash.png
+share/gnome/help/nautilus/C/ch1-toolbar.png
+share/gnome/help/nautilus/C/ch1-toshiba.png
+share/gnome/help/nautilus/C/ch1-tree-demo.png
+share/gnome/help/nautilus/C/ch1-tree-doc-1.png
+share/gnome/help/nautilus/C/ch1-tree-doc.png
+share/gnome/help/nautilus/C/ch1-tree-etc.png
+share/gnome/help/nautilus/C/ch1-tree-slash.png
+share/gnome/help/nautilus/C/ch1-view-as.png
+share/gnome/help/nautilus/C/ch1-zoom-control.png
+share/gnome/help/nautilus/C/ch2-colors.png
+share/gnome/help/nautilus/C/ch2-edit-settings-folder.png
+share/gnome/help/nautilus/C/ch2-emblems.png
+share/gnome/help/nautilus/C/ch2-home-john-mydoc.png
+share/gnome/help/nautilus/C/ch2-icon-captions-alone.png
+share/gnome/help/nautilus/C/ch2-icon-captions.png
+share/gnome/help/nautilus/C/ch2-john.png
+share/gnome/help/nautilus/C/ch2-music.png
+share/gnome/help/nautilus/C/ch2-open-with-other.png
+share/gnome/help/nautilus/C/ch2-open-with.png
+share/gnome/help/nautilus/C/ch2-photos-john.png
+share/gnome/help/nautilus/C/ch2-right-click-open-with.png
+share/gnome/help/nautilus/C/ch2-search-settings.png
+share/gnome/help/nautilus/C/ch2-ski-intermediate-menu.png
+share/gnome/help/nautilus/C/ch2-theme-eazel.png
+share/gnome/help/nautilus/C/ch2-view-layout-menu.png
+share/gnome/help/nautilus/C/ch3-account-info.png
+share/gnome/help/nautilus/C/ch3-online-storage.png
+share/gnome/help/nautilus/C/ch3-package-titles.png
+share/gnome/help/nautilus/C/ch3-sign-up.png
+share/gnome/help/nautilus/C/ch3-welcome-screen.png
+share/gnome/help/nautilus/C/chapter-1.sgml
+share/gnome/help/nautilus/C/chapter-2.sgml
+share/gnome/help/nautilus/C/chapter-3.sgml
+share/gnome/help/nautilus/C/install-update.png
+share/gnome/help/nautilus/C/install-user-level.png
+share/gnome/help/nautilus/C/install.sgml
+share/gnome/help/nautilus/C/intro.sgml
+share/gnome/help/nautilus/C/license.html
+share/gnome/help/nautilus/C/model.sgml
+share/gnome/help/nautilus/C/nautilus.sgml
 share/gnome/hyperbola/maps/pages.map
 share/gnome/nautilus/backgrounds/.striated.png
 share/gnome/nautilus/backgrounds/50s.png
@@ -78,57 +145,121 @@ share/gnome/nautilus/backgrounds/white_ribs.png
 share/gnome/nautilus/backgrounds/yellow_paper.jpg
 share/gnome/nautilus/browser.xml
 share/gnome/nautilus/emblems/OK.png
-share/gnome/nautilus/emblems/confidential.gif
+share/gnome/nautilus/emblems/certified.png
+share/gnome/nautilus/emblems/cool.png
 share/gnome/nautilus/emblems/distinguished.png
 share/gnome/nautilus/emblems/draft.png
+share/gnome/nautilus/emblems/erase.png
 share/gnome/nautilus/emblems/favorite.png
 share/gnome/nautilus/emblems/important.png
 share/gnome/nautilus/emblems/new.png
 share/gnome/nautilus/emblems/ohno.png
 share/gnome/nautilus/emblems/personal.png
+share/gnome/nautilus/emblems/secret.png
+share/gnome/nautilus/emblems/shared.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/portals.xml
 share/gnome/nautilus/linksets/search_engines.xml
+share/gnome/nautilus/nautilus-extras.placeholder
+share/gnome/nautilus/nautilus-suggested.placeholder
 share/gnome/nautilus/static_bookmarks.xml
 share/gnome/nautilus/top/.nautilus-metafile.xml
-share/gnome/nautilus/top/About.html
 share/gnome/nautilus/top/Computer
 share/gnome/nautilus/top/Services
 share/gnome/oaf/help-contents.oafinfo
 share/gnome/oaf/help-factory.oafinfo
+share/gnome/oaf/nautilus-adapter.oafinfo
 share/gnome/oaf/nautilus-content-loser.oafinfo
 share/gnome/oaf/nautilus-hardware-view.oafinfo
 share/gnome/oaf/nautilus-history-view.oafinfo
+share/gnome/oaf/nautilus-image-view.oafinfo
 %%MOZILLA:%%share/gnome/oaf/nautilus-mozilla-content-view.oafinfo
 share/gnome/oaf/nautilus-music-view.oafinfo
 share/gnome/oaf/nautilus-notes.oafinfo
-share/gnome/oaf/nautilus-rpm-view.oafinfo
 share/gnome/oaf/nautilus-sample-content-view.oafinfo
 share/gnome/oaf/nautilus-sidebar-loser.oafinfo
 share/gnome/oaf/nautilus-tree-view.oafinfo
 share/gnome/oaf/nautilus.oafinfo
-share/gnome/oaf/ntl-web-browser.oafinfo
-share/gnome/oaf/ntl-web-search.oafinfo
-share/gnome/pixmaps/nautilus.png
+share/gnome/pixmaps/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/About_Image.png
+share/gnome/pixmaps/nautilus/CD_drive.png
+share/gnome/pixmaps/nautilus/SearchWeb.png
+share/gnome/pixmaps/nautilus/Services.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-192-aa.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-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-192-aa.png
+share/gnome/pixmaps/nautilus/arlo/i-regular-192.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
@@ -138,10 +269,40 @@ 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/rest.png
 share/gnome/pixmaps/nautilus/arlo/zoom_body.png
 share/gnome/pixmaps/nautilus/audio.png
 share/gnome/pixmaps/nautilus/backgrounds.png
@@ -152,12 +313,16 @@ share/gnome/pixmaps/nautilus/computer.svg
 share/gnome/pixmaps/nautilus/cpu.png
 share/gnome/pixmaps/nautilus/decrement.png
 share/gnome/pixmaps/nautilus/default.xml
+share/gnome/pixmaps/nautilus/druid_header.png
+share/gnome/pixmaps/nautilus/druid_header_stretch.png
+share/gnome/pixmaps/nautilus/druid_sidebar.png
 share/gnome/pixmaps/nautilus/eazel-logo.gif
 share/gnome/pixmaps/nautilus/eazel/Back.png
 share/gnome/pixmaps/nautilus/eazel/Forward.png
 share/gnome/pixmaps/nautilus/eazel/Home.png
 share/gnome/pixmaps/nautilus/eazel/Refresh.png
 share/gnome/pixmaps/nautilus/eazel/Search.png
+share/gnome/pixmaps/nautilus/eazel/SearchWeb.png
 share/gnome/pixmaps/nautilus/eazel/Services.png
 share/gnome/pixmaps/nautilus/eazel/Stop.png
 share/gnome/pixmaps/nautilus/eazel/Up.png
@@ -188,26 +353,13 @@ share/gnome/pixmaps/nautilus/eazel/i-directory-accept.png
 share/gnome/pixmaps/nautilus/eazel/i-directory-accept.xml
 share/gnome/pixmaps/nautilus/eazel/i-directory.png
 share/gnome/pixmaps/nautilus/eazel/i-directory.xml
-share/gnome/pixmaps/nautilus/eazel/i-regular-12-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-12.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-24-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-24.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-36-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-36.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-72-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-72.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-96-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-96.png
-share/gnome/pixmaps/nautilus/eazel/i-regular-aa.png
-share/gnome/pixmaps/nautilus/eazel/i-regular.png
-share/gnome/pixmaps/nautilus/eazel/i-regular.xml
 share/gnome/pixmaps/nautilus/eazel/number_strip.png
 share/gnome/pixmaps/nautilus/eazel/theme_preview.png
 share/gnome/pixmaps/nautilus/eazel/zoom_body.png
 share/gnome/pixmaps/nautilus/emblem-OK.svg
-share/gnome/pixmaps/nautilus/emblem-certified.gif
+share/gnome/pixmaps/nautilus/emblem-certified.svg
 share/gnome/pixmaps/nautilus/emblem-changed.gif
-share/gnome/pixmaps/nautilus/emblem-confidential.gif
+share/gnome/pixmaps/nautilus/emblem-cool.svg
 share/gnome/pixmaps/nautilus/emblem-distinguished.svg
 share/gnome/pixmaps/nautilus/emblem-draft.svg
 share/gnome/pixmaps/nautilus/emblem-encrypted.gif
@@ -216,10 +368,13 @@ share/gnome/pixmaps/nautilus/emblem-generic.png
 share/gnome/pixmaps/nautilus/emblem-important.svg
 share/gnome/pixmaps/nautilus/emblem-new.svg
 share/gnome/pixmaps/nautilus/emblem-noread.svg
-share/gnome/pixmaps/nautilus/emblem-nowrite.png
+share/gnome/pixmaps/nautilus/emblem-nowrite.svg
 share/gnome/pixmaps/nautilus/emblem-ohno.svg
 share/gnome/pixmaps/nautilus/emblem-personal.svg
 share/gnome/pixmaps/nautilus/emblem-remote.gif
+share/gnome/pixmaps/nautilus/emblem-secret.svg
+share/gnome/pixmaps/nautilus/emblem-shared.svg
+share/gnome/pixmaps/nautilus/emblem-special.svg
 share/gnome/pixmaps/nautilus/emblem-symbolic-link.png
 share/gnome/pixmaps/nautilus/emblem-trash.png
 share/gnome/pixmaps/nautilus/emblem-urgent.svg
@@ -247,7 +402,6 @@ share/gnome/pixmaps/nautilus/gnome-audio-midi.png
 share/gnome/pixmaps/nautilus/gnome-audio-ulaw.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-aiff.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-mod.png
-share/gnome/pixmaps/nautilus/gnome-audio-x-mp3.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-pn-realaudio.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-s3m.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-stm.png
@@ -257,7 +411,6 @@ share/gnome/pixmaps/nautilus/gnome-audio-x-xi.png
 share/gnome/pixmaps/nautilus/gnome-audio-x-xm.png
 share/gnome/pixmaps/nautilus/gnome-audio.png
 share/gnome/pixmaps/nautilus/gnome-compressed.png
-share/gnome/pixmaps/nautilus/gnome-core.png
 share/gnome/pixmaps/nautilus/gnome-font-afm.png
 share/gnome/pixmaps/nautilus/gnome-font-ttf.png
 share/gnome/pixmaps/nautilus/gnome-font-x-pcf.png
@@ -302,6 +455,34 @@ share/gnome/pixmaps/nautilus/gnome-textfile.png
 share/gnome/pixmaps/nautilus/gnome-video-mpeg.png
 share/gnome/pixmaps/nautilus/gnome-video-quicktime.png
 share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png
+share/gnome/pixmaps/nautilus/gnome/gnome.xml
+share/gnome/pixmaps/nautilus/gnome/i-directory-12.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-192.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-24.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-36.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-72.png
+share/gnome/pixmaps/nautilus/gnome/i-directory-96.png
+share/gnome/pixmaps/nautilus/gnome/i-directory.png
+share/gnome/pixmaps/nautilus/gnome/i-music.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-12.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-192.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-24.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-36.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-72.png
+share/gnome/pixmaps/nautilus/gnome/i-regular-96.png
+share/gnome/pixmaps/nautilus/gnome/i-regular.png
+share/gnome/pixmaps/nautilus/gnome/theme_preview.png
+share/gnome/pixmaps/nautilus/gnome/throbber/001.png
+share/gnome/pixmaps/nautilus/gnome/throbber/002.png
+share/gnome/pixmaps/nautilus/gnome/throbber/003.png
+share/gnome/pixmaps/nautilus/gnome/throbber/004.png
+share/gnome/pixmaps/nautilus/gnome/throbber/005.png
+share/gnome/pixmaps/nautilus/gnome/throbber/006.png
+share/gnome/pixmaps/nautilus/gnome/throbber/007.png
+share/gnome/pixmaps/nautilus/gnome/throbber/008.png
+share/gnome/pixmaps/nautilus/gnome/throbber/009.png
+share/gnome/pixmaps/nautilus/gnome/throbber/010.png
+share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
 share/gnome/pixmaps/nautilus/hand.svg
 share/gnome/pixmaps/nautilus/home.png
 share/gnome/pixmaps/nautilus/i-blockdev.png
@@ -309,6 +490,7 @@ share/gnome/pixmaps/nautilus/i-bookmark-20.png
 share/gnome/pixmaps/nautilus/i-bookmark-missing-20.png
 share/gnome/pixmaps/nautilus/i-bookmark-missing.png
 share/gnome/pixmaps/nautilus/i-bookmark.png
+share/gnome/pixmaps/nautilus/i-broken-image.png
 share/gnome/pixmaps/nautilus/i-cdrom.png
 share/gnome/pixmaps/nautilus/i-chardev.png
 share/gnome/pixmaps/nautilus/i-core.png
@@ -324,18 +506,31 @@ share/gnome/pixmaps/nautilus/i-directory.png
 share/gnome/pixmaps/nautilus/i-executable.png
 share/gnome/pixmaps/nautilus/i-fifo.png
 share/gnome/pixmaps/nautilus/i-floppy.png
+share/gnome/pixmaps/nautilus/i-harddisk.png
+share/gnome/pixmaps/nautilus/i-music-aa.png
+share/gnome/pixmaps/nautilus/i-music.png
 share/gnome/pixmaps/nautilus/i-nfs.png
 share/gnome/pixmaps/nautilus/i-printer.png
+share/gnome/pixmaps/nautilus/i-regular-12-aa.png
 share/gnome/pixmaps/nautilus/i-regular-12.png
-share/gnome/pixmaps/nautilus/i-regular-192.png
+share/gnome/pixmaps/nautilus/i-regular-24-aa.png
 share/gnome/pixmaps/nautilus/i-regular-24.png
+share/gnome/pixmaps/nautilus/i-regular-36-aa.png
 share/gnome/pixmaps/nautilus/i-regular-36.png
+share/gnome/pixmaps/nautilus/i-regular-72-aa.png
 share/gnome/pixmaps/nautilus/i-regular-72.png
+share/gnome/pixmaps/nautilus/i-regular-96-aa.png
 share/gnome/pixmaps/nautilus/i-regular-96.png
+share/gnome/pixmaps/nautilus/i-regular-aa.png
 share/gnome/pixmaps/nautilus/i-regular.png
+share/gnome/pixmaps/nautilus/i-regular.xml
+share/gnome/pixmaps/nautilus/i-search-72.png
 share/gnome/pixmaps/nautilus/i-sock.png
+share/gnome/pixmaps/nautilus/i-spreadsheet-aa.png
+share/gnome/pixmaps/nautilus/i-spreadsheet.png
 share/gnome/pixmaps/nautilus/i-stalled.png
 share/gnome/pixmaps/nautilus/i-symlink.png
+share/gnome/pixmaps/nautilus/i-web-72.png
 share/gnome/pixmaps/nautilus/i-zipdisk.png
 share/gnome/pixmaps/nautilus/i-zipdisk2.png
 share/gnome/pixmaps/nautilus/increment.png
@@ -343,7 +538,9 @@ share/gnome/pixmaps/nautilus/intermediate-selected.png
 share/gnome/pixmaps/nautilus/intermediate.png
 share/gnome/pixmaps/nautilus/knob.png
 share/gnome/pixmaps/nautilus/leftarrow.png
+share/gnome/pixmaps/nautilus/loading-aa.png
 share/gnome/pixmaps/nautilus/loading.png
+share/gnome/pixmaps/nautilus/manual.png
 share/gnome/pixmaps/nautilus/memory_chip.gif
 share/gnome/pixmaps/nautilus/multi-ok.png
 share/gnome/pixmaps/nautilus/nautilus-logo.png
@@ -354,10 +551,26 @@ share/gnome/pixmaps/nautilus/novice-selected.png
 share/gnome/pixmaps/nautilus/novice.png
 share/gnome/pixmaps/nautilus/rightarrow.png
 share/gnome/pixmaps/nautilus/search.png
-share/gnome/pixmaps/nautilus/tableft.png
-share/gnome/pixmaps/nautilus/tabright.png
+share/gnome/pixmaps/nautilus/services-rpm-72.png
 share/gnome/pixmaps/nautilus/temp-home.png
-share/gnome/pixmaps/nautilus/themes.png
+share/gnome/pixmaps/nautilus/text-selection-frame.png
+share/gnome/pixmaps/nautilus/theme_preview.png
+share/gnome/pixmaps/nautilus/throbber/001.png
+share/gnome/pixmaps/nautilus/throbber/002.png
+share/gnome/pixmaps/nautilus/throbber/003.png
+share/gnome/pixmaps/nautilus/throbber/004.png
+share/gnome/pixmaps/nautilus/throbber/005.png
+share/gnome/pixmaps/nautilus/throbber/006.png
+share/gnome/pixmaps/nautilus/throbber/007.png
+share/gnome/pixmaps/nautilus/throbber/008.png
+share/gnome/pixmaps/nautilus/throbber/009.png
+share/gnome/pixmaps/nautilus/throbber/010.png
+share/gnome/pixmaps/nautilus/throbber/011.png
+share/gnome/pixmaps/nautilus/throbber/012.png
+share/gnome/pixmaps/nautilus/throbber/013.png
+share/gnome/pixmaps/nautilus/throbber/014.png
+share/gnome/pixmaps/nautilus/throbber/015.png
+share/gnome/pixmaps/nautilus/throbber/rest.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.aa.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.png
 share/gnome/pixmaps/nautilus/trash-empty.png
@@ -368,32 +581,81 @@ share/gnome/pixmaps/nautilus/vector/i-directory.svg
 share/gnome/pixmaps/nautilus/vector/i-regular.svg
 share/gnome/pixmaps/nautilus/vector/i-regular.xml
 share/gnome/pixmaps/nautilus/vector/vector.xml
-share/gnome/pixmaps/nautilus/vector/zoom_body.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-24-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-36-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-72-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-96-aa.png
+share/gnome/pixmaps/nautilus/villanova/i-directory-accept-aa.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/websearch/standard.eng
+share/gnome/ui/nautilus-clipboard-ui.xml
+share/gnome/ui/nautilus-content-loser-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
+share/gnome/ui/nautilus-shell-ui.xml
+share/gnome/ui/nautilus-sidebar-loser-ui.xml
+share/locale/ca/LC_MESSAGES/nautilus.mo
 share/locale/da/LC_MESSAGES/nautilus.mo
 share/locale/de/LC_MESSAGES/nautilus.mo
+share/locale/en_GB/LC_MESSAGES/nautilus.mo
 share/locale/fr/LC_MESSAGES/nautilus.mo
+share/locale/ga/LC_MESSAGES/nautilus.mo
 share/locale/gl/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/no/LC_MESSAGES/nautilus.mo
+share/locale/pl/LC_MESSAGES/nautilus.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/sv/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/websearch
+@dirrm share/gnome/pixmaps/nautilus/villanova
 @dirrm share/gnome/pixmaps/nautilus/vector
+@dirrm share/gnome/pixmaps/nautilus/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/eazel
+@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/nautilus/top
 @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/backgrounds
 @dirrm share/gnome/nautilus
 @dirrm share/gnome/hyperbola/maps
 @dirrm share/gnome/hyperbola
+@dirrm share/gnome/help/nautilus/C
+@dirrm share/gnome/help/nautilus
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
 @dirrm include/libnautilus
author	Ade Lovett <ade@FreeBSD.org>	2001-01-12 19:59:39 +0000
committer	Ade Lovett <ade@FreeBSD.org>	2001-01-12 19:59:39 +0000
commit	8d590d9928b801e3fa9dfbd457a954a701a2de9f (patch)
tree	0248b61f6e409b6fcefe5d04976412b55b944392 /x11-fm
parent	8eab677955e80c4559cf3e5a5eb89ed3c72574e6 (diff)
download	ports-8d590d9928b801e3fa9dfbd457a954a701a2de9f.tar.gz ports-8d590d9928b801e3fa9dfbd457a954a701a2de9f.zip