7 files changed, 229 insertions, 251 deletions

diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index 7f494061e6fd..4f01381ab0bb 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,41 +1,61 @@
---- configure.orig	Tue Nov  7 08:28:46 2000
-+++ configure	Fri Jan 12 10:20:32 2001
-@@ -39,5 +39,5 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Jan 31 17:42:11 2001
++++ configure	Wed Jan 31 17:52:50 2001
+@@ -41,9 +41,9 @@
  ac_help="$ac_help
--  --with-freetype2-lib-prefix=PREFIX		freetype2 library path"
+   --enable-eazel-services	Enable support for Eazel services (default is no)"
+ ac_help="$ac_help
+-  --with-freetype2-libraries=PATH		freetype2 library path"
 +  --with-freetype2-lib-place=PREFIX		freetype2 library path"
  ac_help="$ac_help
--  --with-freetype2-include-prefix=PREFIX	freetype2 include path"
+-  --with-freetype2-includes=PATH	freetype2 include path"
 +  --with-freetype2-include-place=PREFIX	freetype2 include path"
  ac_help="$ac_help
-@@ -2545,5 +2545,4 @@
+   --with-freetype2-prefix=PATH		freetype2 installation prefix"
+ ac_help="$ac_help
+@@ -2789,15 +2789,15 @@
+ _found_freetype2="no"
  
--# Check whether --with-freetype2 or --without-freetype2 was given.
--if test "${with_freetype2+set}" = set; then
--  withval="$with_freetype2"
+ # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given.
+-if test "${with_freetype2_libraries+set}" = set; then
+-  withval="$with_freetype2_libraries"
 +if test "${with_freetype2_lib_place+set}" = set; then
 +  withval="$with_freetype2_lib_place"
    freetype2_lib_prefix=$withval
-@@ -2553,6 +2552,4 @@
+ fi
+ 
  
--
--# Check whether --with-freetype2 or --without-freetype2 was given.
--if test "${with_freetype2+set}" = set; then
--  withval="$with_freetype2"
+ # Check whether --with-freetype2-includes or --without-freetype2-includes was given.
+-if test "${with_freetype2_includes+set}" = set; then
+-  withval="$with_freetype2_includes"
 +if test "${with_freetype2_include_place+set}" = set; then
 +  withval="$with_freetype2_include_place"
    freetype2_include_prefix=$withval
-@@ -2670,3 +2667,3 @@
+ fi
+ 
+@@ -2927,7 +2927,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
    ac_save_LIBS="$LIBS"
 -LIBS="-lpam -ldl $LIBS"
 +LIBS="-lpam $LIBS"
  cat > conftest.$ac_ext <<EOF
-@@ -2710,3 +2707,3 @@
+ #line 2933 "configure"
+ #include "confdefs.h"
+@@ -2967,7 +2967,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
    ac_save_LIBS="$LIBS"
 -LIBS="-lpam_misc -ldl -lpam $LIBS"
 +LIBS="-lpam_misc -lpam $LIBS"
  cat > conftest.$ac_ext <<EOF
-@@ -2738,6 +2735,6 @@
+ #line 2973 "configure"
+ #include "confdefs.h"
+@@ -2995,10 +2995,10 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  PAM_LIBS="-ldl -lpam -lpam_misc"
 +  PAM_LIBS="-lpam -lpam_misc"
@@ -44,13 +64,23 @@
 -PAM_LIBS="-ldl -lpam"
 +PAM_LIBS="-lpam"
  fi
-@@ -2978,3 +2975,3 @@
+  
+ else
+@@ -3235,7 +3235,7 @@
+ 
+ CC="$_save_cc"
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
-@@ -3337,3 +3334,3 @@
+ echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
+ ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
+@@ -3598,7 +3598,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"
  else
+   echo "$ac_t""no" 1>&6
+ fi
diff --git a/x11-fm/nautilus/files/patch-ac b/x11-fm/nautilus/files/patch-ac
index ab6106eec066..632cbbc8420a 100644
--- a/x11-fm/nautilus/files/patch-ac
+++ b/x11-fm/nautilus/files/patch-ac
@@ -1,17 +1,147 @@
---- 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
+
+$FreeBSD$
+
+--- libnautilus-extensions/nautilus-volume-monitor.c.orig	Tue Jan 16 03:31:56 2001
++++ libnautilus-extensions/nautilus-volume-monitor.c	Wed Jan 31 21:29:21 2001
+@@ -60,7 +60,13 @@
+ #include <fstab.h>
+ #endif
+ 
 +#ifdef __FreeBSD__
 +#include <sys/param.h>
