[pkgsrc/trunk]: pkgsrc/net/libsoup Disable gnutls support -- this version of ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d05b1d4f933c
branches:  trunk
changeset: 489346:d05b1d4f933c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Feb 19 22:46:44 2005 +0000

description:
Disable gnutls support -- this version of libsoup uses an
obsolete interface to gnutls. Bump PKGREVISION and depend on it.

diffstat:

 net/libsoup/Makefile         |   5 ++---
 net/libsoup/PLIST            |   3 ++-
 net/libsoup/buildlink3.mk    |   6 ++----
 net/libsoup/distinfo         |   3 +--
 net/libsoup/patches/patch-aa |  12 ------------
 5 files changed, 7 insertions(+), 22 deletions(-)

diffs (88 lines):

diff -r 09b3965d6b57 -r d05b1d4f933c net/libsoup/Makefile
--- a/net/libsoup/Makefile      Sat Feb 19 22:44:25 2005 +0000
+++ b/net/libsoup/Makefile      Sat Feb 19 22:46:44 2005 +0000
@@ -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 @@
 .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 -r 09b3965d6b57 -r d05b1d4f933c net/libsoup/PLIST
--- a/net/libsoup/PLIST Sat Feb 19 22:44:25 2005 +0000
+++ b/net/libsoup/PLIST Sat Feb 19 22:46:44 2005 +0000
@@ -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.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 -r 09b3965d6b57 -r d05b1d4f933c net/libsoup/buildlink3.mk
--- a/net/libsoup/buildlink3.mk Sat Feb 19 22:44:25 2005 +0000
+++ b/net/libsoup/buildlink3.mk Sat Feb 19 22:46:44 2005 +0000
@@ -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+=   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 -r 09b3965d6b57 -r d05b1d4f933c net/libsoup/distinfo
--- a/net/libsoup/distinfo      Sat Feb 19 22:44:25 2005 +0000
+++ b/net/libsoup/distinfo      Sat Feb 19 22:46:44 2005 +0000
@@ -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 -r 09b3965d6b57 -r d05b1d4f933c net/libsoup/patches/patch-aa
--- a/net/libsoup/patches/patch-aa      Sat Feb 19 22:44:25 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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.");