Update of the libwww package to the w3c-libwww-5.4.0 distro as found on

w3c.org. It features some bug fixes and new function calls that are used in
the new Amaya f.e.

Tested on Alpha

7 files changed, 66 insertions, 85 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 94835033195..3527a84c8ec 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.39 2002/10/26 18:11:20 bouyer Exp $
+# $NetBSD: Makefile,v 1.40 2002/11/19 20:54:11 reinoud Exp $
 
-DISTNAME=		w3c-libwww-5.3.2
-PKGNAME=		libwww-5.3.2
-PKGREVISION=		3
+DISTNAME=		w3c-libwww-5.4.0
+PKGNAME=		libwww-5.4.0
+#PKGREVISION=		1
 CATEGORIES=		www devel
 MASTER_SITES=		http://www.w3.org/Library/Distribution/ \
 			ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/
+EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.w3.org/Library/
@@ -42,7 +43,6 @@ PLIST_SUBST+=	MD5LIB="@comment "
 PLIST_SUBST+=	MD5LIB=""
 .endif
 
-
 # Include SOCKS firewall support
 .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
 .if ${USE_SOCKS} == 4
diff --git a/www/libwww/PLIST b/www/libwww/PLIST
index e92d85d3db1..0e03f1223b3 100644
--- a/www/libwww/PLIST
+++ b/www/libwww/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/26 18:11:20 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/19 20:54:11 reinoud Exp $
 bin/libwww-config
 bin/w3c
 bin/webbot
@@ -24,6 +24,7 @@ include/w3c-libwww/HTChannl.h
 include/w3c-libwww/HTChunk.h
 include/w3c-libwww/HTConLen.h
 include/w3c-libwww/HTCookie.h
+include/w3c-libwww/HTDAV.h
 include/w3c-libwww/HTDNS.h
 include/w3c-libwww/HTDemux.h
 include/w3c-libwww/HTDescpt.h
diff --git a/www/libwww/buildlink2.mk b/www/libwww/buildlink2.mk
index d35f8fe1370..1c96a5a7c5f 100644
--- a/www/libwww/buildlink2.mk
+++ b/www/libwww/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/26 18:11:20 bouyer Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/11/19 20:54:11 reinoud Exp $
 
 .if !defined(LIBWWW_BUILDLINK2_MK)
 LIBWWW_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libwww
-BUILDLINK_DEPENDS.libwww?=	libwww>=5.3.2nb2
+BUILDLINK_DEPENDS.libwww?=	libwww>=5.4.0nb1
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libwww=libwww
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index ba3aa87a261..8fc797731f0 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.10 2002/10/26 18:11:20 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2002/11/19 20:54:11 reinoud Exp $
 
-SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516
-Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes
+SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
+Size (w3c-libwww-5.4.0.tgz) = 1129121 bytes
 SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10
 SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f
 SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df
 SHA1 (patch-ad) = d1ba0e5206dbe6347de9b72c653a587e10b6a646
 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
 SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813
-SHA1 (patch-ag) = b3b0ca974d4dfccf4aaebc2ee65f0938525eb51b
-SHA1 (patch-ah) = 064eeb155536ac7b913b003f85ed459be2784d2b
 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
 SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
 SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
+SHA1 (patch-al) = d1bd0ecfb0b83fdc7c5e3440c58962facd150ef2
+SHA1 (patch-am) = fdc5e1a22814d9fd87d96e7bca1aadaebebdb71f
diff --git a/www/libwww/patches/patch-ag b/www/libwww/patches/patch-ag
deleted file mode 100644
index ba57d9ed432..00000000000
--- a/www/libwww/patches/patch-ag
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/04/20 12:33:53 fredb Exp $
-
---- Library/src/wwwsys.html.orig	Tue Jul 11 04:18:38 2000
-+++ Library/src/wwwsys.html
-@@ -1093,25 +1093,24 @@
- #ifdef SOCKS4
- #define connect	        Rconnect
- #define getsockname	Rgetsockname
--#define getpeername	Rgetpeername
-+/* #define getpeername	Rgetpeername */
- #define bind		Rbind
- #define accept		Raccept
- #define listen		Rlisten
- #define select		Rselect
--#define recvfrom	Rrecvfrom
--#define sendto		Rsendto
--#define recv		Rrecv
--#define send		Rsend
--#define read		Rread
--#define write		Rwrite
--#define rresvport	Rrresvport
--#define shutdown	Rshutdown
--#define listen		Rlisten
--#define close		Rclose
--#define dup		Rdup
--#define dup2		Rdup2
--#define fclose		Rfclose
--#define gethostbyname	Rgethostbyname
-+/* #define recvfrom	Rrecvfrom */
-+/* #define sendto		Rsendto */
-+/* #define recv		Rrecv */
-+/* #define send		Rsend */
-+/* #define read		Rread */
-+/* #define write		Rwrite */
-+/* #define rresvport	Rrresvport */
-+/* #define shutdown	Rshutdown */
-+/* #define close		Rclose */
-+/* #define dup		Rdup */
-+/* #define dup2		Rdup2 */
-+/* #define fclose		Rfclose */
-+/* #define gethostbyname	Rgethostbyname */
- #else
- #ifdef SOCKS5
- #define connect		SOCKSconnect
diff --git a/www/libwww/patches/patch-al b/www/libwww/patches/patch-al
new file mode 100644
index 00000000000..4db94f9389b
--- /dev/null
+++ b/www/libwww/patches/patch-al
@@ -0,0 +1,32 @@
+$NetBSD: patch-al,v 1.1 2002/11/19 20:54:12 reinoud Exp $
+
+--- Library/User/Makefile.am.orig	Thu Jun  6 16:59:37 2002
++++ Library/User/Makefile.am
+@@ -19,13 +19,19 @@ SUFFIXES = .html
+ DEPENDENCIES = \
+ 	../src/libwww.la
+ 
+-Extrnals.html:
+-	(cd $(srcdir) && \
+-	perl ../../config/makeindx.pl ../src/ ../src/WWW*.html \
+-		> Extrnals.html)
++#Extrnals.html:
++#	(cd $(srcdir) && \
++#	perl ../../config/makeindx.pl ../src/ ../src/WWW*.html \
++#		> Extrnals.html)
++
++#export: Extrnals.html
++#	-rm $(srcdir)/Extrnals.html;
++#	(cd $(srcdir) && \
++#	perl ../../config/makeindx.pl ../src/ ../src/WWW*.html \
++#		> Extrnals.html)
++
++Extrnals.html :
++	echo Missing perl script > Extnals.html
+ 
+ export: Extrnals.html
+-	-rm $(srcdir)/Extrnals.html;
+-	(cd $(srcdir) && \
+-	perl ../../config/makeindx.pl ../src/ ../src/WWW*.html \
+-		> Extrnals.html)
++
diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-am
index 7313691f2b3..6e416e8f1a3 100644
--- a/www/libwww/patches/patch-ah
+++ b/www/libwww/patches/patch-am
@@ -1,34 +1,29 @@
-$NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
---- configure.in.orig	Thu Dec 14 12:49:06 2000
-+++ configure.in	Mon Oct 21 22:40:58 2002
-@@ -213,8 +213,13 @@
- 		getlogin getpass fcntl readdir sysinfo ioctl chdir tempnam \
- 		getsockopt setsockopt \
- 		gettimeofday mktime timegm tzset)
--AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove)))
-+AC_CHECK_FUNC(unlink)
-+if test "$ac_cv_func_unlink" != yes; then
-+  AC_CHECK_FUNC(remove)
-+fi
+$NetBSD: patch-am,v 1.1 2002/11/19 20:54:12 reinoud Exp $
+
+--- configure.in.orig	Wed Jun 12 11:26:46 2002
++++ configure.in
+@@ -237,6 +237,8 @@ AC_CHECK_FUNC(unlink)
+      fi
+ fi
  
 +dnl AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove)))
 +
  dnl Checks for configuration arguments
  AC_MSG_CHECKING(whether to support direct WAIS access.)
  AC_ARG_WITH(wais,
-@@ -307,7 +312,10 @@
-     AC_MSG_RESULT(yes)
+@@ -330,6 +332,11 @@ AC_ARG_WITH(regex,
      AC_DEFINE(HT_POSIX_REGEX)
      if test "x$withval" = "xyes"; then
--      AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] )
+       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([],
-@@ -510,53 +518,45 @@
+@@ -532,27 +539,39 @@ AC_ARG_WITH(md5,
  [ case "$withval" in
    no)
      AC_MSG_RESULT(no)
@@ -58,8 +53,6 @@ $NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
    WWWMD5="libmd5.la"
    LWWWMD5="-lmd5"
    LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
-+  LIBMD5INC='-I${top_srcdir}/modules/md5'
-+  LIBMD5DEP="../../modules/md5/libmd5.la"
  )
 +AC_SUBST(MD5DIR)
  AC_SUBST(WWWMD5)
@@ -68,6 +61,12 @@ $NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
 +AC_SUBST(LIBMD5INC)
 +AC_SUBST(LIBMD5DEP)
  
+ AC_MSG_CHECKING(whether we include WebDAV support.)
+ AC_ARG_WITH(dav,
+@@ -609,31 +628,9 @@ AC_SUBST(MYEXT)
+ 
+ 
+ 
 -dnl Checks for libwww and OpenSSL:
 -AC_MSG_CHECKING(whether we can find OpenSSL)
 -dnl find the ssl library dir (empirical)
@@ -98,7 +97,7 @@ $NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
  LWWWSSL=""
  LIBWWWSSL=""
  WWWSSLEX=""
-@@ -568,14 +568,39 @@
+@@ -645,14 +642,40 @@ AC_ARG_WITH(ssl,
      ;;
    *)
      if test "x$withval" = "xyes"; then
@@ -129,6 +128,7 @@ $NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
 +    else
 +      SSLINC="-I${withval}/include/openssl -I${withval}/include"
 +      SSLLIBS="-L${withval}/lib -lssl -lcrypto -Wl,-R${withval}/lib"
++ 
      fi
 -    LIBS="$LIBS $withval"
 +    SAVED_LIBS="${LIBS}"
@@ -141,7 +141,7 @@ $NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
      AC_MSG_RESULT(yes)
      WWWSSL="libwwwssl.la"
      LWWWSSL="-lwwwssl" 
-@@ -586,6 +611,7 @@
+@@ -663,6 +686,7 @@ AC_ARG_WITH(ssl,
  [ AC_MSG_RESULT(no) ])
  AC_SUBST(WWWSSL)
  AC_SUBST(SSLINC)
@@ -149,11 +149,3 @@ $NetBSD: patch-ah,v 1.8 2002/10/26 18:11:20 bouyer Exp $
  AC_SUBST(LWWWSSL)
  AC_SUBST(LIBWWWSSL)
  AC_SUBST(WWWSSLEX)
-@@ -1006,7 +1032,6 @@
- Library/Makefile Library/User/Makefile Library/User/Patch/Makefile
- Library/User/Architecture/Makefile Library/User/Using/Makefile Library/User/Guide/Makefile
- Library/User/Style/Makefile Library/User/Platform/Makefile
--Library/Test/Makefile Library/Test/User/Makefile Library/Test/src/Makefile
- Library/src/Makefile Library/src/windows/Makefile Library/src/vms/Makefile 
- Library/src/SSL/Makefile Library/src/SSL/windows/Makefile
- Library/Examples/Makefile