Update nautilus to 2.26.0.

pkgsrc changes:

    * user-destdir support
    * remove eel, libbonobo, libbonoboui, libgnome, libgnomeui, libgsf,
      libart, ORBit2, startup-notification dependencies
    * add exempi, libunique dependencies


Major changes in 2.26.0 are:
* Stable release
* Fix crash due to broken gdk-pixbuf tga loader
* make sure thumbnails are updated even when zoomed up
* fix crash in media settings preferences

Major changes in 2.25.93 are:
* Use ConsoleKit to make sure we only autorun on active sessions
* Never show unmount if we show an eject menu item
* Show the gvfs reported owner/group names
* Don't allow changing default app for folders
* Fix "can't unmount same location twice" bug

Major changes in 2.25.92 are:
* Set mmap limit to avoid desktop background memory not being returned to the os
* Warn when source overwrites destination in move
* Don't put "link to ..." in front of symlinks unless there are name conflicts
* Fix desktop flicker on theme change
* Require desktop file app launchers to be executable
* Support making symlinks on remote locations (if supported by backend)

Major changes in 2.25.91 are:
* Use G_DEFINE_TYPE_* instead of hand-written types
* fix: opening a new window restores minimised ones
* fix renaming of desktop files
* Handle new kinds of GIcons
* Don't display shadowed mounts

Major changes in 2.25.4 are:
* Don't show desktop files from other desktops than Gnome on the desktop
* Support crossfades of desktop backgrounds
* Don't snap desktop icons outside right margin
* Fix crashes and leaks

Major changes in 2.25.3 are:
* Remove CD/DVD creator from places menu and sidebar
* Allow deleting custom emblems
* Fix crashes
* Don't show read-only emblems in trash
* Trash performance fixes
* General performance fixes
* Update to new PackageKit API

Major changes in 2.25.2 are:
* Merged eel into nautilus
* Use single glib/gtk includes
* Support PackageKit application search
* Fix new windows not appearing after successful mount
* Remove support for old KDE trash dirs

Major changes in 2.25.1 are:
* Remove depencency on libgnome & gnome-vfs
* Fix crashes
* Chop trailing space characters when moving to FAT file system
* When DnD'ing, COPY instead of MOVE, when the source is not deletable
* Don't set default when opening with other app, just add to open with list.
* Don't make copies of files from readonly source (e.g. CDROM) readonly
* Don't show cancel dialog when showing the "run or display" dialog

6 files changed, 78 insertions, 46 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index be4d16f0da3..20b2c8450df 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.95 2008/11/24 15:41:52 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2009/03/16 14:05:04 jmcneill Exp $
 #
 
-DISTNAME=		nautilus-2.24.2
+DISTNAME=		nautilus-2.26.0
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.26/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/nautilus/
 COMMENT=		Nautilus file manager for GNOME2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		gnome2-1.6
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -21,30 +23,29 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 GCONF_SCHEMAS=		apps_nautilus_preferences.schemas
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 post-install:
 	# for nautilus-cd-burner, remove when it's no longer needed
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/nautilus/extensions-1.0
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/nautilus/extensions-1.0
 	# current default path
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/nautilus/extensions-2.0
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/nautilus/extensions-2.0
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
-BUILDLINK_API_DEPENDS.eel+=	eel>=2.24.0
-.include "../../devel/eel/buildlink3.mk"
+.include "../../devel/exempi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.17.5
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.13.0
@@ -53,6 +54,5 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.13.0
 .include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
-.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index 83bb128ee10..eb6b649e512 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2008/11/24 15:41:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2009/03/16 14:05:04 jmcneill Exp $
 bin/nautilus
 bin/nautilus-autorun-software
 bin/nautilus-connect-server
@@ -14,13 +14,13 @@ include/nautilus/libnautilus-extension/nautilus-menu-provider.h
 include/nautilus/libnautilus-extension/nautilus-menu.h
 include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page.h
-lib/bonobo/servers/Nautilus_shell.server
 lib/libnautilus-extension.la
 lib/pkgconfig/libnautilus-extension.pc
 man/man1/nautilus-connect-server.1
 man/man1/nautilus-file-management-properties.1
 man/man1/nautilus.1
 share/applications/nautilus-autorun-software.desktop
+share/applications/nautilus-browser.desktop
 share/applications/nautilus-computer.desktop
 share/applications/nautilus-file-management-properties.desktop
 share/applications/nautilus-folder-handler.desktop
@@ -89,12 +89,14 @@ share/locale/fur/LC_MESSAGES/nautilus.mo
 share/locale/ga/LC_MESSAGES/nautilus.mo
 share/locale/gl/LC_MESSAGES/nautilus.mo
 share/locale/gu/LC_MESSAGES/nautilus.mo
