Update to 2.6.0. Changes since previous stable branch (2.4.x):

Major changes since 2.5.91 are:
* Translation updates

Major changes since 2.5.90 are:
* Handle failures when opening new window better (don't loop)
* visiting and accept modifiers were reversed in list view
* Build fixes

Major changes since 2.5.8 are:
* Beter typeahead in list view
* "browse" context menu item in more places
* Added go -> cd burner in browser mode
* Fallback to normal icon view if there is a problem launching another view
* Close windows on unmounted directories
* Fix crashes
* Longer delay until cancel open dialog opens

Major changes since 2.5.7 are:
* Fix crash
* Nicer names for toplevel uris
* Browse folder works in more places
* Added preference to always use browser windows
* Warn when sniffed/extension-matched mime type disagrees
* Show applications for both sniffed and extension-matched
  mimetype in the open with menu

Major changes since 2.5.6 are:
* Fix icon lookup crash
* Fix property page crash
* Some a11y fixes
* Use new background capplet name
* Fix rename keyfocus issue
* Scroll to icon after rename
* Fix ogg previewing
* Some HIG rephrasing of strings
* Fix crash on rename of empty selection
* Update help userguide links
* Paste menu sensitivity fix
* Rename selection keynav now behaves better from the start

Major changes since 2.5.5 are:
* hig/ui tweaks
* ngettext support
* distribute nautilus-list-view-ui.xml
* New mimetype detection approach
* performance fixes
* non-modal open with other dialog
* Don't show small svgs as themseleves (always thumbnail)
* update egg-recent

Major changes since 2.5.4 are:
* Extension system for emblem, property page, menu item, and
  list view column plugins.
* Editable list view columns
* Don't expand symlinks when following them.
* Busy cursor in loading spatial windows
* Icon-view style typeahead in the list view.
* Emblems in the list view
* Added a location button to spatial windows
* Removed tab icon nav from the icon view
* Add a context menu to the tree side pane.
* Pop up folder menu in list view background
* Turn on home icon on the desktop by default
* Added status bar info when no files are selected
* Got rid of unnecessary EelGenerousBin/EelInputEventBox usage
* HIG fixes
* Bugfixes

Major changes since 2.5.3 are:
* Use GtkIconTheme instead of GnomeIconTheme
* Show visited folders differently
* Better mouse/keynav in icon and list view
* Save window geometry on window close
* HIG message dialogs
* File templates support

Major changes since 2.5.2 are:
* Accessibility fixes
* Better initial size of navigation window
* Close all parents closes all parents
* Focus the next item after delete in list view

Major changes since 2.5.1.1 are:
* Don't do unnecessary i/o on remote locations
* handle broken symlinks that go unbroken
* various bug fixes
* some accessibility fixes

Major changes since 2.5.1 are:

* Fixed a NautilusFile leak
* DISABLE_DEPRECATED fixes.

Major changes since 2.5.0 are:

* Start of new volume handling system
* deprecaton clean
* fixed leaks
* performance fixes

9 files changed, 95 insertions, 407 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 4c838ad22b0..2c88514dd37 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.29 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/01 18:38:03 jmmv Exp $
 #
 
-DISTNAME=		nautilus-2.4.2
-PKGREVISION=		6
+DISTNAME=		nautilus-2.6.0
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 COMMENT=		Nautilus file manager for GNOME2
 
+DEPENDS+=		hicolor-icon-theme>=0.4:../../graphics/hicolor-icon-theme
 DEPENDS+=		xdg-dirs>=1.1:../../misc/xdg-dirs
 
 USE_PKGLOCALEDIR=	yes
@@ -21,6 +21,7 @@ USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	libnautilus/libnautilus.pc.in
+PKGCONFIG_OVERRIDE+=	libnautilus-extension/libnautilus-extension.pc.in
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
@@ -54,6 +55,7 @@ CONF_FILES+=		${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index d865972b28a..9845f6486ef 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/06 22:30:23 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/01 18:38:03 jmmv Exp $
 bin/nautilus
 bin/nautilus-file-management-properties
-bin/nautilus-server-connect
 include/libnautilus/libnautilus.h
 include/libnautilus/nautilus-bonobo-ui.h
 include/libnautilus/nautilus-clipboard.h
@@ -13,6 +12,15 @@ 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.a
 lib/bonobo/libnautilus-emblem-view.la
 lib/bonobo/libnautilus-emblem-view.so
@@ -25,9 +33,6 @@ lib/bonobo/libnautilus-image-properties-view.so
 lib/bonobo/libnautilus-notes-view.a
 lib/bonobo/libnautilus-notes-view.la
 lib/bonobo/libnautilus-notes-view.so
-lib/bonobo/libnautilus-tree-view.a
-lib/bonobo/libnautilus-tree-view.la
-lib/bonobo/libnautilus-tree-view.so
 lib/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
 lib/bonobo/servers/Nautilus_Control_throbber.server
 lib/bonobo/servers/Nautilus_View_emblem.server
@@ -35,13 +40,17 @@ lib/bonobo/servers/Nautilus_View_history.server
 lib/bonobo/servers/Nautilus_View_image_properties.server
 lib/bonobo/servers/Nautilus_View_notes.server
 lib/bonobo/servers/Nautilus_View_text.server
-lib/bonobo/servers/Nautilus_View_tree.server
 lib/bonobo/servers/Nautilus_shell.server
 lib/libnautilus-adapter.a
 lib/libnautilus-adapter.la
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.2
 lib/libnautilus-adapter.so.2.0
+lib/libnautilus-extension.a
+lib/libnautilus-extension.la
+lib/libnautilus-extension.so
+lib/libnautilus-extension.so.1
+lib/libnautilus-extension.so.1.0
 lib/libnautilus-private.a
 lib/libnautilus-private.la
 lib/libnautilus-private.so
@@ -52,10 +61,13 @@ lib/libnautilus.la
 lib/libnautilus.so
 lib/libnautilus.so.2
 lib/libnautilus.so.2.0
+lib/pkgconfig/libnautilus-extension.pc
 lib/pkgconfig/libnautilus.pc
 libexec/nautilus-adapter
 libexec/nautilus-text-view
 libexec/nautilus-throbber
+share/applications/nautilus-computer.desktop
+share/applications/nautilus-home.desktop
 share/applications/nautilus.desktop
 share/applications/network-scheme.desktop
 share/control-center-2.0/capplets/nautilus-file-management-properties.desktop
@@ -71,10 +83,12 @@ share/gnome-2.0/ui/nautilus-clipboard-ui.xml
 share/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome-2.0/ui/nautilus-directory-view-ui.xml
 share/gnome-2.0/ui/nautilus-icon-view-ui.xml
+share/gnome-2.0/ui/nautilus-list-view-ui.xml
+share/gnome-2.0/ui/nautilus-navigation-window-ui.xml
 share/gnome-2.0/ui/nautilus-search-list-view-ui.xml
 share/gnome-2.0/ui/nautilus-shell-ui.xml
+share/gnome-2.0/ui/nautilus-spatial-window-ui.xml
 share/gnome-2.0/ui/nautilus-text-view-ui.xml
-share/gnome/network/nautilus-server-connect.desktop
 share/idl/nautilus-distributed-undo.idl
 share/idl/nautilus-view-component.idl
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/nautilus.mo
@@ -89,6 +103,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/nautilus.mo
@@ -100,16 +115,17 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/nautilus.mo
@@ -118,6 +134,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/nautilus.mo
@@ -128,8 +145,8 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/nautilus.mo
@@ -139,10 +156,8 @@ ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/nautilus/browser.xml
-share/nautilus/filesystem-attributes.xml
 share/nautilus/glade/nautilus-bookmarks-window.glade
 share/nautilus/glade/nautilus-file-management-properties.glade
-share/nautilus/glade/nautilus-server-connect.glade
 share/nautilus/nautilus-extras.placeholder
 share/nautilus/nautilus-suggested.placeholder
 share/nautilus/patterns/.striated.png
@@ -177,19 +192,14 @@ share/nautilus/patterns/snow_ridge.png
 share/nautilus/patterns/stucco.jpg
 share/nautilus/patterns/terracotta.png
 share/nautilus/patterns/wavy_white.png
-share/nautilus/services/text/google.xml
-share/nautilus/services/text/webster.xml
 share/nautilus/starthere-link.desktop
 share/nautilus/starthere.desktop
 share/nautilus/static_bookmarks.xml
-share/pixmaps/nautilus/CD_drive.png
-share/pixmaps/nautilus/HD_drive.png
 share/pixmaps/nautilus/Search.png
 share/pixmaps/nautilus/audio.png
 share/pixmaps/nautilus/backgrounds.png
 share/pixmaps/nautilus/chit_frame.png
 share/pixmaps/nautilus/colors.png
-share/pixmaps/nautilus/cpu.png
 share/pixmaps/nautilus/crux_eggplant/Search.png
 share/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
 share/pixmaps/nautilus/crux_teal/Search.png
@@ -202,7 +212,6 @@ share/pixmaps/nautilus/erase.png
 share/pixmaps/nautilus/gnome/Services.png
 share/pixmaps/nautilus/gnome/gnome.xml
 share/pixmaps/nautilus/knob.png
-share/pixmaps/nautilus/memory_chip.gif
 share/pixmaps/nautilus/nautilus-desktop.png
 share/pixmaps/nautilus/nautilus-file-management-properties.png
 share/pixmaps/nautilus/nautilus-launch-icon.png
@@ -223,14 +232,22 @@ share/pixmaps/nautilus/thumbnail_frame.png
 @dirrm share/pixmaps/nautilus/crux_teal
 @dirrm share/pixmaps/nautilus/crux_eggplant
 @dirrm share/pixmaps/nautilus
-@dirrm share/nautilus/services/text
-@dirrm share/nautilus/services
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/nautilus/patterns
 @dirrm share/nautilus/glade
 @dirrm share/nautilus
+@comment in ORBit2: @dirrm share/idl
+@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
+@comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/nautilus/X11/sysconfig
 @dirrm share/examples/nautilus/X11/starthere
 @dirrm share/examples/nautilus/X11/serverconfig
 @dirrm share/examples/nautilus/X11
 @dirrm share/examples/nautilus
+@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
+@comment in gnome2-dirs: @dirrm share/applications
+@comment in libbonobo: @dirrm lib/bonobo/servers
+@comment in libbonobo: @dirrm lib/bonobo
+@dirrm include/nautilus/libnautilus-extension
+@dirrm include/nautilus
 @dirrm include/libnautilus
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index cc5f47c6ecd..c149f141d7d 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/04/01 18:38:03 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -11,13 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus}
 BUILDLINK_PACKAGES+=	nautilus
 
 .if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.4.2nb4
-BUILDLINK_RECOMMENDED.nautilus?=	nautilus>=2.4.2nb6
+BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.6.0
 BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 .endif	# NAUTILUS_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/eel2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -27,6 +26,7 @@ BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 12838bf9721..45eba578c6d 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.8 2004/02/21 06:42:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2004/04/01 18:38:03 jmmv Exp $
 
-SHA1 (nautilus-2.4.2.tar.bz2) = 16e8e6bb2a8263d32358fd03c9d11663f09f7421
-Size (nautilus-2.4.2.tar.bz2) = 5687876 bytes
-SHA1 (patch-aa) = 334a3c4b4fe5b93c817f04c2de1f130ad7b17592
-SHA1 (patch-ab) = 38390bb0d8b705f561f8e2d30a323b78a982a777
-SHA1 (patch-ac) = ee6b0d6df93fa3aa44ab86754322067f586dd0e2
-SHA1 (patch-ad) = 3a41dc22f3b0f76dc0efbc8efb71605be73a547a
+SHA1 (nautilus-2.6.0.tar.bz2) = 6ff19c77bdec4f20cef41e8c46d4b15cd1b1818d
+Size (nautilus-2.6.0.tar.bz2) = 5502083 bytes
+SHA1 (patch-ab) = 60dc4cf38abd51d1d6353b07e6f0eabf2a748bf3
+SHA1 (patch-ac) = 75c58b7e59fc3743df5ef50c5684771de42dc93a
 SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124
 SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
-SHA1 (patch-ag) = d01a15e0e0e624fcf7fee66d1aa3456a0639e643
+SHA1 (patch-ag) = e8d2e55efb32bf0b684ba7a67c177bf849ae9045
 SHA1 (patch-ah) = 57fbbadae0aa47014645d72fd0da9f9ce145d8de
diff --git a/sysutils/nautilus/patches/patch-aa b/sysutils/nautilus/patches/patch-aa
deleted file mode 100644
index 52ec8e1d9ae..00000000000
--- a/sysutils/nautilus/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
-
---- libnautilus-private/filesystem-attributes.xml.orig	Mon Jul  8 22:06:25 2002
-+++ libnautilus-private/filesystem-attributes.xml
-@@ -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/sysutils/nautilus/patches/patch-ab b/sysutils/nautilus/patches/patch-ab
index f262ba7361b..266a874b432 100644
--- a/sysutils/nautilus/patches/patch-ab
+++ b/sysutils/nautilus/patches/patch-ab
@@ -1,16 +1,41 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/01 18:38:03 jmmv Exp $
 
---- libnautilus-private/nautilus-medusa-support.c.orig	2001-10-29 06:21:46.000000000 +1000
-+++ libnautilus-private/nautilus-medusa-support.c
-@@ -83,7 +83,11 @@ nautilus_medusa_check_cron_is_enabled (v
- 		 */
- 		status = NAUTILUS_CRON_STATUS_OFF;
+http://bugzilla.gnome.org/showattachment.cgi?attach_id=24286
+
+--- libnautilus-private/nautilus-medusa-support.c	28 Oct 2001 20:21:46 -0000	1.11
++++ libnautilus-private/nautilus-medusa-support.c	10 Feb 2004 19:11:58 -0000
+@@ -32,6 +32,7 @@
+ #include <eel/eel-string.h>
+ #include <dirent.h>
+ #include <stdio.h>
++#include <unistd.h>
+ #include <sys/types.h>
  
-+#ifdef __NetBSD__
-+		stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
+ #ifdef HAVE_MEDUSA
+@@ -52,6 +53,18 @@
+ NautilusCronStatus
+ nautilus_medusa_check_cron_is_enabled (void)
+ {
++#if defined(__NetBSD__)
++	/* In NetBSD, cron(8) is part of the base system and is configured
++	   to store a pid file in /var/run/cron.pid while running.  Instead
++	   of walking the process table (which has its implications, since
++	   proc is not mounted by default and has very strict permissions),
++	   we can simply check for its existence. */
++
++	if (access("/var/run/cron.pid", F_OK) == -1)
++		return NAUTILUS_CRON_STATUS_OFF;
++
++	return NAUTILUS_CRON_STATUS_ON;
 +#else
- 		stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
+ 	DIR *proc_directory;
+ 	struct dirent *file;
+ 	char *stat_file_name;
+@@ -106,6 +119,7 @@
+ 
+ 	closedir (proc_directory);
+ 	return status;
 +#endif
- 		stat_file = fopen (stat_file_name, "r");
- 		g_free (stat_file_name);
- 		
+ }
+ 
+ #ifdef HAVE_MEDUSA
diff --git a/sysutils/nautilus/patches/patch-ac b/sysutils/nautilus/patches/patch-ac
index 07e5bc914a1..12f0668c018 100644
--- a/sysutils/nautilus/patches/patch-ac
+++ b/sysutils/nautilus/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/01 18:38:03 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=106227
 
 --- libnautilus-private/nautilus-thumbnails.c.orig	2003-03-26 00:47:25.000000000 +1000
 +++ libnautilus-private/nautilus-thumbnails.c
diff --git a/sysutils/nautilus/patches/patch-ad b/sysutils/nautilus/patches/patch-ad
deleted file mode 100644
index 55a406e26aa..00000000000
--- a/sysutils/nautilus/patches/patch-ad
+++ /dev/null
@@ -1,325 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/12/31 01:41:35 xtraeme Exp $
-
---- libnautilus-private/nautilus-volume-monitor.c.orig	1997-01-04 04:26:43.000000000 +0100
-+++ libnautilus-private/nautilus-volume-monitor.c	2003-12-31 02:31:12.000000000 +0100
-@@ -55,11 +55,21 @@
- #include <pthread.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#ifdef BSD
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+#define HAVE_SETFSENT
-+#define BSD_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
-@@ -589,6 +599,9 @@
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#ifdef BSD
-+    	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
-@@ -598,6 +611,12 @@
- 		return TRUE;
- 	}
- #endif
-+#ifdef BSD
-+	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/")) {
-@@ -737,10 +756,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;
-@@ -748,15 +772,12 @@
- #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;
-@@ -767,7 +788,11 @@
- #endif
- 	
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
-+#ifndef HAVE_SETFSENT
- 	if (file == NULL) {
-+#else
-+	if (file == 0) {
-+#endif
- 		return NULL;
- 	}
- 	
-@@ -812,9 +837,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);
-@@ -844,7 +881,7 @@
-       return result;
- }
- 
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
- 
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
-@@ -1156,7 +1193,11 @@
- 	char *command;	
- 	
- 	if (path != NULL) {
-+#ifdef __FreeBSD__
-+		command = g_strdup_printf ("/usr/sbin/cdcontrol -f %s eject", path);
-+#else
- 		command = g_strdup_printf ("eject %s", path);	
-+#endif
- 		eel_gnome_shell_execute (command);
- 		g_free (command);
- 	}
-@@ -1313,23 +1354,34 @@
-         return volumes;
- }
- 
--#elif defined(SOLARIS_MNT)
-+#elif defined(SOLARIS_MNT) || defined(BSD_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);
-@@ -1338,6 +1390,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;
- }
-@@ -1564,7 +1626,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;
-@@ -1603,6 +1665,38 @@
- 	return type;
- #elif defined(AIX_MNT)
- 	return CDS_NO_INFO;
-+#elif defined(BSD_MNT)
-+	struct ioc_toc_header header;
-+	struct ioc_read_toc_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.starting_track = header.starting_track;
-+		entry.starting_track <= header.ending_track;
-+		entry.starting_track++) {
-+	    entry.address_format = CD_LBA_FORMAT;
-+#ifdef __FreeBSD__
-+	    if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
-+#else
-+	    if (ioctl (*fd, CDIOREADTOCENTRYS, &entry) == 0) {
-+#endif
-+		if (entry.data->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);
-@@ -2160,7 +2254,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(BSD_MNT)
- 		/* These are set up by get_current_mount_list for Solaris&AIX.*/
- 		volume->is_removable = volume_is_removable (volume);
- #endif
-@@ -2189,7 +2283,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);
-@@ -2224,9 +2318,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/");
- 		
-@@ -2287,6 +2390,35 @@
- 			} 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/sysutils/nautilus/patches/patch-ag b/sysutils/nautilus/patches/patch-ag
index 7560d135aba..62232ae5b86 100644
--- a/sysutils/nautilus/patches/patch-ag
+++ b/sysutils/nautilus/patches/patch-ag
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2004/02/10 17:59:24 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2004/04/01 18:38:03 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=134022
 
 --- src/nautilus-application.c.orig	2003-10-21 14:52:52.000000000 +0200
 +++ src/nautilus-application.c