Module Name: src Committed By: christos Date: Mon Oct 20 22:04:31 UTC 2014
Modified Files: src/external/bsd/file/dist: Makefile.in aclocal.m4 config.h.in configure install-sh missing src/external/bsd/file/dist/doc: Makefile.in src/external/bsd/file/dist/magic: Makefile.in src/external/bsd/file/dist/python: Makefile.in src/external/bsd/file/dist/src: Makefile.in src/external/bsd/file/dist/tests: Makefile.in Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/aclocal.m4 cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/config.h.in \ src/external/bsd/file/dist/install-sh cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/configure cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/missing cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/Makefile.in cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/python/Makefile.in cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/tests/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/file/dist/Makefile.in diff -u src/external/bsd/file/dist/Makefile.in:1.10 src/external/bsd/file/dist/Makefile.in:1.11 --- src/external/bsd/file/dist/Makefile.in:1.10 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/Makefile.in Mon Oct 20 18:04:30 2014 @@ -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 @@ distcheck: dist && 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 \ Index: src/external/bsd/file/dist/aclocal.m4 diff -u src/external/bsd/file/dist/aclocal.m4:1.8 src/external/bsd/file/dist/aclocal.m4:1.9 --- src/external/bsd/file/dist/aclocal.m4:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/aclocal.m4 Mon Oct 20 18:04:30 2014 @@ -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 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [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 @@ m4_define([_AM_AUTOCONF_VERSION], []) # 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]))]) Index: src/external/bsd/file/dist/config.h.in diff -u src/external/bsd/file/dist/config.h.in:1.9 src/external/bsd/file/dist/config.h.in:1.10 --- src/external/bsd/file/dist/config.h.in:1.9 Fri Oct 10 16:15:01 2014 +++ src/external/bsd/file/dist/config.h.in Mon Oct 20 18:04:30 2014 @@ -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 Index: src/external/bsd/file/dist/install-sh diff -u src/external/bsd/file/dist/install-sh:1.9 src/external/bsd/file/dist/install-sh:1.10 --- src/external/bsd/file/dist/install-sh:1.9 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/install-sh Mon Oct 20 18:04:31 2014 @@ -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. # Index: src/external/bsd/file/dist/configure diff -u src/external/bsd/file/dist/configure:1.12 src/external/bsd/file/dist/configure:1.13 --- src/external/bsd/file/dist/configure:1.12 Fri Oct 10 16:15:01 2014 +++ src/external/bsd/file/dist/configure Mon Oct 20 18:04:30 2014 @@ -12815,7 +12815,7 @@ fi 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 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" Index: src/external/bsd/file/dist/missing diff -u src/external/bsd/file/dist/missing:1.5 src/external/bsd/file/dist/missing:1.6 --- src/external/bsd/file/dist/missing:1.5 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/missing Mon Oct 20 18:04:31 2014 @@ -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 <pin...@iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ give_advice () ;; 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*) Index: src/external/bsd/file/dist/doc/Makefile.in diff -u src/external/bsd/file/dist/doc/Makefile.in:1.8 src/external/bsd/file/dist/doc/Makefile.in:1.9 --- src/external/bsd/file/dist/doc/Makefile.in:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/doc/Makefile.in Mon Oct 20 18:04:31 2014 @@ -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. Index: src/external/bsd/file/dist/magic/Makefile.in diff -u src/external/bsd/file/dist/magic/Makefile.in:1.12 src/external/bsd/file/dist/magic/Makefile.in:1.13 --- src/external/bsd/file/dist/magic/Makefile.in:1.12 Fri Oct 10 16:15:01 2014 +++ src/external/bsd/file/dist/magic/Makefile.in Mon Oct 20 18:04:31 2014 @@ -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. Index: src/external/bsd/file/dist/python/Makefile.in diff -u src/external/bsd/file/dist/python/Makefile.in:1.8 src/external/bsd/file/dist/python/Makefile.in:1.9 --- src/external/bsd/file/dist/python/Makefile.in:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/python/Makefile.in Mon Oct 20 18:04:31 2014 @@ -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. Index: src/external/bsd/file/dist/src/Makefile.in diff -u src/external/bsd/file/dist/src/Makefile.in:1.10 src/external/bsd/file/dist/src/Makefile.in:1.11 --- src/external/bsd/file/dist/src/Makefile.in:1.10 Fri Oct 10 16:15:02 2014 +++ src/external/bsd/file/dist/src/Makefile.in Mon Oct 20 18:04:31 2014 @@ -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 @@ build_triplet = @build@ 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 \ Index: src/external/bsd/file/dist/tests/Makefile.in diff -u src/external/bsd/file/dist/tests/Makefile.in:1.8 src/external/bsd/file/dist/tests/Makefile.in:1.9 --- src/external/bsd/file/dist/tests/Makefile.in:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/tests/Makefile.in Mon Oct 20 18:04:31 2014 @@ -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.