Update to 2.12.1:

Major changes in 2.12.1 are:
* Pass all selected files to menu extensions, not only one per mimetype
* Use much fewer file monitors
* Fix text size on startup with non-standard default zoom size
* Some fixes to trash handling and unmount
* Fix some desktop icon positioning details
* Copy thumbnails when copying files
* Autofill connect to server dialog when possible
* Always show deep counts in properties page
* Fix leaks and crashes
* Correctly escape filenames for display in progress dialog

Major changes in 2.12.0 are:
* Fix icon layout in text-beside-icons mode in some cases
* Fix template creation on volumes other than the same as /tmp
* Expand file uris correctly on desktop when passing to scripts
* Workaround crash on audio preview in burn:
* Fix handling of global show hidden files preference
* Fix crash caused by earlier memleak fix
* Don't redraw windows/desktop on focus in/out

Major changes in 2.11.92 are:
* Enable emblem dropping to the list view
* Disallow deleting special locations from the location button popup
* Don't show "Open Folder" as application option in context menus
* Disallow custom icons for the trash
* Cleanups & Leak fixed

Major changes in 2.11.91 are:
* Don't allow renaming of the desktop folder
* Make moves within burn:// possible
* Fixes to property browser drag and drop code
* Add Explorer-style keybindings
* Add timestamps to metafiles
* Make ESC switch back to the pathbar
* Use saner check for mime mismatching
* Make progress dialog minimizable
* UI fixes

Major changes in 2.11.90 are:
* Handle dnd more efficently
* Use file-manager icon for browser windows
* Use hover underline and cursor for single click mode
* Make labels selectable in the sidebar
* Improve sound preview process handling
* UI fixes to path- and sidebar

Major changes in 2.11.4 are:
* Allow dnd of text on view to create a new file
* show hostname in progress dialogs
* use pathbar in location toolbar
* busy curson when loading folder in browser mode too

Major changes in 2.11.3 are:
* Turn the list view into a tree
* No dnd drop rect on the desktop
* Use gtk bookmars as bookmark source
* Add bookmarks to spatial mode
* New places sidebar
* better sort order for filenames with numbers in them
  (needs glib 2.7.x)
* Better handling of font sizes wrt zoom in icon view
* Fix leaks

Major changes in 2.11.2 are:
* Fix sort order for size/count/time
* ctrl+scrollwheel changes zoom, ctrl-= zooms in
* better handling of cut and paste in notes text view
* Add smb domain field in connect to server dialog
* nicer handling of drops from mozilla
* no properties menu item for desktop context menu
* shift-f2 renames with the whole name initially selected
* sort by emblem only looks at user-set emblems
* scroll to icon when selected and partially visible

Major changes in 2.11.1 are:
* Use authentication in external connect to server app
* UI polish
* Allow DnD of location button icon.
* Context menus on location button and location label in browser
* Fix memory leaks
* Fix crashes
* Speed up delete in list view
* Fix rename in list view breaking when there was a file change
* Removed "new terminal" from desktop context menu
  If you want this, install the nautilus-open-terminal extension,
  its much better than this feature ever was.
* Don't thumbnail files constantly if they're changing
* Fixed a loop that could happen on remote locations when removing
  a directory.
* Add properties of the current folder menu item to background
  context menu
* Use --no-desktop in default folder handler to avoid taking over
  the desktop if you don't run gnome.

4 files changed, 26 insertions, 36 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 7298437ffec..a49650902f9 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:24 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/10/12 21:53:11 jmmv Exp $
 #
 
-DISTNAME=		nautilus-2.10.1
+DISTNAME=		nautilus-2.12.1
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.10/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -22,9 +22,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
 
-BUILDLINK_DEPENDS.eel2+=	eel2>=2.10.1
+BUILDLINK_DEPENDS.eel2+=	eel2>=2.12.0
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.0
 BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.8
 
 .include "../../audio/esound/buildlink3.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index 5a152395c3d..fb9a8b9d8dd 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/04/19 19:22:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/10/12 21:53:11 jmmv Exp $
 bin/nautilus
 bin/nautilus-connect-server
 bin/nautilus-file-management-properties
