21 files changed, 258 insertions, 132 deletions

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 328e9fbcfa04..fb5d022dd73e 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	soup
-PORTVERSION=	0.2
+PORTVERSION=	0.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/soup
@@ -16,11 +16,11 @@ MAINTAINER=	gnome@FreeBSD.org
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-WRKSRC=		${WRKDIR}/${DISTNAME}.1
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_LIBTOOL=	yes
 USE_GLIB=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index f703b5c015db..fb18ea7bf2c6 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1 +1 @@
-MD5 (soup-0.2.tar.gz) = e3698f35caeebb9da4958d3a57aebf79
+MD5 (soup-0.5.1.tar.gz) = 3890d3ea50a61e4eb576b18e60668dc0
diff --git a/devel/libsoup/files/patch-configure b/devel/libsoup/files/patch-configure
index 3d546f6fcf4a..eeec748d44ce 100644
--- a/devel/libsoup/files/patch-configure
+++ b/devel/libsoup/files/patch-configure
@@ -1,20 +1,22 @@
 
 $FreeBSD$
 
---- configure	2001/05/28 11:58:28	1.1
-+++ configure	2001/05/28 12:00:46
-@@ -2202,8 +2202,8 @@
+--- configure.orig	Fri Sep 28 11:59:17 2001
++++ configure	Fri Sep 28 12:00:34 2001
+@@ -5722,9 +5722,9 @@
    rm -f conf.glibtest
  
  
 -GLIB_CFLAGS=`glib-config --cflags glib`
 -GLIB_LIBS=`glib-config --libs glib`
+-GMODULE_LIBS=`glib-config --libs gmodule`
 +GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
 +GLIB_LIBS=`$GLIB_CONFIG --libs glib`
++GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
  
  
  
-@@ -2259,8 +2259,6 @@
+@@ -5854,8 +5854,6 @@
  
  save_CPPFLAGS=$CPPFLAGS
  save_LIBS=$LIBS
@@ -22,4 +24,4 @@ $FreeBSD$
 -LIBS=
  
  echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
