Update to libwww-5.3.1. This is the first release since 5.2.8. Includes

many bug fixes -- too many to list, full release history online at
<http://www.w3.org/Library/User/ReleaseNotes.html> -- and a few new features.
The most significant is integrated libwww-SSL. Also SOCKS "punching through
firewalls" support is present now (but untested by me). Not sure when that
appeared, exactly.

3 files changed, 36 insertions, 26 deletions

diff --git a/www/libwww/patches/patch-ab b/www/libwww/patches/patch-ab
new file mode 100644
index 00000000000..22560a8d934
--- /dev/null
+++ b/www/libwww/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.6 2000/08/06 01:11:38 fredb Exp $
+
+--- configure.in.orig	Fri Aug  4 05:21:20 2000
++++ configure.in	Fri Aug  4 13:56:59 2000
+@@ -307,7 +307,10 @@
+     AC_MSG_RESULT(yes)
+     AC_DEFINE(HT_POSIX_REGEX)
+     if test "x$withval" = "xyes"; then
+-      AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] )
++      AC_TRY_LINK([],
++	          [ regexec(); ],
++		  [],
++		  [ AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) ] )
+     else
+       AC_ADDLIB($withval)
+       AC_TRY_LINK([],
+@@ -535,13 +538,17 @@
+ dnl Checks for libwww and OpenSSL:
+ AC_MSG_CHECKING(whether we can find OpenSSL)
+ dnl find the ssl library dir (empirical)
+-if test -d '/usr/local/ssl/lib'; then
++if test -f "${prefix}/lib/libssl.a" -a -f "${prefix}/lib/libcrypto.a"; then
++  ssllib="-L${prefix}/lib -lssl -lcrypto"
++elif test -d '/usr/local/ssl/lib'; then
+   ssllib="-L/usr/local/ssl/lib -lssl -lcrypto"
+ else
+   ssllib="-L/usr/lib -lssl -lcrypto"
+ fi
+ dnl find the ssl include dir (empirical)
+-if test -d '/usr/local/ssl/include'; then
++if test -d "${prefix}/include/openssl"; then
++  sslinc="-I${prefix}/include -I${prefix}/include/openssl"
++elif test -d '/usr/local/ssl/include'; then
+   sslinc="-I/usr/local/ssl/include"
+ elif test -d '/usr/local/openssl/include'; then
+   sslinc="-I/usr/local/openssl/include"
diff --git a/www/libwww/patches/patch-ac b/www/libwww/patches/patch-ac
deleted file mode 100644
index 28c2a131115..00000000000
--- a/www/libwww/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 1999/10/08 04:43:07 deberg Exp $
-
---- Makefile.in.dist	Tue Jun 15 11:48:46 1999
-+++ Makefile.in	Tue Jun 15 11:48:57 1999
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- INSTALL_STRIP_FLAG =
- transform = @program_transform_name@
- 
diff --git a/www/libwww/patches/patch-ad b/www/libwww/patches/patch-ad
deleted file mode 100644
index ac2ddcfaa14..00000000000
--- a/www/libwww/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/10/14 14:11:02 deberg Exp $
-
---- libwww-config.in.orig       Thu Oct 14 09:41:40 1999
-+++ libwww-config.in    Thu Oct 14 09:40:54 1999
-@@ -48,7 +48,7 @@
-       echo -I@includedir@/@PACKAGE@ @DEFS@
-       ;;
-     --libs)
--      echo -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@
-+      echo -Wl,-R@libdir@ -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@
-       ;;
-     *)
-       echo "${usage}" 1>&2