Disable gnutls support -- this version of libsoup uses an

obsolete interface to gnutls. Bump PKGREVISION and depend on it.

5 files changed, 7 insertions, 22 deletions

diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 96ee4c3e83d..b69a294da41 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:17:54 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/02/19 22:46:44 wiz Exp $
 #
 
 DISTNAME=		libsoup-1.99.28
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libsoup/1.99/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,6 +22,5 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libsoup/PLIST b/net/libsoup/PLIST
index c3fea718778..69ccfefa6fa 100644
--- a/net/libsoup/PLIST
+++ b/net/libsoup/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/02/19 22:46:44 wiz Exp $
 include/soup-2.0/libsoup/soup-address.h
 include/soup-2.0/libsoup/soup-context.h
 include/soup-2.0/libsoup/soup-error.h
@@ -14,5 +14,6 @@ include/soup-2.0/libsoup/soup-uri.h
 include/soup-2.0/libsoup/soup.h
 lib/libsoup-2.0.la
 lib/pkgconfig/soup-2.0.pc
+libexec/libsoup-ssl-proxy
 @dirrm include/soup-2.0/libsoup
 @dirrm include/soup-2.0
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index a8df23eca4d..9a967b28dd0 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:17:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/02/19 22:46:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
@@ -11,14 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup}
 BUILDLINK_PACKAGES+=	libsoup
 
 .if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup+=	libsoup>=1.99.28
-BUILDLINK_RECOMMENDED.libsoup+=	libsoup>=1.99.28nb2
+BUILDLINK_DEPENDS.libsoup+=	libsoup>=1.99.28nb3
 BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
 .endif	# LIBSOUP_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libsoup/distinfo b/net/libsoup/distinfo
index 84eb07ba235..da293ee8cc5 100644
--- a/net/libsoup/distinfo
+++ b/net/libsoup/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/04/02 18:09:56 recht Exp $
+$NetBSD: distinfo,v 1.4 2005/02/19 22:46:44 wiz Exp $
 
 SHA1 (libsoup-1.99.28.tar.bz2) = bd2af804dae4ade4e4a79163e0f9e808bafa64f1
 Size (libsoup-1.99.28.tar.bz2) = 233412 bytes
-SHA1 (patch-aa) = 616147211ad655dfae60fa8f0a62291d8a15be9c
diff --git a/net/libsoup/patches/patch-aa b/net/libsoup/patches/patch-aa
deleted file mode 100644
index 5814dd4698b..00000000000
--- a/net/libsoup/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/04/02 18:09:56 recht Exp $
-
---- libsoup/soup-gnutls.c.orig	2004-04-02 18:25:12.000000000 +0200
-+++ libsoup/soup-gnutls.c
-@@ -77,7 +77,6 @@ verify_certificate (gnutls_session sessi
- 
- 	if (status & GNUTLS_CERT_INVALID ||
- 	    status & GNUTLS_CERT_NOT_TRUSTED ||
--	    status & GNUTLS_CERT_CORRUPTED ||
- 	    status & GNUTLS_CERT_REVOKED)
- 	{
- 		g_warning ("The certificate is not trusted.");