- echo "configure:2267: checking for poptGetContext in -lpopt" >&5
+ echo "configure:5862: checking for poptGetContext in -lpopt" >&5
diff --git a/devel/libsoup/files/patch-ltmain.sh b/devel/libsoup/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/libsoup/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libsoup/files/patch-src::libsoup::soup-socket.c b/devel/libsoup/files/patch-src::libsoup::soup-socket.c
new file mode 100644
index 000000000000..03b4b4de3c8f
--- /dev/null
+++ b/devel/libsoup/files/patch-src::libsoup::soup-socket.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/libsoup/soup-socket.c	2001/09/28 12:13:58	1.1
++++ src/libsoup/soup-socket.c	2001/09/28 09:15:15
+@@ -783,7 +783,7 @@
+ 
+ 		signal (SIGCHLD, SIG_IGN);
+ 
+-		if (ptrace (PTRACE_ATTACH, getppid (), NULL, NULL) == -1) {
++		if (ptrace (PT_ATTACH, getppid (), NULL, 0) == -1) {
+ 			/* 
+ 			 * Attach failed; it's probably already being
+ 			 * debugged. 
+@@ -800,7 +800,7 @@
+ 		 */
+ 		waitpid (getppid (), NULL, 0);
+ 
+-		if (ptrace (PTRACE_DETACH, getppid (), NULL, NULL) == -1)
++		if (ptrace (PT_DETACH, getppid (), NULL, 0) == -1)
+ 			g_warning ("ptrace: Detach failed: %s", 
+ 				   strerror(errno));
+ 
diff --git a/devel/libsoup/files/patch-src::soup-core::soup-private.h b/devel/libsoup/files/patch-src::soup-core::soup-private.h
index ad904e7531aa..fc3ea08c71b9 100644
--- a/devel/libsoup/files/patch-src::soup-core::soup-private.h
+++ b/devel/libsoup/files/patch-src::soup-core::soup-private.h
@@ -1,16 +1,14 @@
 
 $FreeBSD$
 
---- src/soup-core/soup-private.h	2001/05/28 12:03:44	1.1
-+++ src/soup-core/soup-private.h	2001/05/28 12:05:03
-@@ -16,7 +16,10 @@
- #ifndef SOAP_PRIVATE_H
- #define SOAP_PRIVATE_H 1
+--- src/libsoup/soup-private.h.orig	Tue Sep 18 00:56:04 2001
++++ src/libsoup/soup-private.h	Fri Sep 28 12:03:36 2001
+@@ -20,6 +20,8 @@
+ #include <config.h>
+ #endif
  
 +#include <sys/types.h>
-+#include <sys/socket.h>
++
+ #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
-+#include <arpa/inet.h>
- 
- #include "soup-context.h"
- #include "soup-server.h"
+ #endif
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 72648ab9fda6..b11ff1fd0d5f 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -1,42 +1,43 @@
 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/soup-context.h
-include/soup/soup-env.h
-include/soup/soup-fault.h
-include/soup/soup-message.h
-include/soup/soup-misc.h
-include/soup/soup-parser.h
-include/soup/soup-serializer.h
-include/soup/soup-server.h
-include/soup/soup-socket.h
-include/soup/soup-uri.h
-include/soup/soup.h
-include/wsdl/wsdl-param.h
-include/wsdl/wsdl-schema-glib.h
-include/wsdl/wsdl-schema.h
-include/wsdl/wsdl-soap-marshal.h
-include/wsdl/wsdl-soap-memory.h
-include/wsdl/wsdl-soap-parse.h
-include/wsdl/wsdl-typecodes-c.h
-include/wsdl/wsdl-typecodes.h
-include/wsdl/wsdl.h
+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-fault.h
+include/soup/libsoup/soup-message.h
+include/soup/libsoup/soup-misc.h
+include/soup/libsoup/soup-parser.h
+include/soup/libsoup/soup-serializer.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.2
 lib/libsoup.a
 lib/libsoup.so
 lib/libsoup.so.2
-lib/libwsdl-build.a
-lib/libwsdl-build.so
-lib/libwsdl-build.so.2
 lib/libwsdl.a
 lib/libwsdl.so
 lib/libwsdl.so.2
 libdata/pkgconfig/soup.pc
+share/aclocal/soup.m4
 @dirrm share/doc/soup
-@dirrm include/wsdl
+@dirrm include/soup/libwsdl
+@dirrm include/soup/libsoup
 @dirrm include/soup
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 328e9fbcfa04..fb5d022dd73e 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	soup
-PORTVERSION=	0.2
+PORTVERSION=	0.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/soup
@@ -16,11 +16,11 @@ MAINTAINER=	gnome@FreeBSD.org
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-WRKSRC=		${WRKDIR}/${DISTNAME}.1
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_LIBTOOL=	yes
 USE_GLIB=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo
index f703b5c015db..fb18ea7bf2c6 100644
--- a/devel/libsoup22/distinfo
+++ b/devel/libsoup22/distinfo
@@ -1 +1 @@
-MD5 (soup-0.2.tar.gz) = e3698f35caeebb9da4958d3a57aebf79
+MD5 (soup-0.5.1.tar.gz) = 3890d3ea50a61e4eb576b18e60668dc0
diff --git a/devel/libsoup22/files/patch-configure b/devel/libsoup22/files/patch-configure
index 3d546f6fcf4a..eeec748d44ce 100644
--- a/devel/libsoup22/files/patch-configure
+++ b/devel/libsoup22/files/patch-configure
@@ -1,20 +1,22 @@
 
 $FreeBSD$
 
---- configure	2001/05/28 11:58:28	1.1
-+++ configure	2001/05/28 12:00:46
-@@ -2202,8 +2202,8 @@
+--- configure.orig	Fri Sep 28 11:59:17 2001
++++ configure	Fri Sep 28 12:00:34 2001
+@@ -5722,9 +5722,9 @@
    rm -f conf.glibtest
  
  
 -GLIB_CFLAGS=`glib-config --cflags glib`
 -GLIB_LIBS=`glib-config --libs glib`
+-GMODULE_LIBS=`glib-config --libs gmodule`
 +GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
 +GLIB_LIBS=`$GLIB_CONFIG --libs glib`
++GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
  
  
  
-@@ -2259,8 +2259,6 @@
+@@ -5854,8 +5854,6 @@
  
  save_CPPFLAGS=$CPPFLAGS
  save_LIBS=$LIBS
@@ -22,4 +24,4 @@ $FreeBSD$
 -LIBS=
  
  echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
- echo "configure:2267: checking for poptGetContext in -lpopt" >&5
+ echo "configure:5862: checking for poptGetContext in -lpopt" >&5
diff --git a/devel/libsoup22/files/patch-ltmain.sh b/devel/libsoup22/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/libsoup22/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libsoup22/files/patch-src::libsoup::soup-socket.c b/devel/libsoup22/files/patch-src::libsoup::soup-socket.c
new file mode 100644
index 000000000000..03b4b4de3c8f
--- /dev/null
+++ b/devel/libsoup22/files/patch-src::libsoup::soup-socket.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/libsoup/soup-socket.c	2001/09/28 12:13:58	1.1
++++ src/libsoup/soup-socket.c	2001/09/28 09:15:15
+@@ -783,7 +783,7 @@
+ 
+ 		signal (SIGCHLD, SIG_IGN);
+ 
+-		if (ptrace (PTRACE_ATTACH, getppid (), NULL, NULL) == -1) {
++		if (ptrace (PT_ATTACH, getppid (), NULL, 0) == -1) {
+ 			/* 
+ 			 * Attach failed; it's probably already being
+ 			 * debugged. 
+@@ -800,7 +800,7 @@
+ 		 */
+ 		waitpid (getppid (), NULL, 0);
+ 
+-		if (ptrace (PTRACE_DETACH, getppid (), NULL, NULL) == -1)
++		if (ptrace (PT_DETACH, getppid (), NULL, 0) == -1)
+ 			g_warning ("ptrace: Detach failed: %s", 
+ 				   strerror(errno));
+ 
diff --git a/devel/libsoup22/files/patch-src::soup-core::soup-private.h b/devel/libsoup22/files/patch-src::soup-core::soup-private.h
index ad904e7531aa..fc3ea08c71b9 100644
--- a/devel/libsoup22/files/patch-src::soup-core::soup-private.h
+++ b/devel/libsoup22/files/patch-src::soup-core::soup-private.h
@@ -1,16 +1,14 @@
 
 $FreeBSD$
 
---- src/soup-core/soup-private.h	2001/05/28 12:03:44	1.1
-+++ src/soup-core/soup-private.h	2001/05/28 12:05:03
-@@ -16,7 +16,10 @@
- #ifndef SOAP_PRIVATE_H
- #define SOAP_PRIVATE_H 1
+--- src/libsoup/soup-private.h.orig	Tue Sep 18 00:56:04 2001
++++ src/libsoup/soup-private.h	Fri Sep 28 12:03:36 2001
+@@ -20,6 +20,8 @@
+ #include <config.h>
+ #endif
  
 +#include <sys/types.h>
-+#include <sys/socket.h>
++
+ #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
-+#include <arpa/inet.h>
- 
- #include "soup-context.h"
- #include "soup-server.h"
+ #endif
diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist
index 72648ab9fda6..b11ff1fd0d5f 100644
--- a/devel/libsoup22/pkg-plist
+++ b/devel/libsoup22/pkg-plist
@@ -1,42 +1,43 @@
 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/soup-context.h
-include/soup/soup-env.h
-include/soup/soup-fault.h
-include/soup/soup-message.h
-include/soup/soup-misc.h
-include/soup/soup-parser.h
-include/soup/soup-serializer.h
-include/soup/soup-server.h
-include/soup/soup-socket.h
-include/soup/soup-uri.h
-include/soup/soup.h
-include/wsdl/wsdl-param.h
-include/wsdl/wsdl-schema-glib.h
-include/wsdl/wsdl-schema.h
-include/wsdl/wsdl-soap-marshal.h
-include/wsdl/wsdl-soap-memory.h
-include/wsdl/wsdl-soap-parse.h
-include/wsdl/wsdl-typecodes-c.h
-include/wsdl/wsdl-typecodes.h
-include/wsdl/wsdl.h
+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-fault.h
+include/soup/libsoup/soup-message.h
+include/soup/libsoup/soup-misc.h
+include/soup/libsoup/soup-parser.h
+include/soup/libsoup/soup-serializer.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.2
 lib/libsoup.a
 lib/libsoup.so
 lib/libsoup.so.2
-lib/libwsdl-build.a
-lib/libwsdl-build.so
-lib/libwsdl-build.so.2
 lib/libwsdl.a
 lib/libwsdl.so
 lib/libwsdl.so.2
 libdata/pkgconfig/soup.pc
+share/aclocal/soup.m4
 @dirrm share/doc/soup
-@dirrm include/wsdl
+@dirrm include/soup/libwsdl
+@dirrm include/soup/libsoup
 @dirrm include/soup
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index 328e9fbcfa04..fb5d022dd73e 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	soup
-PORTVERSION=	0.2
+PORTVERSION=	0.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/soup
@@ -16,11 +16,11 @@ MAINTAINER=	gnome@FreeBSD.org
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-WRKSRC=		${WRKDIR}/${DISTNAME}.1
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_LIBTOOL=	yes
 USE_GLIB=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
diff --git a/devel/soup/distinfo b/devel/soup/distinfo
index f703b5c015db..fb18ea7bf2c6 100644
--- a/devel/soup/distinfo
+++ b/devel/soup/distinfo
@@ -1 +1 @@
-MD5 (soup-0.2.tar.gz) = e3698f35caeebb9da4958d3a57aebf79
+MD5 (soup-0.5.1.tar.gz) = 3890d3ea50a61e4eb576b18e60668dc0
diff --git a/devel/soup/files/patch-configure b/devel/soup/files/patch-configure
index 3d546f6fcf4a..eeec748d44ce 100644
--- a/devel/soup/files/patch-configure
+++ b/devel/soup/files/patch-configure
@@ -1,20 +1,22 @@
 
 $FreeBSD$
 
---- configure	2001/05/28 11:58:28	1.1
-+++ configure	2001/05/28 12:00:46
-@@ -2202,8 +2202,8 @@
+--- configure.orig	Fri Sep 28 11:59:17 2001
++++ configure	Fri Sep 28 12:00:34 2001
+@@ -5722,9 +5722,9 @@
    rm -f conf.glibtest
  
  
 -GLIB_CFLAGS=`glib-config --cflags glib`
 -GLIB_LIBS=`glib-config --libs glib`
+-GMODULE_LIBS=`glib-config --libs gmodule`
 +GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
 +GLIB_LIBS=`$GLIB_CONFIG --libs glib`
++GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
  
  
  
-@@ -2259,8 +2259,6 @@
+@@ -5854,8 +5854,6 @@
  
  save_CPPFLAGS=$CPPFLAGS
  save_LIBS=$LIBS
@@ -22,4 +24,4 @@ $FreeBSD$
 -LIBS=
  
  echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
- echo "configure:2267: checking for poptGetContext in -lpopt" >&5
+ echo "configure:5862: checking for poptGetContext in -lpopt" >&5
diff --git a/devel/soup/files/patch-ltmain.sh b/devel/soup/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/soup/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/soup/files/patch-src::libsoup::soup-socket.c b/devel/soup/files/patch-src::libsoup::soup-socket.c
new file mode 100644
index 000000000000..03b4b4de3c8f
--- /dev/null
+++ b/devel/soup/files/patch-src::libsoup::soup-socket.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/libsoup/soup-socket.c	2001/09/28 12:13:58	1.1
++++ src/libsoup/soup-socket.c	2001/09/28 09:15:15
+@@ -783,7 +783,7 @@
+ 
+ 		signal (SIGCHLD, SIG_IGN);
+ 
+-		if (ptrace (PTRACE_ATTACH, getppid (), NULL, NULL) == -1) {
++		if (ptrace (PT_ATTACH, getppid (), NULL, 0) == -1) {
+ 			/* 
+ 			 * Attach failed; it's probably already being
+ 			 * debugged. 
+@@ -800,7 +800,7 @@
+ 		 */
+ 		waitpid (getppid (), NULL, 0);
+ 
+-		if (ptrace (PTRACE_DETACH, getppid (), NULL, NULL) == -1)
++		if (ptrace (PT_DETACH, getppid (), NULL, 0) == -1)
+ 			g_warning ("ptrace: Detach failed: %s", 
+ 				   strerror(errno));
+ 
diff --git a/devel/soup/files/patch-src::soup-core::soup-private.h b/devel/soup/files/patch-src::soup-core::soup-private.h
index ad904e7531aa..fc3ea08c71b9 100644
--- a/devel/soup/files/patch-src::soup-core::soup-private.h
+++ b/devel/soup/files/patch-src::soup-core::soup-private.h
@@ -1,16 +1,14 @@
 
 $FreeBSD$
 
---- src/soup-core/soup-private.h	2001/05/28 12:03:44	1.1
-+++ src/soup-core/soup-private.h	2001/05/28 12:05:03
-@@ -16,7 +16,10 @@
- #ifndef SOAP_PRIVATE_H
- #define SOAP_PRIVATE_H 1
+--- src/libsoup/soup-private.h.orig	Tue Sep 18 00:56:04 2001
++++ src/libsoup/soup-private.h	Fri Sep 28 12:03:36 2001
+@@ -20,6 +20,8 @@
+ #include <config.h>
+ #endif
  
 +#include <sys/types.h>
-+#include <sys/socket.h>
++
+ #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
-+#include <arpa/inet.h>
- 
- #include "soup-context.h"
- #include "soup-server.h"
+ #endif
diff --git a/devel/soup/pkg-plist b/devel/soup/pkg-plist
index 72648ab9fda6..b11ff1fd0d5f 100644
--- a/devel/soup/pkg-plist
+++ b/devel/soup/pkg-plist
@@ -1,42 +1,43 @@
 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/soup-context.h
-include/soup/soup-env.h
-include/soup/soup-fault.h
-include/soup/soup-message.h
-include/soup/soup-misc.h
-include/soup/soup-parser.h
-include/soup/soup-serializer.h
-include/soup/soup-server.h
-include/soup/soup-socket.h
-include/soup/soup-uri.h
-include/soup/soup.h
-include/wsdl/wsdl-param.h
-include/wsdl/wsdl-schema-glib.h
-include/wsdl/wsdl-schema.h
-include/wsdl/wsdl-soap-marshal.h
-include/wsdl/wsdl-soap-memory.h
-include/wsdl/wsdl-soap-parse.h
-include/wsdl/wsdl-typecodes-c.h
-include/wsdl/wsdl-typecodes.h
-include/wsdl/wsdl.h
+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-fault.h
+include/soup/libsoup/soup-message.h
+include/soup/libsoup/soup-misc.h
+include/soup/libsoup/soup-parser.h
+include/soup/libsoup/soup-serializer.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.2
 lib/libsoup.a
 lib/libsoup.so
 lib/libsoup.so.2
-lib/libwsdl-build.a
-lib/libwsdl-build.so
-lib/libwsdl-build.so.2
 lib/libwsdl.a
 lib/libwsdl.so
 lib/libwsdl.so.2
 libdata/pkgconfig/soup.pc
+share/aclocal/soup.m4
 @dirrm share/doc/soup
-@dirrm include/wsdl
+@dirrm include/soup/libwsdl
+@dirrm include/soup/libsoup
 @dirrm include/soup