4 files changed, 18 insertions, 84 deletions

diff --git a/devel/libsoup/files/patch-configure b/devel/libsoup/files/patch-configure
index eeec748d44ce..fb57eb67fb25 100644
--- a/devel/libsoup/files/patch-configure
+++ b/devel/libsoup/files/patch-configure
@@ -1,27 +1,26 @@
 
 $FreeBSD$
 
---- 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
- 
+--- configure.orig	Fri Jun  7 18:58:41 2002
++++ configure	Sat Jul 20 15:01:54 2002
+@@ -6554,6 +6554,7 @@
  
--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`
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7460,9 +7461,9 @@
  
+   rm -f conf.glibtest
  
-@@ -5854,8 +5854,6 @@
- 
- save_CPPFLAGS=$CPPFLAGS
- save_LIBS=$LIBS
--CPPFLAGS=
--LIBS=
+-	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`
+ 	FAVOUR_LIBXML=1
+ 	SOUP_PKGCONFIG_REQUIRES="glib"
  
- echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
- 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
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/devel/libsoup/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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
deleted file mode 100644
index 03b4b4de3c8f..000000000000
--- a/devel/libsoup/files/patch-src::libsoup::soup-socket.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$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
deleted file mode 100644
index fc3ea08c71b9..000000000000
--- a/devel/libsoup/files/patch-src::soup-core::soup-private.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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>
-+
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif