summaryrefslogtreecommitdiff
path: root/sysutils/gnome-vfs
diff options
context:
space:
mode:
authortnn <tnn>2011-04-27 17:50:25 +0000
committertnn <tnn>2011-04-27 17:50:25 +0000
commit965a69df2854770b908a2d30dfb51e4a06d77884 (patch)
treef5f5805423aa52dbf33da59c8d5e3b86e660c36a /sysutils/gnome-vfs
parent41ee4984328b5eb5dde82c0ba116403db5b05ca6 (diff)
downloadpkgsrc-965a69df2854770b908a2d30dfb51e4a06d77884.tar.gz
Fix fallout from gnutls update. gnome-vfs wants a symbol from libgcrypt,
so should link with it explicitly.
Diffstat (limited to 'sysutils/gnome-vfs')
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs/distinfo4
-rw-r--r--sysutils/gnome-vfs/patches/patch-bc15
3 files changed, 16 insertions, 7 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 7b9ffddb20a..04139db55bf 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2011/04/22 13:42:20 obache Exp $
+# $NetBSD: Makefile,v 1.85 2011/04/27 17:50:25 tnn Exp $
-PKGREVISION= 3
+PKGREVISION= 4
PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 2cafb6115b9..6c12b3b1df8 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2010/10/22 20:11:16 drochner Exp $
+$NetBSD: distinfo,v 1.32 2011/04/27 17:50:25 tnn Exp $
SHA1 (gnome-vfs-2.24.4.tar.bz2) = 0dc634e7dd979fd218f378902c0ca1af80738961
RMD160 (gnome-vfs-2.24.4.tar.bz2) = 6a5952bea02dfc96782b6f1129fe765f5313a75b
@@ -17,7 +17,7 @@ SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db
SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3
-SHA1 (patch-bc) = 935965b6dda90d891e8e46da87d34690c4efa88b
+SHA1 (patch-bc) = 1b6d2224abe6d8d82892266ce91543763b7ab3a2
SHA1 (patch-bd) = 28cee53d3cecb18fe3b0c66b73bcece231e6fc42
SHA1 (patch-cb) = 370c75a72d8575051bb5f02d54fdd4a191ac00eb
SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29
diff --git a/sysutils/gnome-vfs/patches/patch-bc b/sysutils/gnome-vfs/patches/patch-bc
index 1bb78effd40..158c408e402 100644
--- a/sysutils/gnome-vfs/patches/patch-bc
+++ b/sysutils/gnome-vfs/patches/patch-bc
@@ -1,10 +1,11 @@
-$NetBSD: patch-bc,v 1.2 2008/04/01 18:05:37 drochner Exp $
+$NetBSD: patch-bc,v 1.3 2011/04/27 17:50:25 tnn Exp $
Stick to the pkgsrc conventions of the locale directory.
+Add -lgcrypt for gcry_control symbol.
---- libgnomevfs/Makefile.in.orig 2007-11-12 10:30:11.000000000 +0100
+--- libgnomevfs/Makefile.in.orig 2010-09-28 09:35:22.000000000 +0000
+++ libgnomevfs/Makefile.in
-@@ -425,12 +425,11 @@ INCLUDES = \
+@@ -430,12 +430,11 @@ INCLUDES = \
-D_LARGEFILE64_SOURCE \
-D_POSIX_PTHREAD_SEMANTICS \
-D_REENTRANT \
@@ -18,3 +19,11 @@ Stick to the pkgsrc conventions of the locale directory.
-DGNOME_VFS_SYSCONFDIR=\"$(sysconfdir)\"\
-DG_LOG_DOMAIN=\"libgnomevfs\" \
$(NULL)
+@@ -496,6 +495,7 @@ libgnomevfs_2_la_LIBADD = \
+ $(SOCKET_LIBS) \
+ $(INTLLIBS) \
+ $(SELINUX_LIBS) \
++ -lgcrypt \
+ $(NULL)
+
+ libgnomevfs_2_la_LDFLAGS = \