summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/libsoup/Makefile14
-rw-r--r--net/libsoup/PLIST53
-rw-r--r--net/libsoup/buildlink2.mk8
-rw-r--r--net/libsoup/buildlink3.mk8
-rw-r--r--net/libsoup/distinfo7
-rw-r--r--net/libsoup/patches/patch-aa22
6 files changed, 48 insertions, 64 deletions
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 2a7712ca5ca..cc1cf3368ba 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/01 18:32:03 jmmv Exp $
#
-DISTNAME= libsoup-1.99.26
-PKGREVISION= 1
+DISTNAME= libsoup-2.1.8
CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/1.99/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.1/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= recht@NetBSD.org
@@ -15,12 +14,13 @@ USE_BUILDLINK3= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= soup-2.0.pc.in
+PKGCONFIG_OVERRIDE+= soup-2.2.pc.in
-CONFIGURE_ARGS+= --disable-gtk-doc
+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/openssl/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 56bec5e1b48..3d3bfc9d637 100644
--- a/net/libsoup/PLIST
+++ b/net/libsoup/PLIST
@@ -1,23 +1,30 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/05 22:54:11 xtraeme 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
-include/soup-2.0/libsoup/soup-headers.h
-include/soup-2.0/libsoup/soup-message.h
-include/soup-2.0/libsoup/soup-method.h
-include/soup-2.0/libsoup/soup-misc.h
-include/soup-2.0/libsoup/soup-ntlm.h
-include/soup-2.0/libsoup/soup-server-auth.h
-include/soup-2.0/libsoup/soup-server.h
-include/soup-2.0/libsoup/soup-socket.h
-include/soup-2.0/libsoup/soup-uri.h
-include/soup-2.0/libsoup/soup.h
-lib/libsoup-2.0.a
-lib/libsoup-2.0.la
-lib/libsoup-2.0.so
-lib/libsoup-2.0.so.0
-lib/libsoup-2.0.so.0.0
-lib/pkgconfig/soup-2.0.pc
-libexec/libsoup-ssl-proxy
-@dirrm include/soup-2.0/libsoup
-@dirrm include/soup-2.0
+@comment $NetBSD: PLIST,v 1.2 2004/04/01 18:32:03 jmmv Exp $
+include/libsoup-2.2/libsoup/soup-address.h
+include/libsoup-2.2/libsoup/soup-connection.h
+include/libsoup-2.2/libsoup/soup-headers.h
+include/libsoup-2.2/libsoup/soup-message-filter.h
+include/libsoup-2.2/libsoup/soup-message-queue.h
+include/libsoup-2.2/libsoup/soup-message.h
+include/libsoup-2.2/libsoup/soup-method.h
+include/libsoup-2.2/libsoup/soup-misc.h
+include/libsoup-2.2/libsoup/soup-server-auth.h
+include/libsoup-2.2/libsoup/soup-server-message.h
+include/libsoup-2.2/libsoup/soup-server.h
+include/libsoup-2.2/libsoup/soup-session-async.h
+include/libsoup-2.2/libsoup/soup-session-sync.h
+include/libsoup-2.2/libsoup/soup-session.h
+include/libsoup-2.2/libsoup/soup-soap-message.h
+include/libsoup-2.2/libsoup/soup-soap-response.h
+include/libsoup-2.2/libsoup/soup-socket.h
+include/libsoup-2.2/libsoup/soup-status.h
+include/libsoup-2.2/libsoup/soup-types.h
+include/libsoup-2.2/libsoup/soup-uri.h
+include/libsoup-2.2/libsoup/soup.h
+lib/libsoup-2.2.a
+lib/libsoup-2.2.la
+lib/libsoup-2.2.so
+lib/libsoup-2.2.so.3
+lib/libsoup-2.2.so.3.0
+lib/pkgconfig/libsoup-2.2.pc
+@dirrm include/libsoup-2.2/libsoup
+@dirrm include/libsoup-2.2
diff --git a/net/libsoup/buildlink2.mk b/net/libsoup/buildlink2.mk
index 6ec431d3364..ed14c2fe01c 100644
--- a/net/libsoup/buildlink2.mk
+++ b/net/libsoup/buildlink2.mk
@@ -1,11 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/04/01 18:32:03 jmmv Exp $
.if !defined(LIBSOUP_BUILDLINK2_MK)
LIBSOUP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libsoup
-BUILDLINK_DEPENDS.libsoup?= libsoup>=1.99.26
-BUILDLINK_RECOMMENDED.libsoup?= libsoup>=1.99.26nb1
+BUILDLINK_DEPENDS.libsoup?= libsoup>=2.1.8
BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup
EVAL_PREFIX+= BUILDLINK_PREFIX.libsoup=libsoup
@@ -15,7 +14,8 @@ BUILDLINK_FILES.libsoup+= lib/libsoup-2.0.*
.include "../../devel/glib2/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/gnutls/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
BUILDLINK_TARGETS+= libsoup-buildlink
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index 8c014f015c4..a61248c8351 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:32:03 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSOUP_BUILDLINK3_MK:= ${LIBSOUP_BUILDLINK3_MK}+
@@ -11,13 +11,13 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsoup}
BUILDLINK_PACKAGES+= libsoup
.if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup+= libsoup>=1.99.26
-BUILDLINK_RECOMMENDED.libsoup?= libsoup>=1.99.26nb1
+BUILDLINK_DEPENDS.libsoup+= libsoup>=2.1.8
BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup
.endif # LIBSOUP_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
-.include "../../security/openssl/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 64bcc7976c1..3400ec48a6d 100644
--- a/net/libsoup/distinfo
+++ b/net/libsoup/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/05 22:54:11 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/04/01 18:32:03 jmmv Exp $
-SHA1 (libsoup-1.99.26.tar.bz2) = b3759bafb349e103f62ec360cf6a553b73ddd9fd
-Size (libsoup-1.99.26.tar.bz2) = 233237 bytes
-SHA1 (patch-aa) = c78e27be352521af9fa4663478dee0bffc46ec9e
+SHA1 (libsoup-2.1.8.tar.bz2) = d5f6c2672cf7d187df892bdf1b8022d496ded7cb
+Size (libsoup-2.1.8.tar.bz2) = 336798 bytes
diff --git a/net/libsoup/patches/patch-aa b/net/libsoup/patches/patch-aa
deleted file mode 100644
index 404d478aa39..00000000000
--- a/net/libsoup/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/05 22:54:11 xtraeme Exp $
-
---- libsoup/soup-transfer.c 2003-06-23 17:52:34.000000000 +0200
-+++ libsoup/soup-transfer.c 2003-10-19 01:51:03.000000000 +0200
-@@ -198,7 +198,7 @@
- GIOCondition condition,
- SoupReader *r)
- {
-- gboolean body_started = r->recv_buf->len > r->header_len;
-+ gboolean body_started = r->header_len > 0;
-
- soup_transfer_read_stop (r);
-
-@@ -380,7 +381,7 @@
- }
- }
-
-- return r->content_length == arr->len;
-+ return arr->len >= r->content_length;
- }
-
- static gboolean
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 13:06:56 +0000