Module Name: othersrc
Committed By: lukem
Date: Sun Jan 31 22:25:37 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure tnftp_config.h.in
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.47 -r1.48 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/Makefile.in
diff -u othersrc/usr.bin/tnftp/Makefile.in:1.9 othersrc/usr.bin/tnftp/Makefile.in:1.10
--- othersrc/usr.bin/tnftp/Makefile.in:1.9 Sun May 5 13:21:06 2013
+++ othersrc/usr.bin/tnftp/Makefile.in Sun Jan 31 22:25:36 2016
@@ -116,7 +116,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.47 othersrc/usr.bin/tnftp/configure:1.48
--- othersrc/usr.bin/tnftp/configure:1.47 Sun Jan 31 06:10:20 2016
+++ othersrc/usr.bin/tnftp/configure Sun Jan 31 22:25:36 2016
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.31 .
+# From configure.ac Revision: 1.34 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tnftp 20151004.
#
@@ -645,7 +645,6 @@ LTLIBOBJS
USE_LIBEDIT_FALSE
USE_LIBEDIT_TRUE
LIBOBJS
-ALLOCA
WITH_SSL_FALSE
WITH_SSL_TRUE
OPENSSL_LDFLAGS
@@ -13141,39 +13140,6 @@ _ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
-else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
if test "x$ac_cv_type_size_t" = xyes; then :
@@ -13557,193 +13523,6 @@ fi
#
# Checks for library functions.
#
-#XXX remove alloca use
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_working_alloca_h=yes
-else
- ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-# endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_func_alloca_works=yes
-else
- ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble. Some versions do not even contain alloca or
-# contain a buggy version. If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then :
- ac_cv_os_cray=yes
-else
- ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; 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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
- break
-fi
-
- done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_c_stack_direction=0
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
- int dir, dummy = 0;
- if (! addr)
- addr = &dummy;
- *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
- dir = depth ? find_stack_direction (addr, depth - 1) : 0;
- return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
- return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_stack_direction=1
-else
- ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
$as_echo_n "checking whether closedir returns void... " >&6; }
if ${ac_cv_func_closedir_void+:} false; then :
@@ -14831,7 +14610,7 @@ fi
#
# Create the Makefiles.
#
-ac_config_files="$ac_config_files Makefile libedit/Makefile libedit/makelist libnetbsd/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile libedit/Makefile libnetbsd/Makefile src/Makefile"
cat >confcache <<\_ACEOF
@@ -15845,7 +15624,6 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libedit/Makefile") CONFIG_FILES="$CONFIG_FILES libedit/Makefile" ;;
- "libedit/makelist") CONFIG_FILES="$CONFIG_FILES libedit/makelist" ;;
"libnetbsd/Makefile") CONFIG_FILES="$CONFIG_FILES libnetbsd/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
Index: othersrc/usr.bin/tnftp/tnftp_config.h.in
diff -u othersrc/usr.bin/tnftp/tnftp_config.h.in:1.5 othersrc/usr.bin/tnftp/tnftp_config.h.in:1.6
--- othersrc/usr.bin/tnftp/tnftp_config.h.in:1.5 Sun Jan 31 06:10:20 2016
+++ othersrc/usr.bin/tnftp/tnftp_config.h.in Sun Jan 31 22:25:36 2016
@@ -3,27 +3,12 @@
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
/* Define to 1 if the `getpgrp' function requires zero arguments. */
#undef GETPGRP_VOID
/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
#undef GWINSZ_IN_SYS_IOCTL
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#undef HAVE_ALLOCA_H
-
/* Define to 1 if you have the <arpa/ftp.h> header file. */
#undef HAVE_ARPA_FTP_H
@@ -470,17 +455,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
Index: othersrc/usr.bin/tnftp/libedit/Makefile.in
diff -u othersrc/usr.bin/tnftp/libedit/Makefile.in:1.9 othersrc/usr.bin/tnftp/libedit/Makefile.in:1.10
--- othersrc/usr.bin/tnftp/libedit/Makefile.in:1.9 Sun May 5 13:21:06 2013
+++ othersrc/usr.bin/tnftp/libedit/Makefile.in Sun Jan 31 22:25:36 2016
@@ -35,8 +35,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = libedit
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/makelist.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/buildaux/ax_check_openssl.m4 \
$(top_srcdir)/buildaux/libtool.m4 \
@@ -49,17 +48,17 @@ am__configure_deps = $(am__aclocal_m4_de
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/tnftp_config.h
-CONFIG_CLEAN_FILES = makelist
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libedit_la_DEPENDENCIES = $(top_builddir)/libnetbsd/libnetbsd.la
-am_libedit_la_OBJECTS = libedit_la-chared.lo libedit_la-common.lo \
- libedit_la-el.lo libedit_la-emacs.lo libedit_la-hist.lo \
- libedit_la-history.lo libedit_la-key.lo libedit_la-map.lo \
- libedit_la-parse.lo libedit_la-prompt.lo libedit_la-read.lo \
- libedit_la-refresh.lo libedit_la-search.lo libedit_la-sig.lo \
- libedit_la-term.lo libedit_la-tokenizer.lo libedit_la-tty.lo \
- libedit_la-vi.lo
+am_libedit_la_OBJECTS = libedit_la-chared.lo libedit_la-chartype.lo \
+ libedit_la-common.lo libedit_la-el.lo libedit_la-emacs.lo \
+ libedit_la-hist.lo libedit_la-history.lo \
+ libedit_la-keymacro.lo libedit_la-map.lo libedit_la-parse.lo \
+ libedit_la-prompt.lo libedit_la-read.lo libedit_la-refresh.lo \
+ libedit_la-search.lo libedit_la-sig.lo libedit_la-terminal.lo \
+ libedit_la-tokenizer.lo libedit_la-tty.lo libedit_la-vi.lo
am__objects_1 = libedit_la-fcns.lo libedit_la-help.lo
nodist_libedit_la_OBJECTS = $(am__objects_1)
libedit_la_OBJECTS = $(am_libedit_la_OBJECTS) \
@@ -99,7 +98,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
@@ -221,12 +219,13 @@ top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libedit.la
libedit_la_SOURCES = \
chared.c \
+ chartype.c \
common.c \
el.c \
emacs.c \
hist.c \
history.c \
- key.c \
+ keymacro.c \
map.c \
parse.c \
prompt.c \
@@ -234,7 +233,7 @@ libedit_la_SOURCES = \
refresh.c \
search.c \
sig.c \
- term.c \
+ terminal.c \
tokenizer.c \
tty.c \
vi.c
@@ -267,8 +266,10 @@ BUILT_SOURCES = \
CLEANFILES = \
$(generated_files)
+MAKELIST = AWK=$(AWK) $(SHELL) $(srcdir)/makelist
EXTRA_DIST = \
chared.h \
+ chartype.h \
editline.3 \
editrc.5 \
el.h \
@@ -276,7 +277,7 @@ EXTRA_DIST = \
filecomplete.h \
hist.h \
histedit.h \
- key.h \
+ keymacro.h \
map.h \
parse.h \
prompt.h \
@@ -287,7 +288,7 @@ EXTRA_DIST = \
search.h \
sig.h \
sys.h \
- term.h \
+ terminal.h \
tty.h
all: $(BUILT_SOURCES)
@@ -325,8 +326,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-makelist: $(top_builddir)/config.status $(srcdir)/makelist.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -346,6 +345,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-chared.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-chartype.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-common.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-el.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-emacs.Plo@am__quote@
@@ -353,7 +353,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-help.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-hist.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-history.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-key.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-keymacro.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-map.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-parse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-prompt.Plo@am__quote@
@@ -361,7 +361,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-refresh.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-search.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-sig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-term.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-terminal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-tokenizer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-tty.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_la-vi.Plo@am__quote@
@@ -398,6 +398,14 @@ libedit_la-chared.lo: chared.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-chared.lo `test -f 'chared.c' || echo '$(srcdir)/'`chared.c
+libedit_la-chartype.lo: chartype.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-chartype.lo -MD -MP -MF $(DEPDIR)/libedit_la-chartype.Tpo -c -o libedit_la-chartype.lo `test -f 'chartype.c' || echo '$(srcdir)/'`chartype.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_la-chartype.Tpo $(DEPDIR)/libedit_la-chartype.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='chartype.c' object='libedit_la-chartype.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-chartype.lo `test -f 'chartype.c' || echo '$(srcdir)/'`chartype.c
+
libedit_la-common.lo: common.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-common.lo -MD -MP -MF $(DEPDIR)/libedit_la-common.Tpo -c -o libedit_la-common.lo `test -f 'common.c' || echo '$(srcdir)/'`common.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_la-common.Tpo $(DEPDIR)/libedit_la-common.Plo
@@ -438,13 +446,13 @@ libedit_la-history.lo: history.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-history.lo `test -f 'history.c' || echo '$(srcdir)/'`history.c
-libedit_la-key.lo: key.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-key.lo -MD -MP -MF $(DEPDIR)/libedit_la-key.Tpo -c -o libedit_la-key.lo `test -f 'key.c' || echo '$(srcdir)/'`key.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_la-key.Tpo $(DEPDIR)/libedit_la-key.Plo
+libedit_la-keymacro.lo: keymacro.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-keymacro.lo -MD -MP -MF $(DEPDIR)/libedit_la-keymacro.Tpo -c -o libedit_la-keymacro.lo `test -f 'keymacro.c' || echo '$(srcdir)/'`keymacro.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_la-keymacro.Tpo $(DEPDIR)/libedit_la-keymacro.Plo
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='key.c' object='libedit_la-key.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='keymacro.c' object='libedit_la-keymacro.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-key.lo `test -f 'key.c' || echo '$(srcdir)/'`key.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-keymacro.lo `test -f 'keymacro.c' || echo '$(srcdir)/'`keymacro.c
libedit_la-map.lo: map.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-map.lo -MD -MP -MF $(DEPDIR)/libedit_la-map.Tpo -c -o libedit_la-map.lo `test -f 'map.c' || echo '$(srcdir)/'`map.c
@@ -502,13 +510,13 @@ libedit_la-sig.lo: sig.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-sig.lo `test -f 'sig.c' || echo '$(srcdir)/'`sig.c
-libedit_la-term.lo: term.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-term.lo -MD -MP -MF $(DEPDIR)/libedit_la-term.Tpo -c -o libedit_la-term.lo `test -f 'term.c' || echo '$(srcdir)/'`term.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_la-term.Tpo $(DEPDIR)/libedit_la-term.Plo
+libedit_la-terminal.lo: terminal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-terminal.lo -MD -MP -MF $(DEPDIR)/libedit_la-terminal.Tpo -c -o libedit_la-terminal.lo `test -f 'terminal.c' || echo '$(srcdir)/'`terminal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_la-terminal.Tpo $(DEPDIR)/libedit_la-terminal.Plo
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='term.c' object='libedit_la-term.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='terminal.c' object='libedit_la-terminal.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-term.lo `test -f 'term.c' || echo '$(srcdir)/'`term.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libedit_la-terminal.lo `test -f 'terminal.c' || echo '$(srcdir)/'`terminal.c
libedit_la-tokenizer.lo: tokenizer.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libedit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libedit_la-tokenizer.lo -MD -MP -MF $(DEPDIR)/libedit_la-tokenizer.Tpo -c -o libedit_la-tokenizer.lo `test -f 'tokenizer.c' || echo '$(srcdir)/'`tokenizer.c
@@ -759,32 +767,25 @@ uninstall-am:
vi.h: vi.c
- @echo "Create $@"
- $(SHELL) ./makelist -h $(srcdir)/vi.c > $@
+ $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/vi.c > $@
emacs.h: emacs.c
- @echo "Create $@"
- $(SHELL) ./makelist -h $(srcdir)/emacs.c > $@
+ $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/emacs.c > $@
common.h: common.c
- @echo "Create $@"
- $(SHELL) ./makelist -h $(srcdir)/common.c > $@
+ $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/common.c > $@
fcns.h: vi.h emacs.h common.h
- @echo "Create $@"
- $(SHELL) ./makelist -fh vi.h emacs.h common.h > $@
+ $(AM_V_GEN)$(MAKELIST) -fh vi.h emacs.h common.h > $@
-fcns.c: vi.h emacs.h common.h fcns.h
- @echo "Create $@"
- $(SHELL) ./makelist -fc vi.h emacs.h common.h > $@
+fcns.c: vi.h emacs.h common.h fcns.h help.h
+ $(AM_V_GEN)$(MAKELIST) -fc vi.h emacs.h common.h > $@
help.c: vi.c emacs.c common.c
- @echo "Create $@"
- $(SHELL) ./makelist -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
+ $(AM_V_GEN)$(MAKELIST) -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
help.h: vi.c emacs.c common.c
- @echo "Create $@"
- $(SHELL) ./makelist -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
+ $(AM_V_GEN)$(MAKELIST) -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
diff -u othersrc/usr.bin/tnftp/libnetbsd/Makefile.in:1.10 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in:1.11
--- othersrc/usr.bin/tnftp/libnetbsd/Makefile.in:1.10 Sun Jan 31 06:10:20 2016
+++ othersrc/usr.bin/tnftp/libnetbsd/Makefile.in Sun Jan 31 22:25:37 2016
@@ -94,7 +94,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
Index: othersrc/usr.bin/tnftp/src/Makefile.in
diff -u othersrc/usr.bin/tnftp/src/Makefile.in:1.13 othersrc/usr.bin/tnftp/src/Makefile.in:1.14
--- othersrc/usr.bin/tnftp/src/Makefile.in:1.13 Sun May 5 13:29:58 2013
+++ othersrc/usr.bin/tnftp/src/Makefile.in Sun Jan 31 22:25:37 2016
@@ -142,7 +142,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
