avoid gnutls, and implicit dependency on libgcrypt

bump PKGREV

5 files changed, 9 insertions, 21 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 04139db55bf..7b1c7b11141 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2011/04/27 17:50:25 tnn Exp $
+# $NetBSD: Makefile,v 1.86 2011/07/08 11:03:35 drochner Exp $
 
-PKGREVISION=		4
+PKGREVISION=		5
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index b89072e5c25..329b7712adb 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2011/04/21 11:32:02 obache Exp $
+# $NetBSD: Makefile.common,v 1.27 2011/07/08 11:03:35 drochner Exp $
 #
 # used by audio/gnome-vfs-cdda/Makefile
 # used by net/gnome-vfs-smb/Makefile
@@ -25,9 +25,7 @@ USE_LIBTOOL=		YES
 
 CONFIGURE_ARGS+=	--disable-cdda
 CONFIGURE_ARGS+=	--disable-howl
-CONFIGURE_ARGS+=	--disable-openssl
 CONFIGURE_ARGS+=	--disable-samba
-CONFIGURE_ARGS+=	--enable-gnutls
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
@@ -100,7 +98,6 @@ do-install:
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../security/gnutls/libgnutls-config.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index 4d70c1ca25b..a069c6860a1 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2011/04/22 13:42:20 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2011/07/08 11:03:36 drochner Exp $
 
 BUILDLINK_TREE+=	gnome-vfs
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.gnome-vfs?=		../../sysutils/gnome-vfs
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 
 pkgbase := gnome-vfs
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 6c12b3b1df8..244910b4955 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2011/04/27 17:50:25 tnn Exp $
+$NetBSD: distinfo,v 1.33 2011/07/08 11:03:36 drochner 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) = 1b6d2224abe6d8d82892266ce91543763b7ab3a2
+SHA1 (patch-bc) = dbea92c8f896ab242d6532be364841f6234359b4
 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 158c408e402..992a370599e 100644
--- a/sysutils/gnome-vfs/patches/patch-bc
+++ b/sysutils/gnome-vfs/patches/patch-bc
@@ -1,7 +1,6 @@
-$NetBSD: patch-bc,v 1.3 2011/04/27 17:50:25 tnn Exp $
+$NetBSD: patch-bc,v 1.4 2011/07/08 11:03:36 drochner Exp $
 
 Stick to the pkgsrc conventions of the locale directory.
-Add -lgcrypt for gcry_control symbol.
 
 --- libgnomevfs/Makefile.in.orig	2010-09-28 09:35:22.000000000 +0000
 +++ libgnomevfs/Makefile.in
@@ -19,11 +18,3 @@ Add -lgcrypt for gcry_control symbol.
  	-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 = \