Make this build with autoconf 2.52

3 files changed, 77 insertions, 10 deletions

diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 9361a560ff4..b78d8a57e2c 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/06/28 20:55:53 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/08/28 16:35:03 skrll Exp $
 
 SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516
 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes
@@ -9,5 +9,6 @@ SHA1 (patch-ad) = 3dbc185d083b655f4157055b13563b5b123931f5
 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
 SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813
 SHA1 (patch-ag) = b3b0ca974d4dfccf4aaebc2ee65f0938525eb51b
-SHA1 (patch-ah) = ab96743a1c2a0e88874245da5e9790d3f1e3a6ff
+SHA1 (patch-ah) = 46b823651b0003c394dc232e7f1fb6928310ba6a
 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
+SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah
index 421256e32fc..e849f2bcfd0 100644
--- a/www/libwww/patches/patch-ah
+++ b/www/libwww/patches/patch-ah
@@ -1,8 +1,20 @@
-$NetBSD: patch-ah,v 1.2 2001/06/28 20:55:54 jlam Exp $
-
---- configure.in.orig	Thu Dec 14 05:49:06 2000
-+++ configure.in
-@@ -307,7 +307,10 @@
+--- configure.in.orig	Thu Dec 14 11:49:06 2000
++++ configure.in	Tue Aug 28 17:09:57 2001
+@@ -213,7 +213,12 @@
+ 		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
++
++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.)
+@@ -307,7 +312,10 @@
      AC_MSG_RESULT(yes)
      AC_DEFINE(HT_POSIX_REGEX)
      if test "x$withval" = "xyes"; then
@@ -14,7 +26,7 @@ $NetBSD: patch-ah,v 1.2 2001/06/28 20:55:54 jlam Exp $
      else
        AC_ADDLIB($withval)
        AC_TRY_LINK([],
-@@ -532,31 +535,9 @@
+@@ -532,31 +540,9 @@
  AC_SUBST(LWWWMD5)
  AC_SUBST(LIBWWWMD5)
  
@@ -48,7 +60,7 @@ $NetBSD: patch-ah,v 1.2 2001/06/28 20:55:54 jlam Exp $
  LWWWSSL=""
  LIBWWWSSL=""
  WWWSSLEX=""
-@@ -568,14 +549,39 @@
+@@ -568,14 +554,39 @@
      ;;
    *)
      if test "x$withval" = "xyes"; then
@@ -91,7 +103,7 @@ $NetBSD: patch-ah,v 1.2 2001/06/28 20:55:54 jlam Exp $
      AC_MSG_RESULT(yes)
      WWWSSL="libwwwssl.la"
      LWWWSSL="-lwwwssl" 
-@@ -586,6 +592,7 @@
+@@ -586,6 +597,7 @@
  [ AC_MSG_RESULT(no) ])
  AC_SUBST(WWWSSL)
  AC_SUBST(SSLINC)
@@ -99,3 +111,11 @@ $NetBSD: patch-ah,v 1.2 2001/06/28 20:55:54 jlam Exp $
  AC_SUBST(LWWWSSL)
  AC_SUBST(LIBWWWSSL)
  AC_SUBST(WWWSSLEX)
+@@ -1006,7 +1018,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
diff --git a/www/libwww/patches/patch-aj b/www/libwww/patches/patch-aj
new file mode 100644
index 00000000000..5b80bd82636
--- /dev/null
+++ b/www/libwww/patches/patch-aj
@@ -0,0 +1,46 @@
+--- acinclude.m4.orig	Tue Aug 28 14:56:47 2001
++++ acinclude.m4	Tue Aug 28 14:58:27 2001
+@@ -251,19 +251,6 @@
+ done
+ ])
+ 
+-dnl AC_C_VOLATILE
+-AC_DEFUN(AC_C_VOLATILE,
+-[ AC_MSG_CHECKING([for working volatile])
+-  AC_CACHE_VAL(ac_cv_c_volatile,
+-  [ AC_TRY_COMPILE(,[
+-extern volatile int errno;
+-], ac_cv_c_volatile=yes, ac_cv_c_volatile=no)])dnl
+-  AC_MSG_RESULT($ac_cv_c_volatile)
+-if test $ac_cv_c_volatile = no; then
+-  AC_DEFINE(volatile, )
+-fi
+-])
+-
+ dnl AC_C_NOSHARE
+ AC_DEFUN(AC_C_NOSHARE,
+ [ AC_MSG_CHECKING([for working noshare])
+@@ -401,23 +388,6 @@
+   if test $ac_cv_weird_accept = yes; then
+     AC_DEFINE(WEIRD_ACCEPT)
+   fi
+-])
+-
+-dnl AC_HEADER_TIOCGWINSZ
+-AC_DEFUN(AC_HEADER_TIOCGWINSZ,
+-[ AC_MSG_CHECKING([for TIOCGWINSZ get-window-size capability])
+-  AC_CACHE_VAL(ac_cv_header_tiocgwinsz,
+-  [ AC_HEADER_INCLUDE(tmp_inc_termios, sys/termios.h termios.h)
+-    AC_EGREP_HEADER(yes, [
+-$tmp_inc_termios
+-#ifdef TIOCGWINSZ
+- yes
+-#endif
+-], ac_cv_header_tiocgwinsz=yes, ac_cv_header_tiocgwinsz=no)])dnl
+-  AC_MSG_RESULT($ac_cv_header_tiocgwinsz)
+-if test $ac_cv_header_tiocgwinsz = yes; then
+-  AC_DEFINE(GET_SCREEN_SIZE)
+-fi
+ ])
+ 
+ dnl AC_SYS_NEED_SIGNAL_RESET