Update to 1.3.4.

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

5 files changed, 5 insertions, 44 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 2879ad60c..5a6f335ec 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.48 2009/07/24 19:34:05 marcus Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.49 2009/07/31 10:43:45 kwm Exp $
 #
 
 PORTNAME=	gvfs
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index eb8c72c0f..8862e6cb5 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.3.3.tar.bz2) = 2f1c65dcde8fc4d0603e11a8ec3fc178
-SHA256 (gnome2/gvfs-1.3.3.tar.bz2) = 453476904745e355a69987bcd20c5db1bc9a1757022f8dd8c0f3b7142f3a00fd
-SIZE (gnome2/gvfs-1.3.3.tar.bz2) = 1153585
+MD5 (gnome2/gvfs-1.3.4.tar.bz2) = 4c9b83c873a3757dde0052bafcebb7dc
+SHA256 (gnome2/gvfs-1.3.4.tar.bz2) = 69b96bd8e9bdb41727f3bff9f0b336c61a85ec37032679a11388ac250a79d567
+SIZE (gnome2/gvfs-1.3.4.tar.bz2) = 1160956
diff --git a/devel/gvfs/files/patch-metadata_crc32.c b/devel/gvfs/files/patch-metadata_crc32.c
deleted file mode 100644
index 04db80b04..000000000
--- a/devel/gvfs/files/patch-metadata_crc32.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/crc32.c.orig	2009-07-24 15:23:01.000000000 -0400
-+++ metadata/crc32.c	2009-07-24 15:23:36.000000000 -0400
-@@ -82,7 +82,7 @@ static const guint32 crcTable[256] = {
- };
- 
- guint32
--crc32 (const void *ptr, size_t len)
-+metadata_crc32 (const void *ptr, size_t len)
- {
-   guint32 crc = 0xFFFFFFFF;
-   const guint8 *bp = (const guint8 *) ptr;
diff --git a/devel/gvfs/files/patch-metadata_crc32.h b/devel/gvfs/files/patch-metadata_crc32.h
deleted file mode 100644
index 0e8cf6075..000000000
--- a/devel/gvfs/files/patch-metadata_crc32.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- metadata/crc32.h.orig	2009-07-24 15:24:08.000000000 -0400
-+++ metadata/crc32.h	2009-07-24 15:23:51.000000000 -0400
-@@ -46,4 +46,4 @@
- 
- #include <glib.h>
- 
--guint32 crc32(const void *ptr, size_t len);
-+guint32 metadata_crc32(const void *ptr, size_t len);
diff --git a/devel/gvfs/files/patch-metadata_metatree.c b/devel/gvfs/files/patch-metadata_metatree.c
deleted file mode 100644
index 94b47f208..000000000
--- a/devel/gvfs/files/patch-metadata_metatree.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- metadata/metatree.c.orig	2009-07-24 15:25:43.000000000 -0400
-+++ metadata/metatree.c	2009-07-24 15:24:40.000000000 -0400
-@@ -896,7 +896,7 @@ verify_journal_entry (MetaJournal *journ
-   if (entry_len != entry_len_end)
-     return NULL;
- 
--  real_crc32 = crc32 (journal->data + offset + 8, entry_len - 8);
-+  real_crc32 = metadata_crc32 (journal->data + offset + 8, entry_len - 8);
-   if (real_crc32 != GUINT32_FROM_BE (entry->crc32))
-     return NULL;
- 
-@@ -1019,7 +1019,7 @@ meta_journal_entry_finish (GString *out)
-   len = out->len + 4;
-   append_uint32 (out, len);
-   set_uint32 (out, 0, len);
--  set_uint32 (out, 4, crc32 (out->str + 8, len - 8));
-+  set_uint32 (out, 4, metadata_crc32 (out->str + 8, len - 8));
-   return out;
- }
-