[pkgsrc/trunk]: pkgsrc/devel/bmake/files Merge changes.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/113c0435465f
branches:  trunk
changeset: 549973:113c0435465f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Nov 11 19:47:38 2008 +0000

description:
Merge changes.

diffstat:

 devel/bmake/files/ChangeLog    |    12 +-
 devel/bmake/files/Makefile.in  |     6 +-
 devel/bmake/files/config.h.in  |    18 -
 devel/bmake/files/configure    |  1423 ++++++++++++++++++++++++++++-----------
 devel/bmake/files/configure.in |    22 +-
 devel/bmake/files/util.c       |    41 +-
 6 files changed, 1059 insertions(+), 463 deletions(-)

diffs (truncated from 1781 to 300 lines):

diff -r f480fafa4f1c -r 113c0435465f devel/bmake/files/ChangeLog
--- a/devel/bmake/files/ChangeLog       Tue Nov 11 19:32:33 2008 +0000
+++ b/devel/bmake/files/ChangeLog       Tue Nov 11 19:47:38 2008 +0000
@@ -1,3 +1,13 @@
+2008-11-11  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20081111
+         Apply patch from Joerg Sonnenberge to
+         configure.in:
+         o remove some redundant checks
+         o check for emlloc etc only in libutil and require the whole family.
+         util.c:
+         o remove [v]asprintf which is no longer used.
+       
 2008-11-04  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
 
        * Makefile.in (BMAKE_VERSION): bump version to 20081101
@@ -23,7 +33,7 @@
          o handle numeric expressions in any variable expansion
          o debug output now defaults to stderr, -dF to change it - apb
          o make now uses bmake_malloc etc so that it can build natively 
-           on OS/X - wasn't an issue for bmake, but we want to keep in sync.
+           on A/UX - wasn't an issue for bmake, but we want to keep in sync.
 
 2008-09-27  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
 
diff -r f480fafa4f1c -r 113c0435465f devel/bmake/files/Makefile.in
--- a/devel/bmake/files/Makefile.in     Tue Nov 11 19:32:33 2008 +0000
+++ b/devel/bmake/files/Makefile.in     Tue Nov 11 19:47:38 2008 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.in,v 1.11 2008/11/11 14:37:05 joerg Exp $
+#      $NetBSD: Makefile.in,v 1.12 2008/11/11 19:47:38 joerg Exp $
 #      @(#)Makefile    5.2 (Berkeley) 12/28/90
 
-#      $Id: Makefile.in,v 1.11 2008/11/11 14:37:05 joerg Exp $
+#      $Id: Makefile.in,v 1.12 2008/11/11 19:47:38 joerg Exp $
 
 PROG=  bmake
 SRCS=  arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -19,7 +19,7 @@
 CC?= @CC@
 
 # Base version on src date
-BMAKE_VERSION= 20081101
+BMAKE_VERSION= 20081111
 # knowing when it was built is also handy
 BUILD_DATE!= date +%Y%m%d
 MAKE_VERSION:= bmake-${BMAKE_VERSION} build-${BUILD_DATE}
diff -r f480fafa4f1c -r 113c0435465f devel/bmake/files/config.h.in
--- a/devel/bmake/files/config.h.in     Tue Nov 11 19:32:33 2008 +0000
+++ b/devel/bmake/files/config.h.in     Tue Nov 11 19:47:38 2008 +0000
@@ -9,9 +9,6 @@
 /* Define to 1 if you have the <ar.h> header file. */
 #undef HAVE_AR_H
 
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
@@ -23,12 +20,6 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
-/* Define to 1 if you have the `emalloc' function. */
-#undef HAVE_EMALLOC
-
-/* Define to 1 if you have the `estrndup' function. */
-#undef HAVE_ESTRNDUP
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -92,9 +83,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -107,9 +95,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
-
 /* Define to 1 if you have the `strtod' function. */
 #undef HAVE_STRTOD
 
@@ -161,9 +146,6 @@
 /* Define to 1 if you have the <utime.h> header file. */
 #undef HAVE_UTIME_H
 
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
-
 /* Define to 1 if you have the `vfork' function. */
 #undef HAVE_VFORK
 
diff -r f480fafa4f1c -r 113c0435465f devel/bmake/files/configure
--- a/devel/bmake/files/configure       Tue Nov 11 19:32:33 2008 +0000
+++ b/devel/bmake/files/configure       Tue Nov 11 19:47:38 2008 +0000
@@ -3126,180 +3126,6 @@
  EGREP="$ac_cv_path_EGREP"
 
 
-if test $ac_cv_c_compiler_gnu = yes; then
-    { $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-  ac_cv_prog_gcc_traditional=yes
-else
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-         if test $ac_prog = install &&
-           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           rm -rf conftest.one conftest.two conftest.dir
-           echo one > conftest.one
-           echo two > conftest.two
-           mkdir conftest.dir
-           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-             test -s conftest.one && test -s conftest.two &&
-             test -s conftest.dir/conftest.one &&
-             test -s conftest.dir/conftest.two
-           then
-             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-             break 3
-           fi
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
 { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -3779,27 +3605,378 @@
 _ACEOF
 
 
-
-  if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'