[src/trunk]: src/external/bsd/file/dist regen

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df16bd1b5c4d
branches:  trunk
changeset: 333156:df16bd1b5c4d
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Oct 20 22:04:30 2014 +0000

description:
regen

diffstat:

 external/bsd/file/dist/Makefile.in        |  5 ++---
 external/bsd/file/dist/aclocal.m4         |  6 +++---
 external/bsd/file/dist/config.h.in        |  6 ++++++
 external/bsd/file/dist/configure          |  4 ++--
 external/bsd/file/dist/doc/Makefile.in    |  2 +-
 external/bsd/file/dist/install-sh         |  2 +-
 external/bsd/file/dist/magic/Makefile.in  |  2 +-
 external/bsd/file/dist/missing            |  4 ++--
 external/bsd/file/dist/python/Makefile.in |  2 +-
 external/bsd/file/dist/src/Makefile.in    |  8 ++++----
 external/bsd/file/dist/tests/Makefile.in  |  2 +-
 11 files changed, 24 insertions(+), 19 deletions(-)

diffs (182 lines):

diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/Makefile.in
--- a/external/bsd/file/dist/Makefile.in        Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/Makefile.in        Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -619,10 +619,9 @@
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
          && $(am__cd) $(distdir)/_build \
-         && ../configure \
+         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
-           --srcdir=.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/aclocal.m4
--- a/external/bsd/file/dist/aclocal.m4 Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/aclocal.m4 Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -113,7 +113,7 @@
 [am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.14], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -129,7 +129,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.14])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/config.h.in
--- a/external/bsd/file/dist/config.h.in        Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/config.h.in        Mon Oct 20 22:04:30 2014 +0000
@@ -104,6 +104,9 @@
 /* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
@@ -228,6 +231,9 @@
 /* Define to 1 if `vfork' works. */
 #undef HAVE_WORKING_VFORK
 
+/* Define to 1 if you have the <xlocale.h> header file. */
+#undef HAVE_XLOCALE_H
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure  Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/configure  Mon Oct 20 22:04:30 2014 +0000
@@ -12815,7 +12815,7 @@
 
 done
 
-for ac_header in getopt.h err.h
+for ac_header in getopt.h err.h xlocale.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -14221,7 +14221,7 @@
 fi
 
 
-for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale
+for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale setlocale
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/doc/Makefile.in
--- a/external/bsd/file/dist/doc/Makefile.in    Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/doc/Makefile.in    Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/install-sh
--- a/external/bsd/file/dist/install-sh Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/install-sh Mon Oct 20 22:04:30 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: install-sh,v 1.9 2014/06/13 02:08:06 christos Exp $
+# $NetBSD: install-sh,v 1.10 2014/10/20 22:04:31 christos Exp $
 # This script now also installs multiple files, but might choke on installing
 # multiple files with spaces in the file names.
 #
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/magic/Makefile.in
--- a/external/bsd/file/dist/magic/Makefile.in  Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/magic/Makefile.in  Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/missing
--- a/external/bsd/file/dist/missing    Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/missing    Mon Oct 20 22:04:30 2014 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2012-06-26.16; # UTC
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard%iro.umontreal.ca@localhost>, 1996.
@@ -160,7 +160,7 @@
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
+      echo "the 'automa4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/python/Makefile.in
--- a/external/bsd/file/dist/python/Makefile.in Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/python/Makefile.in Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/src/Makefile.in
--- a/external/bsd/file/dist/src/Makefile.in    Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/src/Makefile.in    Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -81,9 +81,9 @@
 host_triplet = @host@
 bin_PROGRAMS = file$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am asctime_r.c \
-       pread.c ctime_r.c getline.c strlcat.c vasprintf.c strcasestr.c \
-       asprintf.c getopt_long.c strlcpy.c fmtcheck.c \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am asprintf.c \
+       pread.c strcasestr.c getline.c fmtcheck.c strlcat.c \
+       asctime_r.c ctime_r.c vasprintf.c strlcpy.c getopt_long.c \
        $(top_srcdir)/depcomp $(include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
diff -r f66219c94f02 -r df16bd1b5c4d external/bsd/file/dist/tests/Makefile.in
--- a/external/bsd/file/dist/tests/Makefile.in  Mon Oct 20 21:48:57 2014 +0000
+++ b/external/bsd/file/dist/tests/Makefile.in  Mon Oct 20 22:04:30 2014 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.