Update to 2.12.1.

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

14 files changed, 34 insertions, 84 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 929615658..f09354d91 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.110 2005/09/12 06:34:53 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.111 2005/09/20 05:50:55 marcus Exp $
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.12.0
-PORTREVISION=	2
+PORTVERSION=	2.12.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.12
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index ef74581d7..d99c78971 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.12.0.tar.bz2) = 3323e7472a736716150337d2fc564a43
-SIZE (gnome2/gnome-vfs-2.12.0.tar.bz2) = 1728140
+MD5 (gnome2/gnome-vfs-2.12.1.tar.bz2) = 95b0308d49aba17b9cb36c84f8467017
+SIZE (gnome2/gnome-vfs-2.12.1.tar.bz2) = 1725467
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
index 78bc2c325..383987654 100644
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@@ -1,11 +1,11 @@
---- modules/Makefile.in.orig	Wed Aug 24 16:28:06 2005
-+++ modules/Makefile.in	Wed Aug 24 16:49:07 2005
-@@ -337,7 +337,7 @@
- @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
+--- modules/Makefile.in.orig	Mon Oct  3 11:55:14 2005
++++ modules/Makefile.in	Mon Oct  3 11:55:55 2005
+@@ -465,7 +465,7 @@
+ @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
  @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
- 
+ @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
 -module_flags = -export_dynamic -avoid-version -module -no-undefined
 +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
  modules_LTLIBRARIES = \
+ 	$(CDDA_LTLIBS)				\
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
index 927861f39..088433c51 100644
--- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-2.0.pc.in.orig	Sun May 22 23:05:33 2005
-+++ gnome-vfs-2.0.pc.in	Sun May 22 23:05:46 2005
+--- gnome-vfs-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
++++ gnome-vfs-2.0.pc.in	Mon Oct  3 12:00:02 2005
 @@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system libraries
  Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0
+ Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
 -Libs: -L${libdir} -lgnomevfs-2
 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
  Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
index 1d8d87e30..c3f0d2c30 100644
--- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-module-2.0.pc.in.orig	Sun May 22 23:06:38 2005
-+++ gnome-vfs-module-2.0.pc.in	Sun May 22 23:06:45 2005
-@@ -8,5 +8,5 @@ Name: gnome-vfs-module
+--- gnome-vfs-module-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
++++ gnome-vfs-module-2.0.pc.in	Mon Oct  3 12:01:04 2005
+@@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system module include info
  Version: @VERSION@
- Requires: bonobo-activation-2.0,gthread-2.0,gmodule-no-export-2.0
+ Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
 -Libs: -L${libdir} -lgnomevfs-2
 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
  Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-uri.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-uri.c
deleted file mode 100644
index 12b8f06ff..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-uri.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnomevfs/gnome-vfs-uri.c.orig	Tue Sep 20 01:42:29 2005
-+++ libgnomevfs/gnome-vfs-uri.c	Tue Sep 20 01:48:49 2005
-@@ -844,6 +844,12 @@ make_full_uri_from_relative (const char 
- 				char *tmp = separator - 1;
- 				if ((separator != mutable_base_uri) && (*tmp != '/')) {
- 					*separator = '\0';
-+				} else {
-+					/* Maybe there is no domain part and this is a toplevel URI's child */
-+					char *tmp2 = strstr (mutable_base_uri, ":///");
-+					if (tmp2 != NULL && tmp2 + 3 == separator) {
-+						*(separator + 1) = '\0';
-+					}
- 				}
- 			}
- 		}
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
index 711a98502..97c617b85 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -8,12 +8,3 @@
  						  "pixmaps",
  						  relative_filename,
  						  NULL);
