Update to 2.1.4, and temporarily disable GnuTLS support for now. This version

of libsoup requires GnuTLS-0.9.7, and we only have 0.8.10 in the tree now.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1627 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 6 insertions, 44 deletions

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index c48512c29..29d4db2fb 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libsoup
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
@@ -29,11 +29,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="2.2"
 
-.if !defined(WITHOUT_SSL)
-LIB_DEPENDS+=	gnutls.7:${PORTSDIR}/security/gnutls
-.else
+#.if !defined(WITHOUT_SSL)
+#LIB_DEPENDS+=	gnutls.7:${PORTSDIR}/security/gnutls
+#.else
 CONFIGURE_ARGS+=--disable-ssl
-.endif
+#.endif
 
 pre-everything::
 	@${ECHO_MSG} ""
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index 8dff78935..657558fad 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libsoup-2.1.3.tar.bz2) = 36279f222bc11042a92297721a89430a
+MD5 (gnome2/libsoup-2.1.4.tar.bz2) = c15a2dabb967a0c311c0a6d8f99168a3
diff --git a/devel/libsoup/files/patch-configure b/devel/libsoup/files/patch-configure
deleted file mode 100644
index 019cd7d9a..000000000
--- a/devel/libsoup/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Dec 29 17:59:17 2003
-+++ configure	Mon Dec 29 17:59:29 2003
-@@ -19298,6 +19298,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+#include <sys/socket.h>
- int
- main ()
- {
diff --git a/devel/libsoup/files/patch-libsoup_soup-address.c b/devel/libsoup/files/patch-libsoup_soup-address.c
deleted file mode 100644
index 06714e0d0..000000000
--- a/devel/libsoup/files/patch-libsoup_soup-address.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libsoup/soup-address.c.orig	Mon Dec 29 17:47:27 2003
-+++ libsoup/soup-address.c	Mon Dec 29 17:54:11 2003
-@@ -18,9 +18,9 @@
- #include <sys/wait.h>
- #include <signal.h>
- 
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
--#include <netinet/in.h>
- 
- #include "soup-address.h"
- #include "soup-dns.h"
diff --git a/devel/libsoup/files/patch-libsoup_soup-dns.c b/devel/libsoup/files/patch-libsoup_soup-dns.c
deleted file mode 100644
index a2fc80e1a..000000000
--- a/devel/libsoup/files/patch-libsoup_soup-dns.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libsoup/soup-dns.c.orig	Wed Dec 17 14:49:13 2003
-+++ libsoup/soup-dns.c	Mon Dec 29 17:59:52 2003
-@@ -17,10 +17,11 @@
- #include <unistd.h>
- #include <sys/select.h>
- #include <sys/types.h>
-+#include <sys/uio.h>
- #include <sys/wait.h>
- 
--#include <arpa/inet.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- 
- #include "soup-dns.h"
- #include "soup-misc.h"