[pkgsrc/trunk]: pkgsrc/www/libwww Replace configure with the one generated by...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61cc4606f7c3
branches:  trunk
changeset: 468337:61cc4606f7c3
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Feb 12 20:31:35 2004 +0000

description:
Replace configure with the one generated by newer autoconf, and adjust
Makefile accordingly.  This makes libwww build again with
libtool-1.5.2.  The problem was reported by reed@ in PR pkg/24391.

diffstat:

 www/libwww/Makefile         |     16 +-
 www/libwww/distinfo         |      5 +-
 www/libwww/patches/patch-ag |  40792 ++++++++++++++++++++++++++++++++++++++++++
 www/libwww/patches/patch-am |     15 +-
 4 files changed, 40806 insertions(+), 22 deletions(-)

diffs (truncated from 40901 to 300 lines):

diff -r ef2aaba0b86e -r 61cc4606f7c3 www/libwww/Makefile
--- a/www/libwww/Makefile       Thu Feb 12 20:29:34 2004 +0000
+++ b/www/libwww/Makefile       Thu Feb 12 20:31:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.48 2004/02/12 20:31:35 minskim Exp $
 
 DISTNAME=              w3c-libwww-5.4.0
 PKGNAME=               libwww-5.4.0
@@ -15,22 +15,19 @@
 USE_BUILDLINK2=                YES
 USE_GNU_TOOLS+=                make
 USE_LIBTOOL=           YES
-USE_PERL5=             build
-
-AUTOMAKE_REQD=         1.4
+LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS=                --with-zlib --with-regex --without-x
 CONFIGURE_ARGS+=       --with-ssl="${SSLBASE}"
 
 DOCDIR=                        ${PREFIX}/share/doc/libwww
-LTCONFIG_OVERRIDE=     ${WRKSRC}/config/ltconfig
 
 pre-configure:
-       cd ${WRKSRC}; \
-           ${ACLOCAL} && \
-           ${AUTOMAKE} -i && \
-           ${AUTOCONF}
+.for f in aclocal.m4 configure stamp-h.in
+       ${TOUCH} ${WRKSRC}/$f
+.endfor
+       ${TOUCH} `${FIND} ${WRKSRC} -name Makefile.in`
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -62,5 +59,4 @@
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ef2aaba0b86e -r 61cc4606f7c3 www/libwww/distinfo
--- a/www/libwww/distinfo       Thu Feb 12 20:29:34 2004 +0000
+++ b/www/libwww/distinfo       Thu Feb 12 20:31:35 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2003/10/08 03:24:17 danw Exp $
+$NetBSD: distinfo,v 1.16 2004/02/12 20:31:35 minskim Exp $
 
 SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
 Size (w3c-libwww-5.4.0.tgz) = 1129121 bytes
@@ -8,10 +8,11 @@
 SHA1 (patch-ad) = a585498bace904928d18e7449a6defad82f59596
 SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
 SHA1 (patch-af) = 6cb4967a94626154fd940bf4e2406aad45d59e93
+SHA1 (patch-ag) = d69fcbe4a98fdb22e3913419a17c84d64dfd0a05
 SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
 SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
 SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
 SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
-SHA1 (patch-am) = fdc5e1a22814d9fd87d96e7bca1aadaebebdb71f
+SHA1 (patch-am) = cfa44de105eeed62d933ed040b447290d641570d
 SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
 SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
diff -r ef2aaba0b86e -r 61cc4606f7c3 www/libwww/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-ag       Thu Feb 12 20:31:35 2004 +0000
@@ -0,0 +1,40792 @@
+$NetBSD: patch-ag,v 1.3 2004/02/12 20:31:35 minskim Exp $
+
+--- configure.orig     2002-06-12 04:31:31.000000000 -0500
++++ configure
+@@ -1,234 +1,480 @@
+ #! /bin/sh
+-
+-# From configure.in Id: configure.in,v 1.96 2002/06/12 09:26:46 kahan Exp 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++# From configure.in Id: configure.in,v 1.96 2002/06/12 09:26:46 kahan Exp .
++# Guess values for system-dependent variables and create Makefiles.
++# Generated by GNU Autoconf 2.59.
++#
++# Copyright (C) 2003 Free Software Foundation, Inc.
++# This configure script is free software; the Free Software Foundation
++# gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
+ 
+ 
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
+ 
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++       X"$0" : 'X\(//\)$' \| \
++       X"$0" : 'X\(/\)$' \| \
++       .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++        /^X\/\(\/\/\)$/{ s//\1/; q; }
++        /^X\/\(\/\).*/{ s//\1/; q; }
++        s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
+ 
+ 
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
+ 
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++       case $as_dir in
++       /*)
++         if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++           $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++           $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++           CONFIG_SHELL=$as_dir/$as_base
++           export CONFIG_SHELL
++           exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++         fi;;
++       esac
++       done
++done
++;;
++  esac
+ 
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
+ 
+ 
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='    ' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
+ 
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
+