summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-06 02:19:23 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-06 02:19:23 +0800
commit151a27bfd83950cd70a7ffe4be8ee779c1ca95b0 (patch)
tree99c37e8ac8b349604ac79fa18ddb92bdf3729053
parentdf37e0009509835917412f0052734be14e75d1ec (diff)
downloadmarcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.tar
marcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.tar.gz
marcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.tar.bz2
marcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.tar.lz
marcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.tar.xz
marcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.tar.zst
marcuscom-ports-151a27bfd83950cd70a7ffe4be8ee779c1ca95b0.zip
Update to 2.12.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4718 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/gnome-vfs/Makefile7
-rw-r--r--devel/gnome-vfs/distinfo4
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c57
-rw-r--r--devel/gnomevfs2/Makefile7
-rw-r--r--devel/gnomevfs2/distinfo4
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c57
6 files changed, 10 insertions, 126 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 7507316e4..d0469eaf3 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.105 2005/08/24 16:07:34 marcus Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.106 2005/08/28 06:12:29 marcus Exp $
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.11.92
-PORTREVISION= 1
+PORTVERSION= 2.12.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/2.11
+MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index cbfd5a4d0..ef74581d7 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.11.92.tar.bz2) = 18c8c5127d1eebfd51c8b6d631f3c949
-SIZE (gnome2/gnome-vfs-2.11.92.tar.bz2) = 1705543
+MD5 (gnome2/gnome-vfs-2.12.0.tar.bz2) = 3323e7472a736716150337d2fc564a43
+SIZE (gnome2/gnome-vfs-2.12.0.tar.bz2) = 1728140
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c
deleted file mode 100644
index 693ade8b7..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- libgnomevfs/gnome-vfs-mime.c.orig Sun Aug 28 02:00:22 2005
-+++ libgnomevfs/gnome-vfs-mime.c Sun Aug 28 02:07:11 2005
-@@ -211,7 +211,7 @@ _gnome_vfs_get_mime_type_internal (Gnome
-
- if (buffer != NULL) {
- result = _gnome_vfs_read_mime_from_buffer (buffer);
--
-+
- if (result != NULL && result != XDG_MIME_TYPE_UNKNOWN) {
-
- if ((strcmp (result, "application/x-ole-storage") == 0) ||
-@@ -229,9 +229,13 @@ _gnome_vfs_get_mime_type_internal (Gnome
- result = fn_result;
- }
-
-- } else if (fn_result && fn_result != XDG_MIME_TYPE_UNKNOWN &&
-+ } else {
-+ G_LOCK (mime_mutex);
-+ if (fn_result && fn_result != XDG_MIME_TYPE_UNKNOWN &&
- xdg_mime_mime_type_subclass (fn_result, result)) {
-- result = fn_result;
-+ result = fn_result;
-+ }
-+ G_UNLOCK (mime_mutex);
- }
-
- return result;
-@@ -243,18 +247,27 @@ _gnome_vfs_get_mime_type_internal (Gnome
- * accurate source of type information BUT _only_ if
- * the extension is a subtype of text/plain.
- */
-+ G_LOCK (mime_mutex);
- if ((fn_result != NULL) && (fn_result != XDG_MIME_TYPE_UNKNOWN) &&
- xdg_mime_mime_type_subclass (fn_result, "text/plain")) {
-+ G_UNLOCK (mime_mutex);
- return fn_result;
- }
-
- /* Didn't find an extension match, assume plain text. */
-+ G_UNLOCK (mime_mutex);
- return "text/plain";
-
-- } else if (_gnome_vfs_sniff_buffer_looks_like_mp3 (buffer)) {
-- return "audio/mpeg";
-+ } else {
-+ G_LOCK (mime_mutex);
-+ if (_gnome_vfs_sniff_buffer_looks_like_mp3 (buffer)) {
-+ G_UNLOCK (mime_mutex);
-+ return "audio/mpeg";
-+ }
-+ G_UNLOCK (mime_mutex);
- }
- }
-+
- }
-
- if (use_suffix &&
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 7507316e4..d0469eaf3 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.105 2005/08/24 16:07:34 marcus Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.106 2005/08/28 06:12:29 marcus Exp $
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.11.92
-PORTREVISION= 1
+PORTVERSION= 2.12.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/2.11
+MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index cbfd5a4d0..ef74581d7 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.11.92.tar.bz2) = 18c8c5127d1eebfd51c8b6d631f3c949
-SIZE (gnome2/gnome-vfs-2.11.92.tar.bz2) = 1705543
+MD5 (gnome2/gnome-vfs-2.12.0.tar.bz2) = 3323e7472a736716150337d2fc564a43
+SIZE (gnome2/gnome-vfs-2.12.0.tar.bz2) = 1728140
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c
deleted file mode 100644
index 693ade8b7..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- libgnomevfs/gnome-vfs-mime.c.orig Sun Aug 28 02:00:22 2005
-+++ libgnomevfs/gnome-vfs-mime.c Sun Aug 28 02:07:11 2005
-@@ -211,7 +211,7 @@ _gnome_vfs_get_mime_type_internal (Gnome
-
- if (buffer != NULL) {
- result = _gnome_vfs_read_mime_from_buffer (buffer);
--
-+
- if (result != NULL && result != XDG_MIME_TYPE_UNKNOWN) {
-
- if ((strcmp (result, "application/x-ole-storage") == 0) ||
-@@ -229,9 +229,13 @@ _gnome_vfs_get_mime_type_internal (Gnome
- result = fn_result;
- }
-
-- } else if (fn_result && fn_result != XDG_MIME_TYPE_UNKNOWN &&
-+ } else {
-+ G_LOCK (mime_mutex);
-+ if (fn_result && fn_result != XDG_MIME_TYPE_UNKNOWN &&
- xdg_mime_mime_type_subclass (fn_result, result)) {
-- result = fn_result;
-+ result = fn_result;
-+ }
-+ G_UNLOCK (mime_mutex);
- }
-
- return result;
-@@ -243,18 +247,27 @@ _gnome_vfs_get_mime_type_internal (Gnome
- * accurate source of type information BUT _only_ if
- * the extension is a subtype of text/plain.
- */
-+ G_LOCK (mime_mutex);
- if ((fn_result != NULL) && (fn_result != XDG_MIME_TYPE_UNKNOWN) &&
- xdg_mime_mime_type_subclass (fn_result, "text/plain")) {
-+ G_UNLOCK (mime_mutex);
- return fn_result;
- }
-
- /* Didn't find an extension match, assume plain text. */
-+ G_UNLOCK (mime_mutex);
- return "text/plain";
-
-- } else if (_gnome_vfs_sniff_buffer_looks_like_mp3 (buffer)) {
-- return "audio/mpeg";
-+ } else {
-+ G_LOCK (mime_mutex);
-+ if (_gnome_vfs_sniff_buffer_looks_like_mp3 (buffer)) {
-+ G_UNLOCK (mime_mutex);
-+ return "audio/mpeg";
-+ }
-+ G_UNLOCK (mime_mutex);
- }
- }
-+
- }
-
- if (use_suffix &&