update to 2.20.0

This switches to the new gnome-2.20 branch.

5 files changed, 32 insertions, 16 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index e616f5ce8b5..7f1c7d9f66e 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.84 2007/09/21 13:04:20 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2007/11/05 19:10:29 drochner Exp $
 #
 
-DISTNAME=		nautilus-2.18.3
-PKGREVISION=		4
+DISTNAME=		nautilus-2.20.0
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index ab1dbb0b0cf..f258011a102 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/09/25 10:54:18 hira Exp $
+@comment $NetBSD: PLIST,v 1.21 2007/11/05 19:10:29 drochner Exp $
 bin/nautilus
 bin/nautilus-connect-server
 bin/nautilus-file-management-properties
@@ -31,6 +31,7 @@ share/icons/hicolor/scalable/apps/nautilus.svg
 share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
 share/locale/ar/LC_MESSAGES/nautilus.mo
+share/locale/as/LC_MESSAGES/nautilus.mo
 share/locale/az/LC_MESSAGES/nautilus.mo
 share/locale/be/LC_MESSAGES/nautilus.mo
 share/locale/be@latin/LC_MESSAGES/nautilus.mo
@@ -69,6 +70,7 @@ share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
 share/locale/ka/LC_MESSAGES/nautilus.mo
 share/locale/km/LC_MESSAGES/nautilus.mo
+share/locale/kn/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
 share/locale/ku/LC_MESSAGES/nautilus.mo
 share/locale/li/LC_MESSAGES/nautilus.mo
@@ -94,6 +96,7 @@ share/locale/pt_BR/LC_MESSAGES/nautilus.mo
 share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/rw/LC_MESSAGES/nautilus.mo
+share/locale/si/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
 share/locale/sq/LC_MESSAGES/nautilus.mo
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 69cfbd17b1d..afd8c171107 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2007/07/13 17:25:52 drochner Exp $
+$NetBSD: distinfo,v 1.32 2007/11/05 19:10:29 drochner Exp $
 
-SHA1 (nautilus-2.18.3.tar.bz2) = 3f8eb87aa12080b67cb1f472655c10f03b440d4d
-RMD160 (nautilus-2.18.3.tar.bz2) = 2069e1e9bb00c1ef6d942b114f8acda4776a06b0
-Size (nautilus-2.18.3.tar.bz2) = 4331118 bytes
-SHA1 (patch-af) = 0c2403514de7e602faa2d5867d80a17e5ee595ac
+SHA1 (nautilus-2.20.0.tar.bz2) = f6a75a854728ef308e2721424a9638d228661b1d
+RMD160 (nautilus-2.20.0.tar.bz2) = 9eeb18c886795ebbdd6dfc61ccddaee8eab81808
+Size (nautilus-2.20.0.tar.bz2) = 4916284 bytes
+SHA1 (patch-af) = 7b6d50ff805ed971ebe96d1d91a563a19220ebc7
 SHA1 (patch-ai) = 3d460b4688f70628320ace3054718fa248c5602c
+SHA1 (patch-aj) = d905ae52f35bd4fa11a9c10a0c7423aa5e04f8b9
diff --git a/sysutils/nautilus/patches/patch-af b/sysutils/nautilus/patches/patch-af
index c415da46b0d..569f517eb2b 100644
--- a/sysutils/nautilus/patches/patch-af
+++ b/sysutils/nautilus/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.3 2006/01/06 16:53:49 wiz Exp $
+$NetBSD: patch-af,v 1.4 2007/11/05 19:10:29 drochner Exp $
 
---- src/nautilus-main.c.orig	2005-08-17 21:16:10.000000000 +0200
+--- src/nautilus-main.c.orig	2007-07-24 11:56:20.000000000 +0200
 +++ src/nautilus-main.c
-@@ -58,6 +58,24 @@
- #include <string.h>
- #include <unistd.h>
+@@ -67,6 +67,24 @@
+ #include <exempi/xmp.h>
+ #endif
  
 +#ifdef __NetBSD__
 +#include <pthread.h>
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.3 2006/01/06 16:53:49 wiz Exp $
  /* Keeps track of everyone who wants the main event loop kept active */
  static GSList *event_loop_registrants;
  
-@@ -421,6 +439,10 @@ main (int argc, char *argv[])
+@@ -538,6 +556,10 @@ main (int argc, char *argv[])
  	} else {
  		/* Run the nautilus application. */
  		application = nautilus_application_new ();
diff --git a/sysutils/nautilus/patches/patch-aj b/sysutils/nautilus/patches/patch-aj
new file mode 100644
index 00000000000..0ffe312302f
--- /dev/null
+++ b/sysutils/nautilus/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.4 2007/11/05 19:10:29 drochner Exp $
+
+--- configure.orig	2007-09-28 17:14:10.000000000 +0200
++++ configure
+@@ -24120,7 +24120,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; }
+   cat >conftest.$ac_ext <<_ACEOF