Update to 2.11.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4162 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 44 insertions, 8 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 013bea228..860abd763 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.80 2005/06/28 05:40:13 adamw Exp $
+#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.81 2005/07/01 18:09:28 marcus Exp $
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.11.2
+PORTVERSION=	2.11.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.11
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 39f198539..ce5483c8b 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.11.2.tar.bz2) = 57c50ecd0cb2d64e3f078ac72c925ee6
-SIZE (gnome2/nautilus-2.11.2.tar.bz2) = 5968650
+MD5 (gnome2/nautilus-2.11.3.tar.bz2) = 812af18aae3ca98d64bc2d508730b06f
+SIZE (gnome2/nautilus-2.11.3.tar.bz2) = 4017658
diff --git a/x11-fm/nautilus/files/patch-src_nautilus-bookmark-list.c b/x11-fm/nautilus/files/patch-src_nautilus-bookmark-list.c
new file mode 100644
index 000000000..4d576a708
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-src_nautilus-bookmark-list.c
@@ -0,0 +1,18 @@
+--- src/nautilus-bookmark-list.c.orig	Sun Jul  3 18:33:29 2005
++++ src/nautilus-bookmark-list.c	Sun Jul  3 18:33:40 2005
+@@ -449,6 +449,7 @@ static void
+ nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks)
+ {
+ 	char *filename, *contents;
++	GError **error = NULL;
+ 
+ 	filename = nautilus_bookmark_list_get_file_path ();
+ 
+@@ -462,7 +463,6 @@ nautilus_bookmark_list_load_file (Nautil
+ 	}
+ 
+ 	/* Read new list from file */
+-	GError **error = NULL;
+ 	if (g_file_get_contents (filename, &contents, NULL, error)) {
+         	char **lines;
+       		int i;
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 013bea228..860abd763 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.80 2005/06/28 05:40:13 adamw Exp $
+#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.81 2005/07/01 18:09:28 marcus Exp $
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.11.2
+PORTVERSION=	2.11.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.11
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 39f198539..ce5483c8b 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.11.2.tar.bz2) = 57c50ecd0cb2d64e3f078ac72c925ee6
-SIZE (gnome2/nautilus-2.11.2.tar.bz2) = 5968650
+MD5 (gnome2/nautilus-2.11.3.tar.bz2) = 812af18aae3ca98d64bc2d508730b06f
+SIZE (gnome2/nautilus-2.11.3.tar.bz2) = 4017658
diff --git a/x11-fm/nautilus2/files/patch-src_nautilus-bookmark-list.c b/x11-fm/nautilus2/files/patch-src_nautilus-bookmark-list.c
new file mode 100644
index 000000000..4d576a708
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-src_nautilus-bookmark-list.c
@@ -0,0 +1,18 @@
+--- src/nautilus-bookmark-list.c.orig	Sun Jul  3 18:33:29 2005
++++ src/nautilus-bookmark-list.c	Sun Jul  3 18:33:40 2005
+@@ -449,6 +449,7 @@ static void
+ nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks)
+ {
+ 	char *filename, *contents;
++	GError **error = NULL;
+ 
+ 	filename = nautilus_bookmark_list_get_file_path ();
+ 
+@@ -462,7 +463,6 @@ nautilus_bookmark_list_load_file (Nautil
+ 	}
+ 
+ 	/* Read new list from file */
+-	GError **error = NULL;
+ 	if (g_file_get_contents (filename, &contents, NULL, error)) {
+         	char **lines;
+       		int i;