aboutsummaryrefslogtreecommitdiff
path: root/x11-fm
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-04-05 03:11:39 +0000
commitc4851e78e4f63338fe9a4883e5b7a0370dce27f7 (patch)
tree3910aa2e83f782cec94f15b4547dadb741cd29ce /x11-fm
parentf82c84522b047dd99c6f9d85ce3e07217ccce7df (diff)
downloadports-c4851e78e4f63338fe9a4883e5b7a0370dce27f7.tar.gz
ports-c4851e78e4f63338fe9a4883e5b7a0370dce27f7.zip
Notes
Diffstat (limited to 'x11-fm')
-rw-r--r--x11-fm/nautilus2/Makefile11
-rw-r--r--x11-fm/nautilus2/distinfo4
-rw-r--r--x11-fm/nautilus2/files/patch-Makefile.in21
-rw-r--r--x11-fm/nautilus2/files/patch-aa42
-rw-r--r--x11-fm/nautilus2/files/patch-libbackground_Makefile.in22
-rw-r--r--x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c317
-rw-r--r--x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml31
-rw-r--r--x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c13
-rw-r--r--x11-fm/nautilus2/files/patch-ltmain.sh30
-rw-r--r--x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c6
-rw-r--r--x11-fm/nautilus2/pkg-descr7
-rw-r--r--x11-fm/nautilus2/pkg-plist42
12 files changed, 95 insertions, 451 deletions
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index e5020971b94c..f6f29a74ef9e 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,30 +6,29 @@
#
PORTNAME= nautilus2
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
PORTREVISION= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
DIST_SUBDIR= gnome2
DISTNAME= nautilus-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME file manager and graphical shell developed by Eazel
-BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
-
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix intlhack gnomehack gnomehier gnomedesktop eel2 \
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \
librsvg2
GNOME_DESKTOP_VERSION=2
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
- LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
+ LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \
--with-freetype2-include-place=${LOCALBASE}/include/freetype2 \
--enable-static
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index f10149ba9a94..85da654bc7e2 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.4.2.tar.bz2) = 2023d525f1d81b6752ce7b118728b19c
-SIZE (gnome2/nautilus-2.4.2.tar.bz2) = 5687876
+MD5 (gnome2/nautilus-2.6.0.tar.bz2) = a8baee6e907d36fd19f4082d6cfd3a9e
+SIZE (gnome2/nautilus-2.6.0.tar.bz2) = 5502083
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index 7fe0bcd6e288..54984be63e96 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig Tue Jan 7 12:28:34 2003
-+++ Makefile.in Tue Jan 7 12:29:48 2003
-@@ -153,7 +153,6 @@
- libnautilus-private \
- libnautilus-adapter \
- src \
-- test \
- components \
- po \
- data \
+--- Makefile.in.orig Fri Jan 30 16:22:10 2004
++++ Makefile.in Fri Jan 30 16:41:37 2004
+@@ -176,7 +176,7 @@
+ DESKTOP_SETTINGS_FILES = nautilus-file-management-properties.desktop
+
+
+-SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL)
++SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL)
+
+
+ EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_APPLICATIONS_FILES) $(DESKTOP_SETTINGS_FILES) $(NULL)
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 3881dec5e6a5..d4741108d1e0 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sat Jun 28 00:42:27 2003
-+++ configure Sat Jun 28 00:44:45 2003
-@@ -12860,7 +12860,7 @@
+--- configure.orig Mon Nov 10 22:08:05 2003
++++ configure Mon Nov 10 22:08:05 2003
+@@ -12971,7 +12971,7 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
@@ -9,7 +9,7 @@
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-@@ -12868,7 +12868,7 @@
+@@ -12979,7 +12979,7 @@
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
@@ -18,7 +18,7 @@
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -13849,7 +13849,7 @@
+@@ -13959,7 +13959,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
@@ -27,35 +27,3 @@
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
s,@USE_NLS@,$USE_NLS,;t t
s,@MSGFMT@,$MSGFMT,;t t
-@@ -13901,26 +13901,26 @@
- s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
- s,@HAVE_JW@,$HAVE_JW,;t t
- s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
--s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t
-+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
- s,@LIBJPEG@,$LIBJPEG,;t t
- s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
- s,@GSEQUENCE_CFLAGS@,$GSEQUENCE_CFLAGS,;t t
- s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
- s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
--s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
-+s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t
- s,@LIBNAUTILUS_IDL_INCLUDES@,$LIBNAUTILUS_IDL_INCLUDES,;t t
- s,@CORE_CFLAGS@,$CORE_CFLAGS,;t t
--s,@CORE_LIBS@,$CORE_LIBS,;t t
-+s~@CORE_LIBS@~$CORE_LIBS~;t t
- s,@CORE_IDL_INCLUDES@,$CORE_IDL_INCLUDES,;t t
- s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t
--s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t
-+s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t
- s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t
- s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t
- s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
- s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t
- s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t
- s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t
--s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t
-+s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t
- s,@GCONFTOOL@,$GCONFTOOL,;t t
- s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
- s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
index 835db34742aa..e60d29e99b67 100644
--- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
+++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
@@ -1,11 +1,11 @@
---- libbackground/Makefile.in.orig Tue Jan 7 12:30:18 2003
-+++ libbackground/Makefile.in Tue Jan 7 12:30:58 2003
-@@ -141,7 +141,7 @@
-
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-+ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \
- -DG_LOG_DOMAIN=\"capplet-common\" \
- -I$(top_srcdir)/ \
- @CAPPLET_CFLAGS@
+--- libbackground/Makefile.in.orig Fri Jan 30 16:42:13 2004
++++ libbackground/Makefile.in Fri Jan 30 16:43:02 2004
+@@ -168,7 +168,7 @@
+
+ EXTRA_DIST = ChangeLog
+
+-INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@
++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@
+
+
+ noinst_LTLIBRARIES = libbackground.la
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
deleted file mode 100644
index 62ef3a83acd5..000000000000
--- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
+++ /dev/null
@@ -1,317 +0,0 @@
---- libnautilus-private/nautilus-volume-monitor.c.orig Mon Jul 7 07:05:04 2003
-+++ libnautilus-private/nautilus-volume-monitor.c Thu Oct 2 22:59:30 2003
-@@ -60,6 +60,16 @@
- #include <sys/types.h>
- #include <unistd.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+#define HAVE_SETFSENT
-+#define FREEBSD_MNT
-+#define setmntent(f,m) setfsent()
-+#endif
-+
- #ifdef HAVE_SYS_VFSTAB_H
- #include <sys/vfstab.h>
- #elif HAVE_FSTAB_H
-@@ -121,7 +131,7 @@
- #define MNTOPT_RO "ro"
- #endif
-
--#ifndef HAVE_SETMNTENT
-+#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT)
- #define setmntent(f,m) fopen(f,m)
- #endif
- #ifndef HAVE_ENDMNTENT
-@@ -585,6 +595,9 @@
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#ifdef __FreeBSD__
-+ struct fstab *fsent;
-+#endif
- #ifdef HAVE_HASMNTOPT
- /* Use "owner" or "user" or "users" as our way of determining a removable volume */
- if (hasmntopt (ent, "user") != NULL
-@@ -594,6 +607,12 @@
- return TRUE;
- }
- #endif
-+#ifdef __FreeBSD__
-+ fsent = getfsspec(ent->f_mntfromname);
-+ if (fsent != NULL && strstr (fsent->fs_mntops, "noauto")) {
-+ return TRUE;
-+ }
-+#endif
-
- #ifdef SOLARIS_MNT
- if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
-@@ -733,10 +752,15 @@
- static GList *
- get_removable_volumes (NautilusVolumeMonitor *monitor)
- {
-+#ifndef HAVE_SETFSENT
- FILE *file;
-- GList *volumes;
-- MountTableEntry *ent;
-- NautilusVolume *volume;
-+#else
-+ int file;
-+ struct fstab *fsent;
-+#endif
-+ GList *volumes = NULL;
-+ MountTableEntry *ent = NULL;
-+ NautilusVolume *volume = NULL;
- char * fs_opt;
- #if defined(HAVE_SYS_MNTTAB_H) || defined(AIX_MNT)
- MountTableEntry ent_storage;
-@@ -744,26 +768,27 @@
- #ifdef HAVE_GETMNTINFO
- int count, index;
- #endif
-- ent = NULL;
-- volume = NULL;
-- volumes = NULL;
-
- #ifdef HAVE_GETMNTINFO
- count = getmntinfo (&ent, MNT_WAIT);
- /* getmentinfo returns a pointer to static data. Do not free. */
- for (index = 0; index < count; index++) {
-- if (has_removable_mntent_options (&ent[index])) {
-+ if (has_removable_mntent_options (ent + index)) {
- volume = create_volume (ent[index].f_mntfromname,
- ent[index].f_mntonname);
- volume->is_removable = TRUE;
- volumes = finish_creating_volume_and_prepend
-- (monitor, volume, ent[index].f_fstypename, volumes);
-+ (monitor, volume, ent[index].f_fstypename, volumes);
- }
- }
- #endif
-
- file = setmntent (MOUNT_TABLE_PATH, "r");
-+#ifndef HAVE_SETFSENT
- if (file == NULL) {
-+#else
-+ if (file == 0) {
-+#endif
- return NULL;
- }
-
-@@ -808,9 +833,21 @@
- (monitor, volume, ent->mnt_type, volumes);
- }
- }
-+#elif defined (HAVE_SETFSENT)
-+ while ((fsent = getfsent ()) != NULL) {
-+ if (strstr (fsent->fs_mntops, "noauto") != NULL) {
-+ volume = create_volume (fsent->fs_spec, fsent->fs_file);
-+ volumes = finish_creating_volume_and_prepend
-+ (monitor, volume, fsent->fs_vfstype, volumes);
-+ }
-+ }
- #endif
--
-+
-+#ifndef HAVE_SETFSENT
- endmntent (file);
-+#else
-+ endfsent();
-+#endif
-
- #ifdef HAVE_CDDA
- volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
-@@ -840,7 +877,7 @@
- return result;
- }
-
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
-
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
-@@ -1152,7 +1189,7 @@
- char *command;
-
- if (path != NULL) {
-- command = g_strdup_printf ("eject %s", path);
-+ command = g_strdup_printf ("/usr/sbin/cdcontrol -f %s eject", path);
- eel_gnome_shell_execute (command);
- g_free (command);
- }
-@@ -1309,23 +1346,34 @@
- return volumes;
- }
-
--#elif defined(SOLARIS_MNT)
-+#elif defined(SOLARIS_MNT) || defined(FREEBSD_MNT)
-
- static GList *
- get_mount_list (NautilusVolumeMonitor *monitor)
- {
-- FILE *fh;
- GList *volumes;
-- MountTableEntry ent;
- NautilusVolume *volume;
-+#ifndef HAVE_SETFSENT
-+ MountTableEntry ent;
-+ FILE *fh;
-+#else
-+ MountTableEntry *ent;
-+ int fh, index;
-+#endif
-
- volumes = NULL;
-
-+#ifndef HAVE_SETFSENT
- fh = setmntent (MOUNT_TABLE_PATH, "r");
- if (fh == NULL) {
-+#else
-+ fh = getmntinfo (&ent, MNT_WAIT);
-+ if (fh == 0) {
-+#endif
- return NULL;
- }
-
-+#ifndef HAVE_SETFSENT
- while (! getmntent(fh, &ent)) {
- volume = create_volume (ent.mnt_special, ent.mnt_mountp);
- volume->is_removable = has_removable_mntent_options (&ent);
-@@ -1334,6 +1382,16 @@
- }
-
- endmntent (fh);
-+#else
-+ /* getmentinfo returns a pointer to static data. Do not free. */
-+ for (index = 0; index < fh; index++) {
-+ volume = create_volume (ent[index].f_mntfromname,
-+ ent[index].f_mntonname);
-+ volume->is_removable = has_removable_mntent_options (ent + index);
-+ volumes = finish_creating_volume_and_prepend
-+ (monitor, volume, ent[index].f_fstypename, volumes);
-+ }
-+#endif
-
- return volumes;
- }
-@@ -1560,7 +1618,7 @@
- static int
- get_cdrom_type (const char *vol_dev_path, int* fd)
- {
--#ifdef SOLARIS_MNT
-+#if defined(SOLARIS_MNT)
- GString *new_dev_path;
- struct cdrom_tocentry entry;
- struct cdrom_tochdr header;
-@@ -1599,6 +1657,34 @@
- return type;
- #elif defined(AIX_MNT)
- return CDS_NO_INFO;
-+#elif defined(FREEBSD_MNT)
-+ struct ioc_toc_header header;
-+ struct ioc_read_toc_single_entry entry;
-+ int type;
-+
-+ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+ if (*fd < 0) {
-+ return CDS_DATA_1;
-+ }
-+
-+ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
-+ return CDS_DATA_1;
-+ }
-+
-+ type = CDS_DATA_1;
-+ for (entry.track = header.starting_track;
-+ entry.track <= header.ending_track;
-+ entry.track++) {
-+ entry.address_format = CD_LBA_FORMAT;
-+ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
-+ if (entry.entry.control & CDROM_DATA_TRACK) {
-+ type = CDS_AUDIO;
-+ break;
-+ }
-+ }
-+ }
-+
-+ return type;
- #else
- *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
- return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-@@ -2116,7 +2202,7 @@
- for (node = volume_list; node != NULL; node = node->next) {
- volume = node->data;
-
--#if !defined(SOLARIS_MNT) && !defined(AIX_MNT)
-+#if !defined(SOLARIS_MNT) && !defined(AIX_MNT) && !defined(FREEBSD_MNT)
- /* These are set up by get_current_mount_list for Solaris&AIX.*/
- volume->is_removable = volume_is_removable (volume);
- #endif
-@@ -2145,7 +2231,7 @@
- ok = mount_volume_auto_add (volume);
- } else if (strcmp (file_system_type_name, "cdda") == 0) {
- ok = mount_volume_cdda_add (volume);
-- } else if (strcmp (file_system_type_name, "iso9660") == 0) {
-+ } else if (strcmp (file_system_type_name, "cd9660") == 0) {
- ok = mount_volume_iso9660_add (volume);
- } else if (strcmp (file_system_type_name, "nfs") == 0) {
- ok = mount_volume_nfs_add (volume);
-@@ -2180,9 +2266,18 @@
- } else if (eel_str_has_prefix (volume->device_path, "/dev/floppy")) {
- volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
- volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (volume->device_path, "/dev/fd")) {
-+ volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
-+ volume->is_removable = TRUE;
- } else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) {
- volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
- volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (volume->device_path, "/dev/acd")) {
-+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (volume->device_path, "/dev/cd")) {
-+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
-+ volume->is_removable = TRUE;
- } else if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {
- name = volume->mount_path + strlen ("/mnt/");
-
-@@ -2243,7 +2338,36 @@
- } else {
- volume->is_removable = FALSE;
- }
-+ } else if (eel_str_has_prefix (volume->mount_path, "/")) {
-+ name = volume->mount_path + strlen ("/");
-+
-+ if (eel_str_has_prefix (name, "cdrom")
-+ || eel_str_has_prefix (name, "burn")) {
-+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (name, "floppy")) {
-+ volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (name, "zip")) {
-+ volume->device_type = NAUTILUS_DEVICE_ZIP_DRIVE;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (name, "jaz")) {
-+ volume->device_type = NAUTILUS_DEVICE_JAZ_DRIVE;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (name, "camera")) {
-+ volume->device_type = NAUTILUS_DEVICE_CAMERA;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (name, "memstick")
-+ || eel_str_has_prefix (name, "ram")) {
-+ volume->device_type = NAUTILUS_DEVICE_MEMORY_STICK;
-+ volume->is_removable = TRUE;
-+ } else if (eel_str_has_prefix (name, "ipod")) {
-+ volume->device_type = NAUTILUS_DEVICE_APPLE;
-+ volume->is_removable = TRUE;
-+ } else {
-+ volume->is_removable = FALSE;
- }
-+ }
-
- return TRUE;
- }
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml b/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml
deleted file mode 100644
index 81e3a2a71451..000000000000
--- a/x11-fm/nautilus2/files/patch-libnautilus-private_filesystem-attributes.xml
+++ /dev/null
@@ -1,31 +0,0 @@
---- libnautilus-private/filesystem-attributes.xml.orig Sat Sep 14 16:56:38 2002
-+++ libnautilus-private/filesystem-attributes.xml Sat Sep 14 17:01:31 2002
-@@ -3,10 +3,12 @@
- <filesystem name="affs" _default_volume_name="AFFS Volume"/>
- <filesystem name="afs" _default_volume_name="AFS Network Volume"/>
- <filesystem name="auto" _default_volume_name="Auto-detected Volume"/>
-+ <filesystem name="cd9660" _default_volume_name="CDROM Volume"/>
- <filesystem name="cdda" _default_volume_name="CD Digital Audio"/>
- <filesystem name="cdrom" _default_volume_name="CD-ROM Drive"/>
- <filesystem name="devfs" _default_volume_name="Hardware Device Volume"/>
- <filesystem name="ext2" _default_volume_name="Ext2 Linux Volume" trash="yes"/>
-+ <filesystem name="ext2fs" _default_volume_name="Ext2 Linux Volume" trash="yes"/>
- <filesystem name="ext3" _default_volume_name="Ext3 Linux Volume" trash="yes"/>
- <filesystem name="fat" _default_volume_name="MSDOS Volume" trash="yes"/>
- <filesystem name="hfs" _default_volume_name="MacOS Volume" trash="yes"/>
-@@ -15,10 +17,15 @@
- <filesystem name="hsfs" _default_volume_name="Hsfs CDROM Volume"/>
- <filesystem name="jfs" _default_volume_name="JFS Volume" trash="yes"/>
- <filesystem name="hpfs" _default_volume_name="Windows NT Volume"/>
-+ <filesystem name="linprocfs" _default_volume_name="System Volume"/>
-+ <filesystem name="mfs" _default_volume_name="Memory Volume" trash="yes"/>
- <filesystem name="minix" _default_volume_name="Minix Volume"/>
- <filesystem name="msdos" _default_volume_name="MSDOS Volume"/>
- <filesystem name="nfs" _default_volume_name="NFS Network Volume" trash="yes"/>
-+ <filesystem name="ntfs" _default_volume_name="Windows NT Volume"/>
-+ <filesystem name="nwfs" _default_volume_name="Netware Volume"/>
- <filesystem name="proc" _default_volume_name="System Volume"/>
-+ <filesystem name="procfs" _default_volume_name="System Volume"/>
- <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/>
- <filesystem name="smbfs" _default_volume_name="Windows Shared Volume" trash="yes"/>
- <filesystem name="supermount" _default_volume_name="SuperMount Volume" />
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c
new file mode 100644
index 000000000000..62385a0ac826
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-desktop-icon-file.c
@@ -0,0 +1,13 @@
+--- libnautilus-private/nautilus-desktop-icon-file.c.orig Fri Jan 30 16:49:53 2004
++++ libnautilus-private/nautilus-desktop-icon-file.c Fri Jan 30 16:50:52 2004
+@@ -199,6 +199,10 @@
+ file_info->flags = GNOME_VFS_FILE_FLAGS_NONE;
+ file_info->link_count = 1;
+ file_info->size = 0;
++ /* Set a bogus owner and group on these files to prevent nowrite
++ * emblems from showing up on the files. */
++ file_info->uid = -993;
++ file_info->gid = -993;
+ file_info->permissions =
+ GNOME_VFS_PERM_OTHER_WRITE |
+ GNOME_VFS_PERM_USER_READ |
diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh
index 854b2a10a327..3232b8da9655 100644
--- a/x11-fm/nautilus2/files/patch-ltmain.sh
+++ b/x11-fm/nautilus2/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig Sat Feb 8 09:47:44 2003
-+++ ltmain.sh Mon Jun 30 18:31:09 2003
-@@ -1075,7 +1075,7 @@
+--- ltmain.sh.orig Sun Jan 11 17:28:53 2004
++++ ltmain.sh Fri Jan 30 16:45:37 2004
+@@ -1280,7 +1280,7 @@
esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1085,8 +1085,16 @@
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,16 @@
continue
;;
@@ -26,17 +26,17 @@
continue
;;
-@@ -2503,6 +2511,9 @@
- *-*-openbsd* | *-*-freebsd*)
- # Do not include libc due to us having libc/libc_r.
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4330,10 +4341,12 @@
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,12 @@
fi
# Install the pseudo-library for information purposes.
diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
index 5f84cfbe5aee..5246e273c532 100644
--- a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
+++ b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
@@ -1,6 +1,6 @@
---- src/file-manager/fm-directory-view.c.orig Thu Oct 2 23:30:40 2003
-+++ src/file-manager/fm-directory-view.c Thu Oct 2 23:52:04 2003
-@@ -4314,19 +4314,25 @@
+--- src/file-manager/fm-directory-view.c.orig Tue Feb 24 08:17:24 2004
++++ src/file-manager/fm-directory-view.c Wed Feb 25 02:43:55 2004
+@@ -4476,19 +4476,25 @@
nautilus_bonobo_set_hidden (view->details->ui,
FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS,
diff --git a/x11-fm/nautilus2/pkg-descr b/x11-fm/nautilus2/pkg-descr
index 41244cfac345..b4f3fd678e8f 100644
--- a/x11-fm/nautilus2/pkg-descr
+++ b/x11-fm/nautilus2/pkg-descr
@@ -1,6 +1,5 @@
-Nautilus is the official file manager for the GNOME desktop. It is
-designed to be primarly a file manager, but there are support for web
-and file viewing too. It is also responsible for managing of desktop
-and its icons.
+Nautilus is a file manager tightly integrated into the GNOME destkop.
+It is also responsible for desktop and icon management, and provides
+an intuitive interface for accessing files and webpages.
WWW: http://www.gnome.org/projects/nautilus/
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 068fc4e9fd7d..736238acc8f9 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -1,6 +1,5 @@
bin/nautilus
bin/nautilus-file-management-properties
-bin/nautilus-server-connect
etc/X11/serverconfig/.directory
etc/X11/starthere/.directory
etc/X11/starthere/applications.desktop
@@ -34,14 +33,25 @@ include/libnautilus/nautilus-undo.h
include/libnautilus/nautilus-view-component.h
include/libnautilus/nautilus-view-standard-main.h
include/libnautilus/nautilus-view.h
+include/nautilus/libnautilus-extension/nautilus-column-provider.h
+include/nautilus/libnautilus-extension/nautilus-column.h
+include/nautilus/libnautilus-extension/nautilus-extension-types.h
+include/nautilus/libnautilus-extension/nautilus-file-info.h
+include/nautilus/libnautilus-extension/nautilus-info-provider.h
+include/nautilus/libnautilus-extension/nautilus-menu-item.h
+include/nautilus/libnautilus-extension/nautilus-menu-provider.h
+include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
+include/nautilus/libnautilus-extension/nautilus-property-page.h
lib/bonobo/libnautilus-emblem-view.so
lib/bonobo/libnautilus-history-view.so
lib/bonobo/libnautilus-image-properties-view.so
lib/bonobo/libnautilus-notes-view.so
-lib/bonobo/libnautilus-tree-view.so
lib/libnautilus-adapter.a
lib/libnautilus-adapter.so
lib/libnautilus-adapter.so.2
+lib/libnautilus-extension.a
+lib/libnautilus-extension.so
+lib/libnautilus-extension.so.1
lib/libnautilus-private.a
lib/libnautilus-private.so
lib/libnautilus-private.so.2
@@ -55,29 +65,32 @@ libdata/bonobo/servers/Nautilus_View_history.server
libdata/bonobo/servers/Nautilus_View_image_properties.server
libdata/bonobo/servers/Nautilus_View_notes.server
libdata/bonobo/servers/Nautilus_View_text.server
-libdata/bonobo/servers/Nautilus_View_tree.server
libdata/bonobo/servers/Nautilus_shell.server
libdata/pkgconfig/libnautilus.pc
+libdata/pkgconfig/libnautilus-extension.pc
libexec/nautilus-adapter
libexec/nautilus-text-view
libexec/nautilus-throbber
share/gnome/applications/nautilus.desktop
+share/gnome/applications/nautilus-computer.desktop
+share/gnome/applications/nautilus-home.desktop
share/gnome/applications/network-scheme.desktop
share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop
share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml
share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-list-view-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-navigation-window-ui.xml
share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
+share/gnome/gnome-2.0/ui/nautilus-spatial-window-ui.xml
share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml
share/gnome/idl/nautilus-distributed-undo.idl
share/gnome/idl/nautilus-view-component.idl
share/gnome/nautilus/browser.xml
-share/gnome/nautilus/filesystem-attributes.xml
share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
share/gnome/nautilus/glade/nautilus-file-management-properties.glade
-share/gnome/nautilus/glade/nautilus-server-connect.glade
share/gnome/nautilus/nautilus-extras.placeholder
share/gnome/nautilus/nautilus-suggested.placeholder
share/gnome/nautilus/patterns/.striated.png
@@ -112,20 +125,14 @@ share/gnome/nautilus/patterns/snow_ridge.png
share/gnome/nautilus/patterns/stucco.jpg
share/gnome/nautilus/patterns/terracotta.png
share/gnome/nautilus/patterns/wavy_white.png
-share/gnome/nautilus/services/text/google.xml
-share/gnome/nautilus/services/text/webster.xml
share/gnome/nautilus/starthere-link.desktop
share/gnome/nautilus/starthere.desktop
share/gnome/nautilus/static_bookmarks.xml
-share/gnome/network/nautilus-server-connect.desktop
-share/gnome/pixmaps/nautilus/CD_drive.png
-share/gnome/pixmaps/nautilus/HD_drive.png
share/gnome/pixmaps/nautilus/Search.png
share/gnome/pixmaps/nautilus/audio.png
share/gnome/pixmaps/nautilus/backgrounds.png
share/gnome/pixmaps/nautilus/chit_frame.png
share/gnome/pixmaps/nautilus/colors.png
-share/gnome/pixmaps/nautilus/cpu.png
share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
share/gnome/pixmaps/nautilus/crux_teal/Search.png
@@ -138,7 +145,6 @@ share/gnome/pixmaps/nautilus/erase.png
share/gnome/pixmaps/nautilus/gnome/Services.png
share/gnome/pixmaps/nautilus/gnome/gnome.xml
share/gnome/pixmaps/nautilus/knob.png
-share/gnome/pixmaps/nautilus/memory_chip.gif
share/gnome/pixmaps/nautilus/nautilus-desktop.png
share/gnome/pixmaps/nautilus/nautilus-file-management-properties.png
share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
@@ -164,6 +170,7 @@ share/locale/cy/LC_MESSAGES/nautilus.mo
share/locale/da/LC_MESSAGES/nautilus.mo
share/locale/de/LC_MESSAGES/nautilus.mo
share/locale/el/LC_MESSAGES/nautilus.mo
+share/locale/en_CA/LC_MESSAGES/nautilus.mo
share/locale/en_GB/LC_MESSAGES/nautilus.mo
share/locale/es/LC_MESSAGES/nautilus.mo
share/locale/et/LC_MESSAGES/nautilus.mo
@@ -175,16 +182,17 @@ share/locale/ga/LC_MESSAGES/nautilus.mo
share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
+share/locale/hr/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
share/locale/id/LC_MESSAGES/nautilus.mo
share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
-share/locale/kn/LC_MESSAGES/nautilus.mo
share/locale/ko/LC_MESSAGES/nautilus.mo
share/locale/li/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
+share/locale/mi/LC_MESSAGES/nautilus.mo
share/locale/mk/LC_MESSAGES/nautilus.mo
share/locale/ml/LC_MESSAGES/nautilus.mo
share/locale/mn/LC_MESSAGES/nautilus.mo
@@ -193,6 +201,7 @@ share/locale/ne/LC_MESSAGES/nautilus.mo
share/locale/nl/LC_MESSAGES/nautilus.mo
share/locale/nn/LC_MESSAGES/nautilus.mo
share/locale/no/LC_MESSAGES/nautilus.mo
+share/locale/pa/LC_MESSAGES/nautilus.mo
share/locale/pl/LC_MESSAGES/nautilus.mo
share/locale/pt/LC_MESSAGES/nautilus.mo
share/locale/pt_BR/LC_MESSAGES/nautilus.mo
@@ -203,8 +212,8 @@ share/locale/sl/LC_MESSAGES/nautilus.mo
share/locale/sq/LC_MESSAGES/nautilus.mo
share/locale/sr/LC_MESSAGES/nautilus.mo
share/locale/sr@Latn/LC_MESSAGES/nautilus.mo
+share/locale/sr@ije/LC_MESSAGES/nautilus.mo
share/locale/sv/LC_MESSAGES/nautilus.mo
-share/locale/ta/LC_MESSAGES/nautilus.mo
share/locale/th/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
@@ -214,8 +223,9 @@ share/locale/yi/LC_MESSAGES/nautilus.mo
share/locale/zh_CN/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@dirrm share/gnome/pixmaps/nautilus/default
-@dirrm share/gnome/network
@dirrm share/gnome/nautilus/glade
+@dirrm include/nautilus/libnautilus-extension
+@dirrm include/nautilus
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
@@ -230,3 +240,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/desktop
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus
+@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true
+@dirrm lib/nautilus