++#include <sys/ucred.h>
 +#include <sys/mount.h>
 +#else
  #include <mntent.h>
++#endif
+ 
+ #ifdef MOUNT_AUDIO_CD
+ 
+@@ -264,16 +270,25 @@
+ GList *
+ nautilus_volume_monitor_get_removable_volumes (NautilusVolumeMonitor *monitor)
+ {
++#ifndef __FreeBSD__
+ 	FILE *file;
+-	GList *volumes;
+ 	struct mntent *ent;
++#else
++	struct fstab *ent;
++#endif
++	GList *volumes;
+ 	NautilusVolume *volume;
+ 	
+ 	volumes = NULL;
+ 	
++#ifndef __FreeBSD__
+ 	file = setmntent (_PATH_MNTTAB, "r");
+ 	g_return_val_if_fail (file != NULL, NULL);
++#else
++	setfsent();
++#endif
+ 	
++#ifndef __FreeBSD__
+ 	while ((ent = getmntent (file)) != NULL) {
+ 		/* Use noauto as our way of determining a removable volume */
+ 		if (strstr (ent->mnt_opts, MNTOPT_NOAUTO) != NULL) {
+@@ -281,6 +296,15 @@
+ 			volume->device_path = g_strdup (ent->mnt_fsname);
+ 			volume->mount_path = g_strdup (ent->mnt_dir);
+ 			volume->filesystem = g_strdup (ent->mnt_type);
++#else /* FreeBSD, probably ;) */
++	while ((ent = getfsent ()) != NULL) {
++		/* Use noauto as our way of determining a removable volume */
++		if (strstr (ent->fs_mntops, "noauto") != NULL) {
++			volume = g_new0 (NautilusVolume, 1);
++			volume->device_path = g_strdup (ent->fs_spec);
++			volume->mount_path = g_strdup (ent->fs_file);
++			volume->filesystem = g_strdup (ent->fs_vfstype);
++#endif
+ 			if (mount_volume_add_filesystem (volume)) {
+ 				mount_volume_get_name (volume);
+ 				volumes = g_list_append (volumes, volume);
+@@ -290,7 +314,11 @@
+ 		}	
+ 	}
+ 			
++#ifndef __FreeBSD__
+ 	fclose (file);
++#else
++	endfsent();
++#endif
+ 	
+ #ifdef MOUNT_AUDIO_CD
+ 	volume = g_new0 (NautilusVolume, 1);
+@@ -682,15 +710,27 @@
+ {
+ 	GList *current_mounts = NULL;
+ 	NautilusVolume *volume = NULL;
++#ifndef __FreeBSD__
+ 	FILE *fh;
+ 	char line[PATH_MAX * 3];
+ 	char device_name[sizeof (line)];
+ 	NautilusStringList *list;
++#else
++	struct statfs *mounted;
++	int mounted_num;
++	int i;
++#endif
+ 
++#ifndef __FreeBSD__
+ 	/* Open /proc/mounts */
+ 	fh = fopen (PATH_PROC_MOUNTS, "r");
+ 	g_return_val_if_fail (fh != NULL, NULL);
++#else
++	mounted_num = getmntinfo(&mounted, MNT_WAIT);
++	g_return_val_if_fail (mounted_num > 0, NULL);
++#endif
+ 
++#ifndef __FreeBSD__
+ 	while (fgets (line, sizeof(line), fh)) {
+ 		if (sscanf (line, "%s", device_name) == 1) {
+ 				list = nautilus_string_list_new_from_tokens (line, " ", FALSE);
+@@ -702,17 +742,25 @@
+ 					volume->device_path = nautilus_string_list_nth (list, 0);
+ 					volume->mount_path = nautilus_string_list_nth (list, 1);
+ 					volume->filesystem = nautilus_string_list_nth (list, 2);
+-
++#else
++	for (i = 0; i < mounted_num; i++) {
++		volume = g_new0 (NautilusVolume, 1);
++		volume->device_path = g_strdup(mounted[i].f_mntfromname);
++		volume->mount_path = g_strdup(mounted[i].f_mntonname);
++		volume->filesystem = g_strdup(mounted[i].f_fstypename);
++#endif /* __FreeBSD__ */
+ 					if (mount_volume_add_filesystem (volume)) {
+ 						mount_volume_get_name (volume);
+ 						current_mounts = g_list_append (current_mounts, volume);
+ 					} else {
+ 						nautilus_volume_monitor_free_volume (volume);
+ 					}					
++#ifndef __FreeBSD__
+ 				}				
+ 				nautilus_string_list_free (list);
+ 			}			
+ 		}
++#endif
+   	}
+ 
+ #ifdef MOUNT_AUDIO_CD
+@@ -728,7 +776,9 @@
+ 	}
  #endif
+ 
++#ifndef __FreeBSD__
+ 	fclose (fh);
 +#endif
+ 	
+ 	return current_mounts;
  
-@@ -935,2 +940,40 @@
+@@ -889,6 +939,45 @@
+ 	return TRUE;
+ }
  
++#ifdef 0
 +#ifdef __FreeBSD__
 +static void
 +fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent)
@@ -20,7 +150,7 @@
 +	gboolean mounted;
 +
 +	volume = g_new0 (NautilusVolume, 1);
-+	volume->fsname = g_strdup(ent->fs_spec);
++	volume->device_path = g_strdup(ent->fs_spec);
 +	volume->mount_path = g_strdup(ent->fs_file);
 +
 +	mounted = FALSE;
@@ -40,28 +170,23 @@
 +	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);