+share/locale/ha/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/hy/LC_MESSAGES/nautilus.mo
 share/locale/id/LC_MESSAGES/nautilus.mo
+share/locale/ig/LC_MESSAGES/nautilus.mo
 share/locale/io/LC_MESSAGES/nautilus.mo
 share/locale/is/LC_MESSAGES/nautilus.mo
 share/locale/it/LC_MESSAGES/nautilus.mo
@@ -107,6 +109,7 @@ share/locale/ku/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/mai/LC_MESSAGES/nautilus.mo
 share/locale/mg/LC_MESSAGES/nautilus.mo
 share/locale/mi/LC_MESSAGES/nautilus.mo
 share/locale/mk/LC_MESSAGES/nautilus.mo
@@ -143,18 +146,22 @@ share/locale/th/LC_MESSAGES/nautilus.mo
 share/locale/tk/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo
 share/locale/uk/LC_MESSAGES/nautilus.mo
+share/locale/uz/LC_MESSAGES/nautilus.mo
+share/locale/uz@cyrillic/LC_MESSAGES/nautilus.mo
 share/locale/vi/LC_MESSAGES/nautilus.mo
 share/locale/wa/LC_MESSAGES/nautilus.mo
 share/locale/xh/LC_MESSAGES/nautilus.mo
 share/locale/yi/LC_MESSAGES/nautilus.mo
+share/locale/yo/LC_MESSAGES/nautilus.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
 share/mime/packages/nautilus.xml
 share/nautilus/browser.xml
-share/nautilus/glade/nautilus-bookmarks-window.glade
-share/nautilus/glade/nautilus-file-management-properties.glade
+share/nautilus/icons/hicolor/16x16/emblems/emblem-note.png
+share/nautilus/icons/hicolor/24x24/emblems/emblem-note.png
+share/nautilus/icons/hicolor/48x48/emblems/emblem-note.png
 share/nautilus/nautilus-extras.placeholder
 share/nautilus/nautilus-suggested.placeholder
 share/nautilus/patterns/blue_gray_rough.png
@@ -188,8 +195,10 @@ share/nautilus/patterns/snow_ridge.png
 share/nautilus/patterns/stucco.jpg
 share/nautilus/patterns/terracotta.png
 share/nautilus/patterns/wavy_white.png
+share/nautilus/ui/nautilus-bookmarks-window.ui
 share/nautilus/ui/nautilus-desktop-icon-view-ui.xml
 share/nautilus/ui/nautilus-directory-view-ui.xml
+share/nautilus/ui/nautilus-file-management-properties.ui
 share/nautilus/ui/nautilus-icon-view-ui.xml
 share/nautilus/ui/nautilus-list-view-ui.xml
 share/nautilus/ui/nautilus-navigation-window-ui.xml
@@ -202,13 +211,19 @@ share/pixmaps/nautilus/colors.png
 share/pixmaps/nautilus/emblems.png
 share/pixmaps/nautilus/erase.png
 share/pixmaps/nautilus/knob.png
-share/pixmaps/nautilus/note-indicator.png
 share/pixmaps/nautilus/thumbnail_frame.png
 @dirrm share/pixmaps/nautilus
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/nautilus/ui
 @dirrm share/nautilus/patterns
-@dirrm share/nautilus/glade
+@dirrm share/nautilus/icons/hicolor/48x48/emblems
+@dirrm share/nautilus/icons/hicolor/48x48
+@dirrm share/nautilus/icons/hicolor/24x24/emblems
+@dirrm share/nautilus/icons/hicolor/24x24
+@dirrm share/nautilus/icons/hicolor/16x16/emblems
+@dirrm share/nautilus/icons/hicolor/16x16
+@dirrm share/nautilus/icons/hicolor
+@dirrm share/nautilus/icons
 @dirrm share/nautilus
 @comment in shared-mime-info: @dirrm share/mime/packages
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
@@ -225,6 +240,5 @@ share/pixmaps/nautilus/thumbnail_frame.png
 @unexec ${MKDIR} %D/lib/nautilus/extensions-1.0 2>/dev/null || ${TRUE}
 @dirrm lib/nautilus/extensions-1.0
 @dirrm lib/nautilus
-@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 00c54b1d5c3..3e7c726d0cb 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.40 2008/11/24 15:41:52 wiz Exp $
+$NetBSD: distinfo,v 1.41 2009/03/16 14:05:04 jmcneill Exp $
 
