update to 2.24.0

This switches to the gnome-2.24 release branch.

4 files changed, 39 insertions, 22 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 108d27b29f8..cb316098983 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.91 2008/07/15 10:46:25 drochner Exp $
+# $NetBSD: Makefile,v 1.92 2008/10/16 17:58:00 drochner Exp $
 #
 
-DISTNAME=		nautilus-2.22.5.1
+DISTNAME=		nautilus-2.24.0
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index 5c77d0fd61a..44bcff9c22f 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2008/05/29 11:19:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/10/16 17:58:00 drochner Exp $
 bin/nautilus
 bin/nautilus-autorun-software
 bin/nautilus-connect-server
@@ -17,6 +17,9 @@ 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-computer.desktop
 share/applications/nautilus-file-management-properties.desktop
@@ -25,6 +28,29 @@ share/applications/nautilus-home.desktop
 share/applications/nautilus.desktop
 share/applications/network-scheme.desktop
 share/gconf/schemas/apps_nautilus_preferences.schemas
+share/gtk-doc/html/libnautilus-extension/NautilusColumn.html
+share/gtk-doc/html/libnautilus-extension/NautilusMenuItem.html
+share/gtk-doc/html/libnautilus-extension/NautilusPropertyPage.html
+share/gtk-doc/html/libnautilus-extension/ch01.html
+share/gtk-doc/html/libnautilus-extension/home.png
+share/gtk-doc/html/libnautilus-extension/index.html
+share/gtk-doc/html/libnautilus-extension/index.sgml
+share/gtk-doc/html/libnautilus-extension/ix01.html
+share/gtk-doc/html/libnautilus-extension/left.png
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-extension-i18n.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-extension-types.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-file-info.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-info-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-location-widget-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page-provider.html
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp
+share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp2
+share/gtk-doc/html/libnautilus-extension/pt01.html
+share/gtk-doc/html/libnautilus-extension/right.png
+share/gtk-doc/html/libnautilus-extension/style.css
+share/gtk-doc/html/libnautilus-extension/up.png
 share/icons/hicolor/16x16/apps/nautilus.png
 share/icons/hicolor/22x22/apps/nautilus.png
 share/icons/hicolor/24x24/apps/nautilus.png
@@ -59,6 +85,7 @@ share/locale/eu/LC_MESSAGES/nautilus.mo
 share/locale/fa/LC_MESSAGES/nautilus.mo
 share/locale/fi/LC_MESSAGES/nautilus.mo
 share/locale/fr/LC_MESSAGES/nautilus.mo
+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
@@ -68,6 +95,7 @@ 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/io/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
@@ -95,6 +123,7 @@ share/locale/oc/LC_MESSAGES/nautilus.mo
 share/locale/or/LC_MESSAGES/nautilus.mo
 share/locale/pa/LC_MESSAGES/nautilus.mo
 share/locale/pl/LC_MESSAGES/nautilus.mo
+share/locale/ps/LC_MESSAGES/nautilus.mo
 share/locale/pt/LC_MESSAGES/nautilus.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus.mo
 share/locale/ro/LC_MESSAGES/nautilus.mo
@@ -105,8 +134,8 @@ share/locale/sk/LC_MESSAGES/nautilus.mo
 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/sr@latin/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
 share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/te/LC_MESSAGES/nautilus.mo
@@ -188,6 +217,7 @@ share/pixmaps/nautilus/thumbnail_frame.png
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/gtk-doc/html/libnautilus-extension
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 9d89812d6d3..9873651db91 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.37 2008/09/15 23:56:48 jmcneill Exp $
+$NetBSD: distinfo,v 1.38 2008/10/16 17:58:00 drochner Exp $
 
-SHA1 (nautilus-2.22.5.1.tar.bz2) = 81c1d875779f5d95ad7bf7dc18ab8a8244abb429
-RMD160 (nautilus-2.22.5.1.tar.bz2) = 102c5608e3dbf9815cb9b82262799ac0001870a4
-Size (nautilus-2.22.5.1.tar.bz2) = 5017090 bytes
+SHA1 (nautilus-2.24.0.tar.bz2) = 3ffb3958b113070f3b12a9390e58ee9421e4da01
+RMD160 (nautilus-2.24.0.tar.bz2) = afa130c84653e5f67730026410dfdd838cfcca38
+Size (nautilus-2.24.0.tar.bz2) = 5263812 bytes
 SHA1 (patch-af) = 7b6d50ff805ed971ebe96d1d91a563a19220ebc7
 SHA1 (patch-aj) = d905ae52f35bd4fa11a9c10a0c7423aa5e04f8b9
 SHA1 (patch-ak) = e1548234ee9c96b0727710498e8f29a41a6df759
 SHA1 (patch-al) = 28dd784185c8fceef55fcb743731c1e2069510cc
-SHA1 (patch-am) = aa4f29719a60223f68f5b56378ae415cfc9bf12f
diff --git a/sysutils/nautilus/patches/patch-am b/sysutils/nautilus/patches/patch-am
deleted file mode 100644
index 3ae342deaf0..00000000000
--- a/sysutils/nautilus/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2008/09/15 23:56:48 jmcneill Exp $
-
---- libnautilus-private/nautilus-file.c.orig	2008-09-15 19:50:13.000000000 -0400
-+++ libnautilus-private/nautilus-file.c	2008-09-15 19:50:38.000000000 -0400
-@@ -65,6 +65,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <unistd.h>
-