++		mount_volume_add_aliases (monitor, volume->device_path, volume);
 +	} else {
-+		g_free (volume->fsname);
++		g_free (volume->device_path);
 +		g_free (volume->mount_path);
 +		g_free (volume);
 +	}
 +}
-+
-+#else
++#endif
++#endif
 +
  static void
-@@ -946,3 +989,3 @@
- 	mounted = FALSE;
--	
-+
- 	if (nautilus_str_has_prefix (ent->mnt_fsname, FLOPPY_DEVICE_PATH_PREFIX)) {		
-@@ -993,2 +1036,3 @@
- }
-+#endif /* __FreeBSD__ */
- #endif /* HAVE_SYS_MNTTAB_H */
-@@ -1021,2 +1065,11 @@
+ cdrom_ioctl_get_info (int fd)
  {
+@@ -1025,6 +1114,14 @@
+ 			break;
+ 		}
+ 	}
 +#ifdef __FreeBSD__
 +	struct fstab *ent;
 +
@@ -69,11 +194,7 @@
 +	while ((ent = getfsent ())) 
 +		fstab_add_mount_volume (monitor, ent);
 +	endfsent ();
-+#else
-+
- 	FILE *mef;
-@@ -1055,2 +1108,4 @@
- #endif
-+
 +#endif	/* __FreeBSD__ */
+ }
+ #endif
  
diff --git a/x11-fm/nautilus/files/patch-ad b/x11-fm/nautilus/files/patch-ad
deleted file mode 100644
index bc6672a0e58b..000000000000
--- a/x11-fm/nautilus/files/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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 @@
- 
-+#ifdef __FreeBSD__
-+#define	FD_t	int
-+#define	fdOpen	open
-+#define	fdClose	close
-+#endif
-+
- #ifdef EAZEL_SERVICES
-@@ -483,4 +489,5 @@
- 	
--	
-+#ifndef __FreeBSD__	
-  	rpmReadConfigFiles (NULL, NULL);   
-+#endif
-     	rpm_result = rpmdbOpen ("", &rpm_db, O_RDONLY, 0644);
-@@ -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 */
diff --git a/x11-fm/nautilus/files/patch-ai b/x11-fm/nautilus/files/patch-ai
deleted file mode 100644
index ffa17f0d6094..000000000000
--- a/x11-fm/nautilus/files/patch-ai
+++ /dev/null
@@ -1,175 +0,0 @@
---- 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-xml-i18n-extract b/x11-fm/nautilus/files/patch-xml-i18n-extract
new file mode 100644
index 000000000000..a21354cc11b4
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-xml-i18n-extract
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- xml-i18n-extract	2001/01/31 17:44:52	1.1
++++ xml-i18n-extract	2001/01/31 17:45:08
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w 
++#!/usr/bin/perl -w 
+ # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 2  -*-
+ 
+ #
diff --git a/x11-fm/nautilus/files/patch-xml-i18n-merge b/x11-fm/nautilus/files/patch-xml-i18n-merge
new file mode 100644
index 000000000000..137e5978ddfd
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-xml-i18n-merge
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- xml-i18n-merge	2001/01/31 17:44:52	1.1
++++ xml-i18n-merge	2001/01/31 17:45:16
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ #
+ #  The XML Translation Merge Tool
diff --git a/x11-fm/nautilus/files/patch-xml-i18n-update b/x11-fm/nautilus/files/patch-xml-i18n-update
new file mode 100644
index 000000000000..abdebb38482b
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-xml-i18n-update
@@ -0,0 +1,11 @@
+
+$FreeBSD$
+
+--- xml-i18n-update	2001/01/31 17:44:52	1.1
++++ xml-i18n-update	2001/01/31 17:45:22
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ #  The GNOME Translation Update Tool 
+ #