-SHA1 (nautilus-2.24.2.tar.bz2) = 9bc2cf110ae50d69633095aa8115cf89c095ef42
-RMD160 (nautilus-2.24.2.tar.bz2) = a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef
-Size (nautilus-2.24.2.tar.bz2) = 5356516 bytes
-SHA1 (patch-af) = 7b6d50ff805ed971ebe96d1d91a563a19220ebc7
-SHA1 (patch-aj) = d905ae52f35bd4fa11a9c10a0c7423aa5e04f8b9
+SHA1 (nautilus-2.26.0.tar.bz2) = feea7a6b30d49755be55031e7ec1bc698a7fcb37
+RMD160 (nautilus-2.26.0.tar.bz2) = 25f3086fb2d8e47b75f23579a0efad870819df61
+Size (nautilus-2.26.0.tar.bz2) = 5856831 bytes
+SHA1 (patch-af) = b8399cda7d9e842a415b8434490805958cea743b
+SHA1 (patch-aj) = d259f39c9bf6e8aad67889bfb27c69fe12bdbfd6
 SHA1 (patch-ak) = e1548234ee9c96b0727710498e8f29a41a6df759
 SHA1 (patch-al) = 28dd784185c8fceef55fcb743731c1e2069510cc
diff --git a/sysutils/nautilus/files/msgfmtstrip b/sysutils/nautilus/files/msgfmtstrip
new file mode 100644
index 00000000000..aefb932ed7f
--- /dev/null
+++ b/sysutils/nautilus/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/16 14:05:04 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}
diff --git a/sysutils/nautilus/patches/patch-af b/sysutils/nautilus/patches/patch-af
index 569f517eb2b..2c1bdefd79f 100644
--- a/sysutils/nautilus/patches/patch-af
+++ b/sysutils/nautilus/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2007/11/05 19:10:29 drochner Exp $
+$NetBSD: patch-af,v 1.5 2009/03/16 14:05:04 jmcneill Exp $
 
---- src/nautilus-main.c.orig	2007-07-24 11:56:20.000000000 +0200
+--- src/nautilus-main.c.orig	2009-02-17 05:50:24.000000000 -0500
 +++ src/nautilus-main.c
-@@ -67,6 +67,24 @@
+@@ -65,6 +65,24 @@
  #include <exempi/xmp.h>
  #endif
  
@@ -27,14 +27,14 @@ $NetBSD: patch-af,v 1.4 2007/11/05 19:10:29 drochner Exp $
  /* Keeps track of everyone who wants the main event loop kept active */
  static GSList *event_loop_registrants;
  
-@@ -538,6 +556,10 @@ main (int argc, char *argv[])
- 	} else {
- 		/* Run the nautilus application. */
- 		application = nautilus_application_new ();
+@@ -505,6 +523,10 @@ main (int argc, char *argv[])
+ 		if (egg_sm_client_is_resumed (application->smclient)) {
+ 			no_default_window = TRUE;
+ 		}
 +
 +#ifdef _PTH_PTHREAD_H_
-+	gtk_timeout_add (200, pth_nbschedule, NULL);
++		gtk_timeout_add (200, pth_nbschedule, NULL);
 +#endif
+ 		
  		nautilus_application_startup
  			(application,
- 			 kill_shell, restart_shell, no_default_window, no_desktop,
diff --git a/sysutils/nautilus/patches/patch-aj b/sysutils/nautilus/patches/patch-aj
index 0ffe312302f..60aa4e82779 100644
--- a/sysutils/nautilus/patches/patch-aj
+++ b/sysutils/nautilus/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.4 2007/11/05 19:10:29 drochner Exp $
+$NetBSD: patch-aj,v 1.5 2009/03/16 14:05:04 jmcneill Exp $
 
---- configure.orig	2007-09-28 17:14:10.000000000 +0200
+--- configure.orig	2009-03-16 07:49:01.000000000 -0400
 +++ configure
-@@ -24120,7 +24120,7 @@ fi
+@@ -25451,7 +25451,7 @@ fi
  done
  
  
 -if test "$ac_cv_func_statfs" = yes ; then
-+if test "$ac_cv_func_statvfs" = no -a "$ac_cv_func_statfs" = yes ; then
-   { echo "$as_me:$LINENO: checking number of arguments to statfs()" >&5
- echo $ECHO_N "checking number of arguments to statfs()... $ECHO_C" >&6; }
++if test "$ac_cv_func_statvfs" = no -a test "$ac_cv_func_statfs" = yes ; then
+   { $as_echo "$as_me:$LINENO: checking number of arguments to statfs()" >&5
+ $as_echo_n "checking number of arguments to statfs()... " >&6; }
    cat >conftest.$ac_ext <<_ACEOF