7 files changed, 30 insertions, 122 deletions

diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index a2554d679ff4..9e1b68a67057 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:	soup
-# Date created:				29 May 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for:	libsoup
+# Date created:				12 March 2003
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	soup
-PORTVERSION=	0.7.11
+PORTNAME=	libsoup
+PORTVERSION=	1.99.20
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
-DIST_SUBDIR=	gnome
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.99
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A SOAP (Simple Object Access Protocol) implementation in C
@@ -18,9 +18,10 @@ COMMENT=	A SOAP (Simple Object Access Protocol) implementation in C
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack glib12 libxml
+USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo
index dad4ab5cff98..e66af0c12c1c 100644
--- a/devel/libsoup22/distinfo
+++ b/devel/libsoup22/distinfo
@@ -1 +1 @@
-MD5 (gnome/soup-0.7.11.tar.bz2) = 61bb2fef816ce164af62f8a3a5bd782e
+MD5 (gnome2/libsoup-1.99.20.tar.bz2) = 78b2e1c656d361aa1c8252934ee7ddc1
diff --git a/devel/libsoup22/files/patch-Makefile.in b/devel/libsoup22/files/patch-Makefile.in
deleted file mode 100644
index 6a76f498a72b..000000000000
--- a/devel/libsoup22/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/05/28 13:16:59	1.1
-+++ Makefile.in	2001/05/28 13:17:30
-@@ -115,7 +115,7 @@
- 
- bin_SCRIPTS = soup-config
- 
--confexecdir = $(libdir)
-+confexecdir = $(prefix)/etc
- confexec_DATA = soupConf.sh soup_apacheConf.sh soup_wsdlConf.sh
- 
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/devel/libsoup22/files/patch-configure b/devel/libsoup22/files/patch-configure
index bbcdac62c130..fbe1b4bb7af9 100644
--- a/devel/libsoup22/files/patch-configure
+++ b/devel/libsoup22/files/patch-configure
@@ -8,19 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10569,11 +10570,11 @@
- fi
- 
- if test x$APXS != xno; then
--	APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS`"
--	APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB`
-+#	APACHE_CFLAGS="-I`apxs -q INCLUDEDIR CFLAGS`"
-+#	APACHE_LIBS=`apxs -q LDFLAGS_SHLIB LIBS_SHLIB`
- 
--	save_CPPFLAGS=$CPPFLAGS
--	CPPFLAGS=$APACHE_CFLAGS
-+#	save_CPPFLAGS=$CPPFLAGS
-+#	CPPFLAGS=$APACHE_CFLAGS
- 
- 
- 
diff --git a/devel/libsoup22/files/patch-docs::reference::Makefile.in b/devel/libsoup22/files/patch-docs::reference::Makefile.in
deleted file mode 100644
index a95c53a8151c..000000000000
--- a/devel/libsoup22/files/patch-docs::reference::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- docs/reference/Makefile.in	2001/05/28 13:11:32	1.1
-+++ docs/reference/Makefile.in	2001/05/28 13:12:10
-@@ -262,6 +262,7 @@
- 
- 
- @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
-+@ENABLE_GTK_DOC_FALSE@all-local:
- 
- #### scan ####
- 
diff --git a/devel/libsoup22/files/patch-src_libsoup_soup-message.c b/devel/libsoup22/files/patch-src_libsoup_soup-message.c
deleted file mode 100644
index b83d406260a6..000000000000
--- a/devel/libsoup22/files/patch-src_libsoup_soup-message.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libsoup/soup-message.c.orig	Wed Apr 10 12:33:17 2002
-+++ src/libsoup/soup-message.c	Tue Nov 12 02:52:40 2002
-@@ -907,7 +907,7 @@
- 
- 	SoupHandlerKind   kind;
- 	union {
--		guint             errorcode;
-+		unsigned long             errorcode;
- 		SoupErrorClass    errorclass;
- 		const gchar      *header;
- 	} data;
-@@ -922,8 +922,9 @@
- 		redirect_handler, 
- 		NULL, 
- 		RESPONSE_HEADER_HANDLER, 
--		{ (guint) "Location" }
-+		{ (unsigned long) "Location" }
- 	},
-+
- 	/* 
- 	 * Handle authorization.
- 	 */
diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist
index 0e0d64abfed7..1ef3a47265a0 100644
--- a/devel/libsoup22/pkg-plist
+++ b/devel/libsoup22/pkg-plist
@@ -1,48 +1,20 @@
-bin/soup-config
-bin/soup-httpd
-bin/soup-ssl-proxy
-bin/soup-wsdl
-etc/soupConf.sh
-etc/soup_apacheConf.sh
-etc/soup_wsdlConf.sh
-include/soup/libsoup/soup-context.h
-include/soup/libsoup/soup-dav-server.h
-include/soup/libsoup/soup-dav.h
-include/soup/libsoup/soup-env.h
-include/soup/libsoup/soup-error.h
-include/soup/libsoup/soup-fault.h
-include/soup/libsoup/soup-headers.h
-include/soup/libsoup/soup-message.h
-include/soup/libsoup/soup-method.h
-include/soup/libsoup/soup-misc.h
-include/soup/libsoup/soup-ntlm.h
-include/soup/libsoup/soup-parser.h
-include/soup/libsoup/soup-serializer.h
-include/soup/libsoup/soup-server-auth.h
-include/soup/libsoup/soup-server.h
-include/soup/libsoup/soup-socket.h
-include/soup/libsoup/soup-uri.h
-include/soup/libsoup/soup.h
-include/soup/libwsdl/wsdl-param.h
-include/soup/libwsdl/wsdl-schema-glib.h
-include/soup/libwsdl/wsdl-schema.h
-include/soup/libwsdl/wsdl-soap-marshal.h
-include/soup/libwsdl/wsdl-soap-memory.h
-include/soup/libwsdl/wsdl-soap-parse.h
-include/soup/libwsdl/wsdl-typecodes.h
-include/soup/libwsdl/wsdl.h
-lib/libsoup-apache.a
-lib/libsoup-apache.so
-lib/libsoup-apache.so.6
-lib/libsoup.a
-lib/libsoup.so
-lib/libsoup.so.6
-lib/libwsdl.a
-lib/libwsdl.so
-lib/libwsdl.so.6
-libdata/pkgconfig/soup.pc
-share/aclocal/soup.m4
-@dirrm share/doc/soup
-@dirrm include/soup/libwsdl
-@dirrm include/soup/libsoup
-@dirrm include/soup
+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.so
+lib/libsoup-2.0.so.0
+libdata/pkgconfig/soup-2.0.pc
+libexec/libsoup-ssl-proxy
+@dirrm include/soup-2.0/libsoup
+@dirrm include/soup-2.0