@@ -56,6 +56,7 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/ku/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
@@ -85,6 +86,7 @@ ${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/te/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/nautilus.mo
@@ -140,42 +142,17 @@ share/nautilus/ui/nautilus-list-view-ui.xml
 share/nautilus/ui/nautilus-navigation-window-ui.xml
 share/nautilus/ui/nautilus-shell-ui.xml
 share/nautilus/ui/nautilus-spatial-window-ui.xml
-share/pixmaps/nautilus/Search.png
-share/pixmaps/nautilus/audio.png
+share/pixmaps/nautilus/audio.svg
 share/pixmaps/nautilus/backgrounds.png
 share/pixmaps/nautilus/chit_frame.png
 share/pixmaps/nautilus/colors.png
-share/pixmaps/nautilus/crux_eggplant/Search.png
-share/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
-share/pixmaps/nautilus/crux_teal/Search.png
-share/pixmaps/nautilus/crux_teal/crux_teal.xml
-share/pixmaps/nautilus/default/Search.png
-share/pixmaps/nautilus/default/default.xml
-share/pixmaps/nautilus/default/side_bar_image.png
 share/pixmaps/nautilus/emblems.png
 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/nautilus-desktop.png
-share/pixmaps/nautilus/nautilus-file-management-properties.png
 share/pixmaps/nautilus/nautilus-launch-icon.png
-share/pixmaps/nautilus/nautilus-mini-logo.png
-share/pixmaps/nautilus/nautilus-server-connect.png
 share/pixmaps/nautilus/note-indicator.png
-share/pixmaps/nautilus/side_bar_image.png
-share/pixmaps/nautilus/sierra/green_weave.png
-share/pixmaps/nautilus/sierra/sierra.xml
-share/pixmaps/nautilus/tahoe/bluewall.png
-share/pixmaps/nautilus/tahoe/tahoe.xml
 share/pixmaps/nautilus/text-selection-frame.png
 share/pixmaps/nautilus/thumbnail_frame.png
-@dirrm share/pixmaps/nautilus/tahoe
-@dirrm share/pixmaps/nautilus/sierra
-@dirrm share/pixmaps/nautilus/gnome
-@dirrm share/pixmaps/nautilus/default
-@dirrm share/pixmaps/nautilus/crux_teal
-@dirrm share/pixmaps/nautilus/crux_eggplant
 @dirrm share/pixmaps/nautilus
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/nautilus/ui
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 8dd005b49bf..33878e7cf5b 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.20 2005/04/19 19:22:11 drochner Exp $
+$NetBSD: distinfo,v 1.21 2005/10/12 21:53:11 jmmv Exp $
 
-SHA1 (nautilus-2.10.1.tar.bz2) = 738a1c58bf83bb2034bf9466daecdf09d8f131cb
-RMD160 (nautilus-2.10.1.tar.bz2) = d3e7e0f66e972087d45975f2efa0fe3bfcb7620e
-Size (nautilus-2.10.1.tar.bz2) = 5960278 bytes
+SHA1 (nautilus-2.12.1.tar.bz2) = 0e333cfd98b60cef6afbc477b75ac051d02c6c16
+RMD160 (nautilus-2.12.1.tar.bz2) = e5e3c10ff88c49109bf204cfb00959c4aef2b241
+Size (nautilus-2.12.1.tar.bz2) = 4056062 bytes
+SHA1 (patch-aa) = 44c913fecea053c89fd0ff8bd7b9e56c9dd08959
 SHA1 (patch-af) = 928ce8395e33d4459ac83c2d992e251e223ddfeb
 SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5
 SHA1 (patch-ai) = fe69717dce315877966e7c4d394ddfdcfd379bde
diff --git a/sysutils/nautilus/patches/patch-aa b/sysutils/nautilus/patches/patch-aa
new file mode 100644
index 00000000000..6b0dafb6954
--- /dev/null
+++ b/sysutils/nautilus/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2005/10/12 21:53:11 jmmv Exp $
+
+--- libnautilus-private/nautilus-file-operations.c.orig	2005-09-26 17:30:05.000000000 +0200
++++ libnautilus-private/nautilus-file-operations.c
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <config.h>
++#include <locale.h>
+ #include <string.h>
+ #include <stdio.h>
+ #include "nautilus-file-operations.h"