-@@ -1992,7 +2000,7 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
- 								       info->symlink_name);
- 			if (*p != 0) {
- 				gnome_vfs_uri_unref (uri);
--				uri = gnome_vfs_uri_append_path (resolved_uri, p);
-+				uri = gnome_vfs_uri_append_string (resolved_uri, p);
- 				gnome_vfs_uri_unref (resolved_uri);
- 			} else {
- 				gnome_vfs_uri_unref (uri);
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 929615658..f09354d91 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.110 2005/09/12 06:34:53 marcus Exp $
+#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.111 2005/09/20 05:50:55 marcus Exp $
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.12.0
-PORTREVISION=	2
+PORTVERSION=	2.12.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.12
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index ef74581d7..d99c78971 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.12.0.tar.bz2) = 3323e7472a736716150337d2fc564a43
-SIZE (gnome2/gnome-vfs-2.12.0.tar.bz2) = 1728140
+MD5 (gnome2/gnome-vfs-2.12.1.tar.bz2) = 95b0308d49aba17b9cb36c84f8467017
+SIZE (gnome2/gnome-vfs-2.12.1.tar.bz2) = 1725467
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
index 78bc2c325..383987654 100644
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@@ -1,11 +1,11 @@
---- modules/Makefile.in.orig	Wed Aug 24 16:28:06 2005
-+++ modules/Makefile.in	Wed Aug 24 16:49:07 2005
-@@ -337,7 +337,7 @@
- @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
+--- modules/Makefile.in.orig	Mon Oct  3 11:55:14 2005
++++ modules/Makefile.in	Mon Oct  3 11:55:55 2005
+@@ -465,7 +465,7 @@
+ @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
  @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
- 
+ @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
 -module_flags = -export_dynamic -avoid-version -module -no-undefined
 +module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
  modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
  modules_LTLIBRARIES = \
+ 	$(CDDA_LTLIBS)				\
diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
index 927861f39..088433c51 100644
--- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
+++ b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-2.0.pc.in.orig	Sun May 22 23:05:33 2005
-+++ gnome-vfs-2.0.pc.in	Sun May 22 23:05:46 2005
+--- gnome-vfs-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
++++ gnome-vfs-2.0.pc.in	Mon Oct  3 12:00:02 2005
 @@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system libraries
  Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0
+ Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
 -Libs: -L${libdir} -lgnomevfs-2
 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
  Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
index 1d8d87e30..c3f0d2c30 100644
--- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
+++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-module-2.0.pc.in.orig	Sun May 22 23:06:38 2005
-+++ gnome-vfs-module-2.0.pc.in	Sun May 22 23:06:45 2005
-@@ -8,5 +8,5 @@ Name: gnome-vfs-module
+--- gnome-vfs-module-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
++++ gnome-vfs-module-2.0.pc.in	Mon Oct  3 12:01:04 2005
+@@ -8,5 +8,5 @@
  Description: The GNOME virtual file-system module include info
  Version: @VERSION@
- Requires: bonobo-activation-2.0,gthread-2.0,gmodule-no-export-2.0
+ Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
 -Libs: -L${libdir} -lgnomevfs-2
 +Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
  Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-uri.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-uri.c
deleted file mode 100644
index 12b8f06ff..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-uri.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnomevfs/gnome-vfs-uri.c.orig	Tue Sep 20 01:42:29 2005
-+++ libgnomevfs/gnome-vfs-uri.c	Tue Sep 20 01:48:49 2005
-@@ -844,6 +844,12 @@ make_full_uri_from_relative (const char 
- 				char *tmp = separator - 1;
- 				if ((separator != mutable_base_uri) && (*tmp != '/')) {
- 					*separator = '\0';
-+				} else {
-+					/* Maybe there is no domain part and this is a toplevel URI's child */
-+					char *tmp2 = strstr (mutable_base_uri, ":///");
-+					if (tmp2 != NULL && tmp2 + 3 == separator) {
-+						*(separator + 1) = '\0';
-+					}
- 				}
- 			}
- 		}
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index 711a98502..97c617b85 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -8,12 +8,3 @@
  						  "pixmaps",
  						  relative_filename,
  						  NULL);
-@@ -1992,7 +2000,7 @@ _gnome_vfs_uri_resolve_all_symlinks_uri 
- 								       info->symlink_name);
- 			if (*p != 0) {
- 				gnome_vfs_uri_unref (uri);
--				uri = gnome_vfs_uri_append_path (resolved_uri, p);
-+				uri = gnome_vfs_uri_append_string (resolved_uri, p);
- 				gnome_vfs_uri_unref (resolved_uri);
- 			} else {
- 				gnome_vfs_uri_unref (uri);