Update to 2.12.0.

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

6 files changed, 28 insertions, 26 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 55c786f2d..8a6a94ad9 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,14 +3,14 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.86 2005/08/09 05:11:18 marcus Exp $
+#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.87 2005/08/23 03:03:32 marcus Exp $
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.11.92
+PORTVERSION=	2.12.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.11
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
 DISTNAME=	nautilus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index b9083d868..67dd4e8be 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.11.92.tar.bz2) = 8ee9569339fa79ffa4f61f294d124201
-SIZE (gnome2/nautilus-2.11.92.tar.bz2) = 3994853
+MD5 (gnome2/nautilus-2.12.0.tar.bz2) = f38ae8d066b822317d18efa1e2c543df
+SIZE (gnome2/nautilus-2.12.0.tar.bz2) = 4073980
diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c
index d80a314d1..d6465800a 100644
--- a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c
@@ -1,9 +1,9 @@
---- libnautilus-private/nautilus-file-operations.c.orig	Sun Jul 31 13:44:00 2005
-+++ libnautilus-private/nautilus-file-operations.c	Sun Jul 31 14:23:47 2005
-@@ -2453,12 +2453,21 @@ nautilus_file_operations_new_file (GtkWi
- 				   NautilusNewFileCallback done_callback,
+--- libnautilus-private/nautilus-file-operations.c.orig	Thu Aug 25 10:28:10 2005
++++ libnautilus-private/nautilus-file-operations.c	Mon Sep  5 17:09:55 2005
+@@ -2481,12 +2481,22 @@
  				   gpointer data)
  {
+ 	struct NewFileData *new_data;
 -	char source_file_str[] = "/tmp/nautilus-sourceXXXXXX";
 +	char *source_file_str;
  	char *source_file_uri;
@@ -19,13 +19,14 @@
 +	}
 +
 +	source_file_str = g_build_filename (gnome_vfs_uri_get_path (parent_uri),
-+                                            "nautilus-sourceXXXXXX", NULL);
++						"nautilus-sourceXXXXXX", NULL);
++
  	fd = mkstemp (source_file_str);
  	if (fd == -1) {
  		(*done_callback) (NULL, data);
-@@ -2486,6 +2495,8 @@ nautilus_file_operations_new_file (GtkWi
- 							 done_callback,
- 							 data);
+@@ -2518,6 +2528,8 @@
+ 							 new_file_from_temp_callback,
+ 							 new_data);
  
 +	gnome_vfs_uri_unref (parent_uri);
 +	g_free (source_file_str);
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 55c786f2d..8a6a94ad9 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -3,14 +3,14 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.86 2005/08/09 05:11:18 marcus Exp $
+#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.87 2005/08/23 03:03:32 marcus Exp $
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.11.92
+PORTVERSION=	2.12.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.11
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
 DISTNAME=	nautilus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index b9083d868..67dd4e8be 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.11.92.tar.bz2) = 8ee9569339fa79ffa4f61f294d124201
-SIZE (gnome2/nautilus-2.11.92.tar.bz2) = 3994853
+MD5 (gnome2/nautilus-2.12.0.tar.bz2) = f38ae8d066b822317d18efa1e2c543df
+SIZE (gnome2/nautilus-2.12.0.tar.bz2) = 4073980
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c
index d80a314d1..d6465800a 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c
@@ -1,9 +1,9 @@
---- libnautilus-private/nautilus-file-operations.c.orig	Sun Jul 31 13:44:00 2005
-+++ libnautilus-private/nautilus-file-operations.c	Sun Jul 31 14:23:47 2005
-@@ -2453,12 +2453,21 @@ nautilus_file_operations_new_file (GtkWi
- 				   NautilusNewFileCallback done_callback,
+--- libnautilus-private/nautilus-file-operations.c.orig	Thu Aug 25 10:28:10 2005
++++ libnautilus-private/nautilus-file-operations.c	Mon Sep  5 17:09:55 2005
+@@ -2481,12 +2481,22 @@
  				   gpointer data)
  {
+ 	struct NewFileData *new_data;
 -	char source_file_str[] = "/tmp/nautilus-sourceXXXXXX";
 +	char *source_file_str;
  	char *source_file_uri;
@@ -19,13 +19,14 @@
 +	}
 +
 +	source_file_str = g_build_filename (gnome_vfs_uri_get_path (parent_uri),
-+                                            "nautilus-sourceXXXXXX", NULL);
++						"nautilus-sourceXXXXXX", NULL);
++
  	fd = mkstemp (source_file_str);
  	if (fd == -1) {
  		(*done_callback) (NULL, data);
-@@ -2486,6 +2495,8 @@ nautilus_file_operations_new_file (GtkWi
- 							 done_callback,
- 							 data);
+@@ -2518,6 +2528,8 @@
+ 							 new_file_from_temp_callback,
+ 							 new_data);
  
 +	gnome_vfs_uri_unref (parent_uri);
 +	g_free (source_file_str);