diff options
Diffstat (limited to 'devel')
92 files changed, 1193 insertions, 597 deletions
diff --git a/devel/bmake/files/ChangeLog b/devel/bmake/files/ChangeLog index 9d8e5c0604c..3df404347e4 100644 --- a/devel/bmake/files/ChangeLog +++ b/devel/bmake/files/ChangeLog @@ -1,3 +1,13 @@ +2008-11-11 Simon J. Gerraty <sjg@void.crufty.net> + + * 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> * 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> diff --git a/devel/bmake/files/Makefile.in b/devel/bmake/files/Makefile.in index 9175b24f5f9..fb690f84b2c 100644 --- a/devel/bmake/files/Makefile.in +++ b/devel/bmake/files/Makefile.in @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.in,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $ +# $NetBSD: Makefile.in,v 1.1.1.4 2008/11/11 19:32:16 joerg Exp $ # @(#)Makefile 5.2 (Berkeley) 12/28/90 -# $Id: Makefile.in,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $ +# $Id: Makefile.in,v 1.1.1.4 2008/11/11 19:32:16 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 @@ srcdir= @srcdir@ 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 --git a/devel/bmake/files/PSD.doc/Makefile b/devel/bmake/files/PSD.doc/Makefile index b95efc51201..af79406b2f2 100644 --- a/devel/bmake/files/PSD.doc/Makefile +++ b/devel/bmake/files/PSD.doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $NetBSD: Makefile,v 1.1.1.2 2008/11/11 19:32:29 joerg Exp $ # @(#)Makefile 8.1 (Berkeley) 8/14/93 DIR= psd/12.make diff --git a/devel/bmake/files/PSD.doc/tutorial.ms b/devel/bmake/files/PSD.doc/tutorial.ms index 056da3b23c3..999c05b7cbe 100644 --- a/devel/bmake/files/PSD.doc/tutorial.ms +++ b/devel/bmake/files/PSD.doc/tutorial.ms @@ -1,4 +1,4 @@ -.\" $NetBSD: tutorial.ms,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +.\" $NetBSD: tutorial.ms,v 1.1.1.2 2008/11/11 19:32:32 joerg Exp $ .\" Copyright (c) 1988, 1989, 1993 .\" The Regents of the University of California. All rights reserved. .\" diff --git a/devel/bmake/files/aclocal.m4 b/devel/bmake/files/aclocal.m4 index 93e00d51e4b..e6904937500 100644 --- a/devel/bmake/files/aclocal.m4 +++ b/devel/bmake/files/aclocal.m4 @@ -1,5 +1,5 @@ dnl RCSid: -dnl $Id: aclocal.m4,v 1.1.1.1 2005/12/02 00:02:59 sjg Exp $ +dnl $Id: aclocal.m4,v 1.1.1.2 2008/11/11 19:32:16 joerg Exp $ dnl dnl diff --git a/devel/bmake/files/arch.c b/devel/bmake/files/arch.c index 3695881dcaa..80019d1c01f 100644 --- a/devel/bmake/files/arch.c +++ b/devel/bmake/files/arch.c @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $ */ +/* $NetBSD: arch.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: arch.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $"; +static char rcsid[] = "$NetBSD: arch.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: arch.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $"); +__RCSID("$NetBSD: arch.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/boot-strap b/devel/bmake/files/boot-strap index f86954441bb..cc3d0ac46e2 100755 --- a/devel/bmake/files/boot-strap +++ b/devel/bmake/files/boot-strap @@ -51,7 +51,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $ +# $Id: boot-strap,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # diff --git a/devel/bmake/files/buf.c b/devel/bmake/files/buf.c index 4fc918220ef..53e623d03f3 100644 --- a/devel/bmake/files/buf.c +++ b/devel/bmake/files/buf.c @@ -1,4 +1,4 @@ -/* $NetBSD: buf.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $ */ +/* $NetBSD: buf.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: buf.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $"; +static char rcsid[] = "$NetBSD: buf.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)buf.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: buf.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $"); +__RCSID("$NetBSD: buf.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/buf.h b/devel/bmake/files/buf.h index 2712571339c..aa2f89b53c2 100644 --- a/devel/bmake/files/buf.h +++ b/devel/bmake/files/buf.h @@ -1,4 +1,4 @@ -/* $NetBSD: buf.h,v 1.1.1.2 2008/03/09 19:39:32 joerg Exp $ */ +/* $NetBSD: buf.h,v 1.1.1.3 2008/11/11 19:32:17 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/compat.c b/devel/bmake/files/compat.c index 76c0305d7c8..1e929a1c3d3 100644 --- a/devel/bmake/files/compat.c +++ b/devel/bmake/files/compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.1.1.2 2008/03/09 19:39:32 joerg Exp $ */ +/* $NetBSD: compat.c,v 1.1.1.3 2008/11/11 19:32:17 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.1.1.2 2008/03/09 19:39:32 joerg Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.1.1.3 2008/11/11 19:32:17 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.1.1.2 2008/03/09 19:39:32 joerg Exp $"); +__RCSID("$NetBSD: compat.c,v 1.1.1.3 2008/11/11 19:32:17 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/cond.c b/devel/bmake/files/cond.c index 68d4ba5b39e..6fe11700b50 100644 --- a/devel/bmake/files/cond.c +++ b/devel/bmake/files/cond.c @@ -1,4 +1,4 @@ -/* $NetBSD: cond.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $ */ +/* $NetBSD: cond.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: cond.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $"; +static char rcsid[] = "$NetBSD: cond.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: cond.c,v 1.1.1.3 2008/11/11 14:28:22 joerg Exp $"); +__RCSID("$NetBSD: cond.c,v 1.1.1.4 2008/11/11 19:32:17 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/config.h.in b/devel/bmake/files/config.h.in index b68e3b9dd82..7dc1b9120e0 100644 --- a/devel/bmake/files/config.h.in +++ b/devel/bmake/files/config.h.in @@ -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 --git a/devel/bmake/files/configure b/devel/bmake/files/configure index 7f5da5a1a3c..50892693033 100755 --- a/devel/bmake/files/configure +++ b/devel/bmake/files/configure @@ -3126,180 +3126,6 @@ $as_echo "$ac_cv_path_EGREP" >&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 _ACEOF +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - 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 +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -$as_echo_n "checking minix/config.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <minix/config.h> + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -3819,135 +3996,122 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_compiler_gnu=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +ac_cv_c_compiler_gnu=$ac_compiler_gnu -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -$as_echo_n "checking minix/config.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <minix/config.h> + +int +main () +{ + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $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 - $as_echo_n "(cached) " >&6 -else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } - -fi -if test $ac_cv_header_minix_config_h = yes; then - MINIX=yes -else - MINIX= -fi - - - if test "$MINIX" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 + ; + return 0; +} _ACEOF - - fi - - - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then - $as_echo_n "(cached) " >&6 +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - cat >conftest.$ac_ext <<_ACEOF + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default int main () { @@ -3974,84 +4138,117 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_safe_to_define___extensions__=yes + ac_cv_prog_cc_g=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_safe_to_define___extensions__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS + ac_cv_prog_cc_c89=no +ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <stdarg.h> +#include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; int main () { -return strerror (); +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } _ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4060,11 +4257,8 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_strerror=$ac_res + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -4072,29 +4266,208 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then - break -fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -if test "${ac_cv_search_strerror+set}" = set; then - : +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +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_search_strerror=no + ac_cv_prog_gcc_traditional=no fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +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 @@ -6878,15 +7251,7 @@ fi - - - - - - for ac_func in \ - asprintf \ - emalloc \ getcwd \ getenv \ getopt \ @@ -6898,15 +7263,11 @@ for ac_func in \ sigaction \ sigvec \ snprintf \ - strdup \ - estrndup \ - strndup \ strerror \ strftime \ strtod \ strtol \ unsetenv \ - vasprintf \ vsnprintf \ wait3 \ wait4 \ @@ -7118,6 +7479,282 @@ fi done + +{ $as_echo "$as_me:$LINENO: checking for emalloc in -lutil" >&5 +$as_echo_n "checking for emalloc in -lutil... " >&6; } +if test "${ac_cv_lib_util_emalloc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char emalloc (); +int +main () +{ +return emalloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_util_emalloc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_util_emalloc=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_emalloc" >&5 +$as_echo "$ac_cv_lib_util_emalloc" >&6; } +if test $ac_cv_lib_util_emalloc = yes; then + { $as_echo "$as_me:$LINENO: checking for erealloc in -lutil" >&5 +$as_echo_n "checking for erealloc in -lutil... " >&6; } +if test "${ac_cv_lib_util_erealloc+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char erealloc (); +int +main () +{ +return erealloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_util_erealloc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_util_erealloc=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_erealloc" >&5 +$as_echo "$ac_cv_lib_util_erealloc" >&6; } +if test $ac_cv_lib_util_erealloc = yes; then + { $as_echo "$as_me:$LINENO: checking for estrdup in -lutil" >&5 +$as_echo_n "checking for estrdup in -lutil... " >&6; } +if test "${ac_cv_lib_util_estrdup+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char estrdup (); +int +main () +{ +return estrdup (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_util_estrdup=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_util_estrdup=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_estrdup" >&5 +$as_echo "$ac_cv_lib_util_estrdup" >&6; } +if test $ac_cv_lib_util_estrdup = yes; then + { $as_echo "$as_me:$LINENO: checking for estrndup in -lutil" >&5 +$as_echo_n "checking for estrndup in -lutil... " >&6; } +if test "${ac_cv_lib_util_estrndup+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char estrndup (); +int +main () +{ +return estrndup (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_util_estrndup=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_util_estrndup=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_estrndup" >&5 +$as_echo "$ac_cv_lib_util_estrndup" >&6; } +if test $ac_cv_lib_util_estrndup = yes; then + LIBS="$LIBS -lutil" + CPPFLAGS="$CPPFLAGS -DUSE_EMALLOC" +fi + +fi + +fi + +fi + + { $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if test "${ac_cv_header_stat_broken+set}" = set; then diff --git a/devel/bmake/files/configure.in b/devel/bmake/files/configure.in index ebcc8ee603c..9e55b11fad9 100644 --- a/devel/bmake/files/configure.in +++ b/devel/bmake/files/configure.in @@ -1,6 +1,6 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ +dnl $Id: configure.in,v 1.1.1.3 2008/11/11 19:32:22 joerg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl @@ -23,14 +23,12 @@ no) ;; esac]) dnl dnl +dnl Check for OS problems +AC_USE_SYSTEM_EXTENSIONS dnl Checks for programs. AC_PROG_CC AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL -dnl Check for OS problems -AC_AIX -AC_MINIX -AC_ISC_POSIX dnl Executable suffix - normally empty; .exe on os2. AC_SUBST(ac_exe_suffix)dnl @@ -92,8 +90,6 @@ AC_FUNC_VPRINTF AC_FUNC_WAIT3 dnl Keep this list sorted AC_CHECK_FUNCS( \ - asprintf \ - emalloc \ getcwd \ getenv \ getopt \ @@ -105,15 +101,11 @@ AC_CHECK_FUNCS( \ sigaction \ sigvec \ snprintf \ - strdup \ - estrndup \ - strndup \ strerror \ strftime \ strtod \ strtol \ unsetenv \ - vasprintf \ vsnprintf \ wait3 \ wait4 \ @@ -121,6 +113,14 @@ AC_CHECK_FUNCS( \ ) dnl AC_REPLACE_FUNCS(setenv getenv) AC_REPLACE_FUNCS(getenv) + +AC_CHECK_LIB([util], [emalloc], + [ AC_CHECK_LIB([util], [erealloc], + [ AC_CHECK_LIB([util], [estrdup], + [ AC_CHECK_LIB([util], [estrndup], + [ LIBS="$LIBS -lutil" + CPPFLAGS="$CPPFLAGS -DUSE_EMALLOC" ])])])]) + dnl dnl Structures dnl diff --git a/devel/bmake/files/dir.c b/devel/bmake/files/dir.c index 24c8f6621ce..8e5f50475cb 100644 --- a/devel/bmake/files/dir.c +++ b/devel/bmake/files/dir.c @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.1.1.3 2008/11/11 14:28:26 joerg Exp $ */ +/* $NetBSD: dir.c,v 1.1.1.4 2008/11/11 19:32:22 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: dir.c,v 1.1.1.3 2008/11/11 14:28:26 joerg Exp $"; +static char rcsid[] = "$NetBSD: dir.c,v 1.1.1.4 2008/11/11 19:32:22 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: dir.c,v 1.1.1.3 2008/11/11 14:28:26 joerg Exp $"); +__RCSID("$NetBSD: dir.c,v 1.1.1.4 2008/11/11 19:32:22 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/dir.h b/devel/bmake/files/dir.h index 48c9e221ff3..e5c4ba16a10 100644 --- a/devel/bmake/files/dir.h +++ b/devel/bmake/files/dir.h @@ -1,4 +1,4 @@ -/* $NetBSD: dir.h,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ */ +/* $NetBSD: dir.h,v 1.1.1.3 2008/11/11 19:32:22 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/for.c b/devel/bmake/files/for.c index 8e3906b0128..e67040bc33e 100644 --- a/devel/bmake/files/for.c +++ b/devel/bmake/files/for.c @@ -1,4 +1,4 @@ -/* $NetBSD: for.c,v 1.1.1.3 2008/11/11 14:28:26 joerg Exp $ */ +/* $NetBSD: for.c,v 1.1.1.4 2008/11/11 19:32:22 joerg Exp $ */ /* * Copyright (c) 1992, The Regents of the University of California. @@ -30,14 +30,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: for.c,v 1.1.1.3 2008/11/11 14:28:26 joerg Exp $"; +static char rcsid[] = "$NetBSD: for.c,v 1.1.1.4 2008/11/11 19:32:22 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)for.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: for.c,v 1.1.1.3 2008/11/11 14:28:26 joerg Exp $"); +__RCSID("$NetBSD: for.c,v 1.1.1.4 2008/11/11 19:32:22 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/getenv.c b/devel/bmake/files/getenv.c index 4ec96d04a4c..81d783aedd2 100644 --- a/devel/bmake/files/getenv.c +++ b/devel/bmake/files/getenv.c @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)getenv.c 5.8 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: getenv.c,v 1.1.1.1 2005/12/02 00:02:59 sjg Exp $"; +static char *rcsid = "$Id: getenv.c,v 1.1.1.2 2008/11/11 19:32:22 joerg Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> diff --git a/devel/bmake/files/getopt.c b/devel/bmake/files/getopt.c index 4a82ed7b373..3b83c9676eb 100644 --- a/devel/bmake/files/getopt.c +++ b/devel/bmake/files/getopt.c @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /* static char sccsid[] = "from: @(#)getopt.c 8.2 (Berkeley) 4/2/94"; */ -static char *rcsid = "$Id: getopt.c,v 1.1.1.1 2005/12/02 00:02:59 sjg Exp $"; +static char *rcsid = "$Id: getopt.c,v 1.1.1.2 2008/11/11 19:32:22 joerg Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> diff --git a/devel/bmake/files/hash.c b/devel/bmake/files/hash.c index 877fc94680a..fa591fbd8c3 100644 --- a/devel/bmake/files/hash.c +++ b/devel/bmake/files/hash.c @@ -1,4 +1,4 @@ -/* $NetBSD: hash.c,v 1.1.1.2 2008/11/11 14:28:26 joerg Exp $ */ +/* $NetBSD: hash.c,v 1.1.1.3 2008/11/11 19:32:22 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: hash.c,v 1.1.1.2 2008/11/11 14:28:26 joerg Exp $"; +static char rcsid[] = "$NetBSD: hash.c,v 1.1.1.3 2008/11/11 19:32:22 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: hash.c,v 1.1.1.2 2008/11/11 14:28:26 joerg Exp $"); +__RCSID("$NetBSD: hash.c,v 1.1.1.3 2008/11/11 19:32:22 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/hash.h b/devel/bmake/files/hash.h index ee9610399a0..79490e647f8 100644 --- a/devel/bmake/files/hash.h +++ b/devel/bmake/files/hash.h @@ -1,4 +1,4 @@ -/* $NetBSD: hash.h,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ */ +/* $NetBSD: hash.h,v 1.1.1.2 2008/11/11 19:32:22 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/install-sh b/devel/bmake/files/install-sh index 6272a6708e6..ab4165a813f 100755 --- a/devel/bmake/files/install-sh +++ b/devel/bmake/files/install-sh @@ -53,7 +53,7 @@ # # RCSid: -# $Id: install-sh,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $Id: install-sh,v 1.1.1.2 2008/11/11 19:32:22 joerg Exp $ # # @(#) Copyright (c) 1993 Simon J. Gerraty # diff --git a/devel/bmake/files/job.c b/devel/bmake/files/job.c index bcac5150305..ee2673bbc8e 100644 --- a/devel/bmake/files/job.c +++ b/devel/bmake/files/job.c @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $ */ +/* $NetBSD: job.c,v 1.1.1.4 2008/11/11 19:32:23 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.1.1.4 2008/11/11 19:32:23 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $"); +__RCSID("$NetBSD: job.c,v 1.1.1.4 2008/11/11 19:32:23 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/job.h b/devel/bmake/files/job.h index 92c02a62b2c..0534f462d17 100644 --- a/devel/bmake/files/job.h +++ b/devel/bmake/files/job.h @@ -1,4 +1,4 @@ -/* $NetBSD: job.h,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ */ +/* $NetBSD: job.h,v 1.1.1.3 2008/11/11 19:32:23 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/lst.h b/devel/bmake/files/lst.h index 5205294a542..93d878ccc5f 100644 --- a/devel/bmake/files/lst.h +++ b/devel/bmake/files/lst.h @@ -1,4 +1,4 @@ -/* $NetBSD: lst.h,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ */ +/* $NetBSD: lst.h,v 1.1.1.3 2008/11/11 19:32:23 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/lst.lib/Makefile b/devel/bmake/files/lst.lib/Makefile index 1f49ba4fd53..2299b70eb81 100644 --- a/devel/bmake/files/lst.lib/Makefile +++ b/devel/bmake/files/lst.lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ +# $NetBSD: Makefile,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ OBJ=lstAppend.o lstDupl.o lstInit.o lstOpen.o lstAtEnd.o lstEnQueue.o \ lstInsert.o lstAtFront.o lstIsAtEnd.o lstClose.o lstFind.o lstIsEmpty.o \ diff --git a/devel/bmake/files/lst.lib/lstAppend.c b/devel/bmake/files/lst.lib/lstAppend.c index 97b1bbae1b0..f96c57b4268 100644 --- a/devel/bmake/files/lst.lib/lstAppend.c +++ b/devel/bmake/files/lst.lib/lstAppend.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstAppend.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstAppend.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstAppend.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstAppend.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstAppend.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstAppend.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstAppend.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstAtEnd.c b/devel/bmake/files/lst.lib/lstAtEnd.c index cbc926fb01a..24ac1b78033 100644 --- a/devel/bmake/files/lst.lib/lstAtEnd.c +++ b/devel/bmake/files/lst.lib/lstAtEnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstAtEnd.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstAtEnd.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstAtEnd.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstAtEnd.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstAtEnd.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstAtFront.c b/devel/bmake/files/lst.lib/lstAtFront.c index 3bf37a9c07f..d005604dd57 100644 --- a/devel/bmake/files/lst.lib/lstAtFront.c +++ b/devel/bmake/files/lst.lib/lstAtFront.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstAtFront.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstAtFront.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstAtFront.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstAtFront.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstAtFront.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstClose.c b/devel/bmake/files/lst.lib/lstClose.c index 42f852612b5..746b5f9e8e7 100644 --- a/devel/bmake/files/lst.lib/lstClose.c +++ b/devel/bmake/files/lst.lib/lstClose.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstClose.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstClose.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstClose.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstClose.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstClose.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstClose.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstClose.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstConcat.c b/devel/bmake/files/lst.lib/lstConcat.c index 6c15e4704c5..dd76ac17c75 100644 --- a/devel/bmake/files/lst.lib/lstConcat.c +++ b/devel/bmake/files/lst.lib/lstConcat.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstConcat.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstConcat.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstConcat.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstConcat.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstConcat.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstConcat.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstDatum.c b/devel/bmake/files/lst.lib/lstDatum.c index 06d841a11ca..f962082b359 100644 --- a/devel/bmake/files/lst.lib/lstDatum.c +++ b/devel/bmake/files/lst.lib/lstDatum.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstDatum.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstDatum.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstDatum.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstDatum.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstDatum.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstDatum.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstDatum.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstDeQueue.c b/devel/bmake/files/lst.lib/lstDeQueue.c index 92bb4149cbe..e54d5c79cb5 100644 --- a/devel/bmake/files/lst.lib/lstDeQueue.c +++ b/devel/bmake/files/lst.lib/lstDeQueue.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstDeQueue.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstDeQueue.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstDeQueue.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstDeQueue.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstDeQueue.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstDestroy.c b/devel/bmake/files/lst.lib/lstDestroy.c index 67d6563e06f..1a72fa740b4 100644 --- a/devel/bmake/files/lst.lib/lstDestroy.c +++ b/devel/bmake/files/lst.lib/lstDestroy.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstDestroy.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstDestroy.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstDestroy.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstDestroy.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstDestroy.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstDestroy.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstDestroy.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstDupl.c b/devel/bmake/files/lst.lib/lstDupl.c index a4a65f34924..05101799de6 100644 --- a/devel/bmake/files/lst.lib/lstDupl.c +++ b/devel/bmake/files/lst.lib/lstDupl.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstDupl.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstDupl.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstDupl.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstDupl.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstDupl.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstDupl.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstDupl.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstEnQueue.c b/devel/bmake/files/lst.lib/lstEnQueue.c index 6832b79ac20..1b4dbd60d91 100644 --- a/devel/bmake/files/lst.lib/lstEnQueue.c +++ b/devel/bmake/files/lst.lib/lstEnQueue.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstEnQueue.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstEnQueue.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstEnQueue.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstEnQueue.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstEnQueue.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstFind.c b/devel/bmake/files/lst.lib/lstFind.c index e45aeb5f7e2..afb7f26e184 100644 --- a/devel/bmake/files/lst.lib/lstFind.c +++ b/devel/bmake/files/lst.lib/lstFind.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstFind.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ */ +/* $NetBSD: lstFind.c,v 1.1.1.2 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstFind.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $"; +static char rcsid[] = "$NetBSD: lstFind.c,v 1.1.1.2 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstFind.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstFind.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $"); +__RCSID("$NetBSD: lstFind.c,v 1.1.1.2 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstFindFrom.c b/devel/bmake/files/lst.lib/lstFindFrom.c index 271f310ca67..71013b6fb6b 100644 --- a/devel/bmake/files/lst.lib/lstFindFrom.c +++ b/devel/bmake/files/lst.lib/lstFindFrom.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstFindFrom.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstFindFrom.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstFindFrom.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstFindFrom.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstFindFrom.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstFindFrom.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstFindFrom.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstFirst.c b/devel/bmake/files/lst.lib/lstFirst.c index 4539f8b22f8..f81693aa123 100644 --- a/devel/bmake/files/lst.lib/lstFirst.c +++ b/devel/bmake/files/lst.lib/lstFirst.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstFirst.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstFirst.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstFirst.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstFirst.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstFirst.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstFirst.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstFirst.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstForEach.c b/devel/bmake/files/lst.lib/lstForEach.c index cca3dd80f5d..eaeccd672bf 100644 --- a/devel/bmake/files/lst.lib/lstForEach.c +++ b/devel/bmake/files/lst.lib/lstForEach.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstForEach.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstForEach.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstForEach.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstForEach.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstForEach.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstForEach.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstForEach.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstForEachFrom.c b/devel/bmake/files/lst.lib/lstForEachFrom.c index c65a60043a3..5c734a1fe23 100644 --- a/devel/bmake/files/lst.lib/lstForEachFrom.c +++ b/devel/bmake/files/lst.lib/lstForEachFrom.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstForEachFrom.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstForEachFrom.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstForEachFrom.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstForEachFrom.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstForEachFrom.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstInit.c b/devel/bmake/files/lst.lib/lstInit.c index a82d127cca8..c560a27dfb1 100644 --- a/devel/bmake/files/lst.lib/lstInit.c +++ b/devel/bmake/files/lst.lib/lstInit.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstInit.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstInit.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstInit.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstInit.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstInit.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstInit.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstInit.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstInsert.c b/devel/bmake/files/lst.lib/lstInsert.c index c60022efdfa..fd02184a030 100644 --- a/devel/bmake/files/lst.lib/lstInsert.c +++ b/devel/bmake/files/lst.lib/lstInsert.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstInsert.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstInsert.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstInsert.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstInsert.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstInsert.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstInsert.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstInsert.c,v 1.1.1.3 2008/11/11 19:32:32 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstInt.h b/devel/bmake/files/lst.lib/lstInt.h index 434026368a9..484f4c512ea 100644 --- a/devel/bmake/files/lst.lib/lstInt.h +++ b/devel/bmake/files/lst.lib/lstInt.h @@ -1,4 +1,4 @@ -/* $NetBSD: lstInt.h,v 1.1.1.3 2008/11/11 14:28:36 joerg Exp $ */ +/* $NetBSD: lstInt.h,v 1.1.1.4 2008/11/11 19:32:32 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/lst.lib/lstIsAtEnd.c b/devel/bmake/files/lst.lib/lstIsAtEnd.c index fb09223c3ce..b9e08809958 100644 --- a/devel/bmake/files/lst.lib/lstIsAtEnd.c +++ b/devel/bmake/files/lst.lib/lstIsAtEnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstIsAtEnd.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstIsAtEnd.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstIsAtEnd.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstIsAtEnd.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstIsAtEnd.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstIsEmpty.c b/devel/bmake/files/lst.lib/lstIsEmpty.c index 87aad7ae4e5..a6e036497ae 100644 --- a/devel/bmake/files/lst.lib/lstIsEmpty.c +++ b/devel/bmake/files/lst.lib/lstIsEmpty.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstIsEmpty.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ */ +/* $NetBSD: lstIsEmpty.c,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $"; +static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstIsEmpty.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstIsEmpty.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $"); +__RCSID("$NetBSD: lstIsEmpty.c,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstLast.c b/devel/bmake/files/lst.lib/lstLast.c index 47cc372cebb..7c1b72a96fe 100644 --- a/devel/bmake/files/lst.lib/lstLast.c +++ b/devel/bmake/files/lst.lib/lstLast.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstLast.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstLast.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstLast.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstLast.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstLast.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstLast.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstLast.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstMember.c b/devel/bmake/files/lst.lib/lstMember.c index a023ac97248..9152c23e4fc 100644 --- a/devel/bmake/files/lst.lib/lstMember.c +++ b/devel/bmake/files/lst.lib/lstMember.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstMember.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstMember.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstMember.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstMember.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstMember.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstMember.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstMember.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstNext.c b/devel/bmake/files/lst.lib/lstNext.c index f28e467c0c1..16cae3f977b 100644 --- a/devel/bmake/files/lst.lib/lstNext.c +++ b/devel/bmake/files/lst.lib/lstNext.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstNext.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstNext.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstNext.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstNext.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstNext.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstNext.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstNext.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstOpen.c b/devel/bmake/files/lst.lib/lstOpen.c index 9208b35ac3b..8c3b17b19ce 100644 --- a/devel/bmake/files/lst.lib/lstOpen.c +++ b/devel/bmake/files/lst.lib/lstOpen.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstOpen.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstOpen.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstOpen.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstOpen.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstOpen.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstOpen.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstOpen.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstPrev.c b/devel/bmake/files/lst.lib/lstPrev.c index 7ea030338ec..1178fd676ee 100644 --- a/devel/bmake/files/lst.lib/lstPrev.c +++ b/devel/bmake/files/lst.lib/lstPrev.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstPrev.c,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstPrev.c,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstPrev.c,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstPrev.c,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstSucc.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstPrev.c,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstPrev.c,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstRemove.c b/devel/bmake/files/lst.lib/lstRemove.c index 37c949a627a..a100c64dc3e 100644 --- a/devel/bmake/files/lst.lib/lstRemove.c +++ b/devel/bmake/files/lst.lib/lstRemove.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstRemove.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstRemove.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstRemove.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstRemove.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstRemove.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstRemove.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstRemove.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstReplace.c b/devel/bmake/files/lst.lib/lstReplace.c index c7aa48aad5c..2cd6fa3368b 100644 --- a/devel/bmake/files/lst.lib/lstReplace.c +++ b/devel/bmake/files/lst.lib/lstReplace.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstReplace.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstReplace.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstReplace.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstReplace.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstReplace.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstReplace.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstReplace.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/lstSucc.c b/devel/bmake/files/lst.lib/lstSucc.c index 497bac25967..e4513faeac3 100644 --- a/devel/bmake/files/lst.lib/lstSucc.c +++ b/devel/bmake/files/lst.lib/lstSucc.c @@ -1,4 +1,4 @@ -/* $NetBSD: lstSucc.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: lstSucc.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -33,14 +33,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: lstSucc.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: lstSucc.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)lstSucc.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: lstSucc.c,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $"); +__RCSID("$NetBSD: lstSucc.c,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/lst.lib/makefile.boot.in b/devel/bmake/files/lst.lib/makefile.boot.in index a87e5c59f3f..e771f511f3d 100644 --- a/devel/bmake/files/lst.lib/makefile.boot.in +++ b/devel/bmake/files/lst.lib/makefile.boot.in @@ -1,5 +1,5 @@ # RCSid: -# $Id: makefile.boot.in,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ +# $Id: makefile.boot.in,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ srcdir=@srcdir@ VPATH=.:$(srcdir) diff --git a/devel/bmake/files/machine.sh b/devel/bmake/files/machine.sh index 76698e34bd6..5789b16d695 100755 --- a/devel/bmake/files/machine.sh +++ b/devel/bmake/files/machine.sh @@ -2,7 +2,7 @@ # derrived from /etc/rc_d/os.sh # RCSid: -# $Id: machine.sh,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $Id: machine.sh,v 1.1.1.2 2008/11/11 19:32:23 joerg Exp $ # # @(#) Copyright (c) 1994-2002 Simon J. Gerraty # diff --git a/devel/bmake/files/main.c b/devel/bmake/files/main.c index cf516c6f659..d10dabad989 100644 --- a/devel/bmake/files/main.c +++ b/devel/bmake/files/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.1.1.3 2008/11/11 14:28:29 joerg Exp $ */ +/* $NetBSD: main.c,v 1.1.1.4 2008/11/11 19:32:23 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.1.1.3 2008/11/11 14:28:29 joerg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.1.1.4 2008/11/11 19:32:23 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.1.1.3 2008/11/11 14:28:29 joerg Exp $"); +__RCSID("$NetBSD: main.c,v 1.1.1.4 2008/11/11 19:32:23 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/make-conf.h b/devel/bmake/files/make-conf.h index 6dc0164c376..a61dabc8f4c 100644 --- a/devel/bmake/files/make-conf.h +++ b/devel/bmake/files/make-conf.h @@ -1,4 +1,4 @@ -/* $NetBSD: make-conf.h,v 1.1.1.2 2008/03/09 19:39:32 joerg Exp $ */ +/* $NetBSD: make-conf.h,v 1.1.1.3 2008/11/11 19:32:23 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. diff --git a/devel/bmake/files/make.1 b/devel/bmake/files/make.1 index 02c75a96667..08956b6be4d 100644 --- a/devel/bmake/files/make.1 +++ b/devel/bmake/files/make.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.1.1.3 2008/11/11 14:28:29 joerg Exp $ +.\" $NetBSD: make.1,v 1.1.1.4 2008/11/11 19:32:24 joerg Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. diff --git a/devel/bmake/files/make.c b/devel/bmake/files/make.c index d313208b2e2..0e4908a354d 100644 --- a/devel/bmake/files/make.c +++ b/devel/bmake/files/make.c @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ */ +/* $NetBSD: make.c,v 1.1.1.3 2008/11/11 19:32:27 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: make.c,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $"; +static char rcsid[] = "$NetBSD: make.c,v 1.1.1.3 2008/11/11 19:32:27 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: make.c,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $"); +__RCSID("$NetBSD: make.c,v 1.1.1.3 2008/11/11 19:32:27 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/make.h b/devel/bmake/files/make.h index 46e752fe9b7..4a75dde9bdf 100644 --- a/devel/bmake/files/make.h +++ b/devel/bmake/files/make.h @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ */ +/* $NetBSD: make.h,v 1.1.1.3 2008/11/11 19:32:27 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/makefile.boot.in b/devel/bmake/files/makefile.boot.in index 8c576611443..4a6e1621d73 100644 --- a/devel/bmake/files/makefile.boot.in +++ b/devel/bmake/files/makefile.boot.in @@ -1,5 +1,5 @@ # RCSid: -# $Id: makefile.boot.in,v 1.1.1.2 2008/03/09 19:39:33 joerg Exp $ +# $Id: makefile.boot.in,v 1.1.1.3 2008/11/11 19:32:27 joerg Exp $ # # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture diff --git a/devel/bmake/files/missing/sys/cdefs.h b/devel/bmake/files/missing/sys/cdefs.h index 19611ed63b5..5fdbc6366b4 100644 --- a/devel/bmake/files/missing/sys/cdefs.h +++ b/devel/bmake/files/missing/sys/cdefs.h @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ */ /* * Copyright (c) 1991, 1993 diff --git a/devel/bmake/files/mkdeps.sh b/devel/bmake/files/mkdeps.sh index 59723b99cd3..6f9c1a4b073 100755 --- a/devel/bmake/files/mkdeps.sh +++ b/devel/bmake/files/mkdeps.sh @@ -40,7 +40,7 @@ # # RCSid: -# $Id: mkdeps.sh,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $Id: mkdeps.sh,v 1.1.1.2 2008/11/11 19:32:27 joerg Exp $ # # @(#) Copyright (c) 1993 Simon J. Gerraty # diff --git a/devel/bmake/files/nonints.h b/devel/bmake/files/nonints.h index 079041827c9..c4f760bc00c 100644 --- a/devel/bmake/files/nonints.h +++ b/devel/bmake/files/nonints.h @@ -1,4 +1,4 @@ -/* $NetBSD: nonints.h,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $ */ +/* $NetBSD: nonints.h,v 1.1.1.4 2008/11/11 19:32:27 joerg Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/os.sh b/devel/bmake/files/os.sh index 33512d98d6a..90d474c188e 100644 --- a/devel/bmake/files/os.sh +++ b/devel/bmake/files/os.sh @@ -17,7 +17,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: os.sh,v 1.1.1.2 2008/03/09 19:39:32 joerg Exp $ +# $Id: os.sh,v 1.1.1.3 2008/11/11 19:32:27 joerg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # diff --git a/devel/bmake/files/parse.c b/devel/bmake/files/parse.c index fb91ce45f50..fffccceb86c 100644 --- a/devel/bmake/files/parse.c +++ b/devel/bmake/files/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $ */ +/* $NetBSD: parse.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $"); +__RCSID("$NetBSD: parse.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/pathnames.h b/devel/bmake/files/pathnames.h index 185d9681161..b727c4bc65b 100644 --- a/devel/bmake/files/pathnames.h +++ b/devel/bmake/files/pathnames.h @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ */ +/* $NetBSD: pathnames.h,v 1.1.1.2 2008/11/11 19:32:28 joerg Exp $ */ /* * Copyright (c) 1990, 1993 @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ + * $Id: pathnames.h,v 1.1.1.2 2008/11/11 19:32:28 joerg Exp $ */ #if HAVE_CONFIG_H diff --git a/devel/bmake/files/ranlib.h b/devel/bmake/files/ranlib.h index 715987a22fc..895ba464501 100644 --- a/devel/bmake/files/ranlib.h +++ b/devel/bmake/files/ranlib.h @@ -1,5 +1,5 @@ /* @(#)ranlib.h 1.6 88/08/19 SMI; from UCB 4.1 83/05/03 */ -/* $Id: ranlib.h,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ */ +/* $Id: ranlib.h,v 1.1.1.2 2008/11/11 19:32:28 joerg Exp $ */ /* * Structure of the __.SYMDEF table of contents for an archive. diff --git a/devel/bmake/files/setenv.c b/devel/bmake/files/setenv.c index a0d19527fb5..55f1802cb2e 100644 --- a/devel/bmake/files/setenv.c +++ b/devel/bmake/files/setenv.c @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)setenv.c 5.6 (Berkeley) 6/4/91";*/ -static char *rcsid = "$Id: setenv.c,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $"; +static char *rcsid = "$Id: setenv.c,v 1.1.1.2 2008/11/11 19:32:28 joerg Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stddef.h> diff --git a/devel/bmake/files/sigcompat.c b/devel/bmake/files/sigcompat.c index e62aea1296d..4dbf70ccb14 100644 --- a/devel/bmake/files/sigcompat.c +++ b/devel/bmake/files/sigcompat.c @@ -101,7 +101,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)sigcompat.c 5.3 (Berkeley) 2/24/91";*/ -static char *rcsid = "$Id: sigcompat.c,v 1.1.1.2 2008/03/09 19:39:34 joerg Exp $"; +static char *rcsid = "$Id: sigcompat.c,v 1.1.1.3 2008/11/11 19:32:28 joerg Exp $"; #endif /* LIBC_SCCS and not lint */ #undef signal diff --git a/devel/bmake/files/sprite.h b/devel/bmake/files/sprite.h index 7f998061ad7..cc90b93c2e7 100644 --- a/devel/bmake/files/sprite.h +++ b/devel/bmake/files/sprite.h @@ -1,4 +1,4 @@ -/* $NetBSD: sprite.h,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ */ +/* $NetBSD: sprite.h,v 1.1.1.2 2008/11/11 19:32:28 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 diff --git a/devel/bmake/files/str.c b/devel/bmake/files/str.c index dec066292c2..de573498965 100644 --- a/devel/bmake/files/str.c +++ b/devel/bmake/files/str.c @@ -1,4 +1,4 @@ -/* $NetBSD: str.c,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $ */ +/* $NetBSD: str.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: str.c,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $"; +static char rcsid[] = "$NetBSD: str.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90"; #else -__RCSID("$NetBSD: str.c,v 1.1.1.3 2008/11/11 14:28:30 joerg Exp $"); +__RCSID("$NetBSD: str.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/suff.c b/devel/bmake/files/suff.c index a21f7fab4de..6557cee7001 100644 --- a/devel/bmake/files/suff.c +++ b/devel/bmake/files/suff.c @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.1.1.3 2008/11/11 14:28:33 joerg Exp $ */ +/* $NetBSD: suff.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.1.1.3 2008/11/11 14:28:33 joerg Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.1.1.3 2008/11/11 14:28:33 joerg Exp $"); +__RCSID("$NetBSD: suff.c,v 1.1.1.4 2008/11/11 19:32:28 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/targ.c b/devel/bmake/files/targ.c index f480ef6e71e..0793c974748 100644 --- a/devel/bmake/files/targ.c +++ b/devel/bmake/files/targ.c @@ -1,4 +1,4 @@ -/* $NetBSD: targ.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $ */ +/* $NetBSD: targ.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: targ.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $"; +static char rcsid[] = "$NetBSD: targ.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)targ.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: targ.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $"); +__RCSID("$NetBSD: targ.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/trace.c b/devel/bmake/files/trace.c index f1b8c708cd8..79c6b622e07 100644 --- a/devel/bmake/files/trace.c +++ b/devel/bmake/files/trace.c @@ -1,4 +1,4 @@ -/* $NetBSD: trace.c,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $ */ +/* $NetBSD: trace.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,11 +31,11 @@ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: trace.c,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $"; +static char rcsid[] = "$NetBSD: trace.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: trace.c,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $"); +__RCSID("$NetBSD: trace.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"); #endif /* not lint */ #endif diff --git a/devel/bmake/files/trace.h b/devel/bmake/files/trace.h index 5e96420de83..222381b1fcc 100644 --- a/devel/bmake/files/trace.h +++ b/devel/bmake/files/trace.h @@ -1,4 +1,4 @@ -/* $NetBSD: trace.h,v 1.1.1.3 2008/11/11 14:28:28 joerg Exp $ */ +/* $NetBSD: trace.h,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. diff --git a/devel/bmake/files/unit-tests/Makefile.in b/devel/bmake/files/unit-tests/Makefile.in index 03ba74e3b41..5be5b60bf51 100644 --- a/devel/bmake/files/unit-tests/Makefile.in +++ b/devel/bmake/files/unit-tests/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.1.1.3 2008/11/11 14:28:36 joerg Exp $ +# $Id: Makefile.in,v 1.1.1.4 2008/11/11 19:32:33 joerg Exp $ # -# $NetBSD: Makefile.in,v 1.1.1.3 2008/11/11 14:28:36 joerg Exp $ +# $NetBSD: Makefile.in,v 1.1.1.4 2008/11/11 19:32:33 joerg Exp $ # # Unit tests for make(1) # The main targets are: diff --git a/devel/bmake/files/unit-tests/cond1 b/devel/bmake/files/unit-tests/cond1 index b04a529a820..4eaa4e1ec4f 100644 --- a/devel/bmake/files/unit-tests/cond1 +++ b/devel/bmake/files/unit-tests/cond1 @@ -1,4 +1,4 @@ -# $Id: cond1,v 1.1.1.2 2008/11/11 14:28:36 joerg Exp $ +# $Id: cond1,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ # hard code these! TEST_UNAME_S= NetBSD diff --git a/devel/bmake/files/unit-tests/dotwait b/devel/bmake/files/unit-tests/dotwait index 8ae49950bf8..b8f79494ec0 100644 --- a/devel/bmake/files/unit-tests/dotwait +++ b/devel/bmake/files/unit-tests/dotwait @@ -1,4 +1,4 @@ -# $NetBSD: dotwait,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $ +# $NetBSD: dotwait,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ THISMAKEFILE:= ${.PARSEDIR}/${.PARSEFILE} diff --git a/devel/bmake/files/unit-tests/export b/devel/bmake/files/unit-tests/export index 1b34677a626..736d319cb4f 100644 --- a/devel/bmake/files/unit-tests/export +++ b/devel/bmake/files/unit-tests/export @@ -1,4 +1,4 @@ -# $Id: export,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $ +# $Id: export,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ UT_TEST=export UT_FOO=foo${BAR} diff --git a/devel/bmake/files/unit-tests/export-all b/devel/bmake/files/unit-tests/export-all index 14d394ce2c9..8a5a54757f1 100644 --- a/devel/bmake/files/unit-tests/export-all +++ b/devel/bmake/files/unit-tests/export-all @@ -1,4 +1,4 @@ -# $Id: export-all,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $ +# $Id: export-all,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ UT_OK=good UT_F=fine diff --git a/devel/bmake/files/unit-tests/moderrs b/devel/bmake/files/unit-tests/moderrs index f9c28d91bf6..931adee5ae8 100644 --- a/devel/bmake/files/unit-tests/moderrs +++ b/devel/bmake/files/unit-tests/moderrs @@ -1,4 +1,4 @@ -# $Id: moderrs,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $ +# $Id: moderrs,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ # # various modifier error tests diff --git a/devel/bmake/files/unit-tests/modmisc b/devel/bmake/files/unit-tests/modmisc index 98daa95a998..be311330e73 100644 --- a/devel/bmake/files/unit-tests/modmisc +++ b/devel/bmake/files/unit-tests/modmisc @@ -1,4 +1,4 @@ -# $Id: modmisc,v 1.1.1.1 2008/03/09 19:39:35 joerg Exp $ +# $Id: modmisc,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ # # miscellaneous modifier tests diff --git a/devel/bmake/files/unit-tests/modorder b/devel/bmake/files/unit-tests/modorder index c4310b44c7f..55fc1a77dca 100644 --- a/devel/bmake/files/unit-tests/modorder +++ b/devel/bmake/files/unit-tests/modorder @@ -1,4 +1,4 @@ -# $NetBSD: modorder,v 1.1.1.2 2008/03/09 19:39:35 joerg Exp $ +# $NetBSD: modorder,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ LIST= one two three four five six seven eight nine ten LISTX= ${LIST:Ox} diff --git a/devel/bmake/files/unit-tests/modword b/devel/bmake/files/unit-tests/modword index 982378a2c9b..b83b14d6a1e 100644 --- a/devel/bmake/files/unit-tests/modword +++ b/devel/bmake/files/unit-tests/modword @@ -1,4 +1,4 @@ -# $Id: modword,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $Id: modword,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ # # Test behaviour of new :[] modifier diff --git a/devel/bmake/files/unit-tests/posix b/devel/bmake/files/unit-tests/posix index 7915112c883..db800fdb95e 100644 --- a/devel/bmake/files/unit-tests/posix +++ b/devel/bmake/files/unit-tests/posix @@ -1,4 +1,4 @@ -# $Id: posix,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ +# $Id: posix,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ all: x plus subs err diff --git a/devel/bmake/files/unit-tests/qequals b/devel/bmake/files/unit-tests/qequals index 6324a50bc6e..65b96a3a007 100644 --- a/devel/bmake/files/unit-tests/qequals +++ b/devel/bmake/files/unit-tests/qequals @@ -1,4 +1,4 @@ -# $Id: qequals,v 1.1.1.1 2008/11/11 14:28:36 joerg Exp $ +# $Id: qequals,v 1.1.1.2 2008/11/11 19:32:33 joerg Exp $ M= i386 V.i386= OK diff --git a/devel/bmake/files/unit-tests/varcmd b/devel/bmake/files/unit-tests/varcmd index d01895b05f7..4cc4dbeb90d 100644 --- a/devel/bmake/files/unit-tests/varcmd +++ b/devel/bmake/files/unit-tests/varcmd @@ -1,4 +1,4 @@ -# $Id: varcmd,v 1.1.1.2 2008/11/11 14:28:36 joerg Exp $ +# $Id: varcmd,v 1.1.1.3 2008/11/11 19:32:33 joerg Exp $ # # Test behaviour of recursive make and vars set on command line. diff --git a/devel/bmake/files/util.c b/devel/bmake/files/util.c index 94288aef89b..4e131962d0c 100644 --- a/devel/bmake/files/util.c +++ b/devel/bmake/files/util.c @@ -1,18 +1,18 @@ -/* $NetBSD: util.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $ */ +/* $NetBSD: util.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $ */ /* * Missing stuff from OS's * - * $Id: util.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $ + * $Id: util.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $ */ #include "make.h" #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: util.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $"; +static char rcsid[] = "$NetBSD: util.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"; #else #ifndef lint -__RCSID("$NetBSD: util.c,v 1.1.1.3 2008/11/11 14:28:34 joerg Exp $"); +__RCSID("$NetBSD: util.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"); #endif #endif @@ -476,39 +476,6 @@ snprintf(char *s, size_t n, const char *fmt, ...) return rv; } #endif - -#if !defined(HAVE_VASPRINTF) -int -vasprintf(char **s, const char *fmt, va_list ap) -{ - char buf[128]; - int rv; - - rv = vsnprintf(buf, sizeof(buf), fmt, ap); - if (rv < sizeof(buf)) - *s = strdup(buf); - else { - if ((*s = malloc(rv + 1))) - vsnprintf(*s, rv + 1, fmt, ap); - } - va_end(ap); - return *s ? rv : -1; -} -#endif - -#if !defined(HAVE_ASPRINTF) -int -asprintf(char **s, const char *fmt, ...) -{ - va_list ap; - int rv; - - va_start(ap, fmt); - rv = vasprintf(s, fmt, ap); - va_end(ap); - return rv; -} -#endif #if !defined(HAVE_STRFTIME) size_t diff --git a/devel/bmake/files/var.c b/devel/bmake/files/var.c index 576c50747e0..1df6a575405 100644 --- a/devel/bmake/files/var.c +++ b/devel/bmake/files/var.c @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.1.1.3 2008/11/11 14:28:35 joerg Exp $ */ +/* $NetBSD: var.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: var.c,v 1.1.1.3 2008/11/11 14:28:35 joerg Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: var.c,v 1.1.1.3 2008/11/11 14:28:35 joerg Exp $"); +__RCSID("$NetBSD: var.c,v 1.1.1.4 2008/11/11 19:32:29 joerg Exp $"); #endif #endif /* not lint */ #endif diff --git a/devel/bmake/files/wait.h b/devel/bmake/files/wait.h index deab3de759b..8806d778ccc 100644 --- a/devel/bmake/files/wait.h +++ b/devel/bmake/files/wait.h @@ -6,7 +6,7 @@ */ /* * RCSid: - * $Id: wait.h,v 1.1.1.1 2005/12/02 00:03:00 sjg Exp $ + * $Id: wait.h,v 1.1.1.2 2008/11/11 19:32:29 joerg Exp $ * * @(#)Copyright (c) 1994, Simon J. Gerraty. * |