Import of Heimdal 0.5.1.

Approved by:	re

30 files changed, 433 insertions, 492 deletions

diff --git a/crypto/heimdal/appl/Makefile.in b/crypto/heimdal/appl/Makefile.in
index f4122405e454..ba2d1a332b9e 100644
--- a/crypto/heimdal/appl/Makefile.in
+++ b/crypto/heimdal/appl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -365,7 +364,7 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -427,7 +426,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/afsutil/Makefile.in b/crypto/heimdal/appl/afsutil/Makefile.in
index e2538f45c6b7..2e570839732d 100644
--- a/crypto/heimdal/appl/afsutil/Makefile.in
+++ b/crypto/heimdal/appl/afsutil/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -280,7 +279,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -289,17 +289,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 afslog$(EXEEXT): $(afslog_OBJECTS) $(afslog_DEPENDENCIES) 
 	@rm -f afslog$(EXEEXT)
 	$(LINK) $(afslog_LDFLAGS) $(afslog_OBJECTS) $(afslog_LDADD) $(LIBS)
@@ -373,7 +370,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -423,7 +420,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/ChangeLog b/crypto/heimdal/appl/ftp/ChangeLog
index 92e0041d7162..d6bbfddb244a 100644
--- a/crypto/heimdal/appl/ftp/ChangeLog
+++ b/crypto/heimdal/appl/ftp/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* ftp/ftp.c: pull up 1.75; fix parsing of epsv ports
+
 2002-09-05  Johan Danielsson  <joda@pdc.kth.se>
 
 	* ftp/security.c (sec_vfprintf): free encoded data
diff --git a/crypto/heimdal/appl/ftp/Makefile.in b/crypto/heimdal/appl/ftp/Makefile.in
index b7b22cb6f655..c3bada8e59dd 100644
--- a/crypto/heimdal/appl/ftp/Makefile.in
+++ b/crypto/heimdal/appl/ftp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -346,7 +345,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -408,7 +407,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/common/Makefile.in b/crypto/heimdal/appl/ftp/common/Makefile.in
index 6970b1f9ad57..48d9b221c5d2 100644
--- a/crypto/heimdal/appl/ftp/common/Makefile.in
+++ b/crypto/heimdal/appl/ftp/common/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -324,7 +323,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -373,7 +372,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/ftp/Makefile.in b/crypto/heimdal/appl/ftp/ftp/Makefile.in
index 0619c4d2e12a..1764c13d5031 100644
--- a/crypto/heimdal/appl/ftp/ftp/Makefile.in
+++ b/crypto/heimdal/appl/ftp/ftp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -300,7 +299,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -309,17 +309,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 ftp$(EXEEXT): $(ftp_OBJECTS) $(ftp_DEPENDENCIES) 
 	@rm -f ftp$(EXEEXT)
 	$(LINK) $(ftp_LDFLAGS) $(ftp_OBJECTS) $(ftp_LDADD) $(LIBS)
@@ -364,10 +361,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -433,7 +426,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -483,7 +476,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp.c b/crypto/heimdal/appl/ftp/ftp/ftp.c
index fcf0bc47b37b..186aba8993ee 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp.c
+++ b/crypto/heimdal/appl/ftp/ftp/ftp.c
@@ -32,7 +32,7 @@
  */
 
 #include "ftp_locl.h"
-RCSID ("$Id: ftp.c,v 1.74 2002/09/04 22:00:12 joda Exp $");
+RCSID ("$Id: ftp.c,v 1.74.4.1 2002/10/21 14:26:31 joda Exp $");
 
 struct sockaddr_storage hisctladdr_ss;
 struct sockaddr *hisctladdr = (struct sockaddr *)&hisctladdr_ss;
@@ -396,6 +396,9 @@ getreply (int expecteof)
 			if (p) {
 			    p++;
 			    strlcpy(pasv, p, sizeof(pasv));
+			    p = strrchr(pasv, ')');
+			    if (p)
+				*p = '\0';
 			}
 		    }
 		    return code / 100;
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp.cat1 b/crypto/heimdal/appl/ftp/ftp/ftp.cat1
index 6c7b5f6faaf3..83323cc8748e 100644
--- a/crypto/heimdal/appl/ftp/ftp/ftp.cat1
+++ b/crypto/heimdal/appl/ftp/ftp/ftp.cat1
@@ -1,4 +1,4 @@
-FTP(1)                  FreeBSD General Commands Manual                 FTP(1)
+FTP(1)                      NetBSD Reference Manual                     FTP(1)
 
 NNAAMMEE
      ffttpp - ARPANET file transfer program
@@ -23,8 +23,8 @@ DDEESSCCRRIIPPTTIIOONN
            server, as well as report on data transfer statistics.
 
      --nn    Restrains ffttpp from attempting ``auto-login'' upon initial connec-
-           tion.  If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see
-           below) file in the user's home directory for an entry describing an
+           tion.  If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see be-
+           low) file in the user's home directory for an entry describing an
            account on the remote machine.  If no entry exists, ffttpp will prompt
            for the remote machine login name (default is the user identity on
            the local machine), and, if necessary, prompt for a password and an
@@ -44,8 +44,8 @@ DDEESSCCRRIIPPTTIIOONN
      command line.  If this is done, ffttpp will immediately attempt to establish
      a connection to an FTP server on that host; otherwise, ffttpp will enter its
      command interpreter and await instructions from the user.  When ffttpp is
-     awaiting commands from the user the prompt `ftp>' is provided to the
-     user.  The following commands are recognized by ffttpp:
+     awaiting commands from the user the prompt `ftp>' is provided to the us-
+     er.  The following commands are recognized by ffttpp:
 
      !! [_c_o_m_m_a_n_d [_a_r_g_s]]
                  Invoke an interactive shell on the local machine.  If there
@@ -69,8 +69,8 @@ DDEESSCCRRIIPPTTIIOONN
                  or nnmmaapp setting.  File transfer uses the current settings for
                  ttyyppee, ffoorrmmaatt, mmooddee, and ssttrruuccttuurree.
 
-     aasscciiii       Set the file transfer ttyyppee to network ASCII.  This is the
-                 default type.
+     aasscciiii       Set the file transfer ttyyppee to network ASCII.  This is the de-
+                 fault type.
 
      bbeellll        Arrange that a bell be sounded after each file transfer com-
                  mand is completed.
@@ -78,8 +78,8 @@ DDEESSCCRRIIPPTTIIOONN
      bbiinnaarryy      Set the file transfer ttyyppee to support binary image transfer.
 
      bbyyee         Terminate the FTP session with the remote server and exit
-                 ffttpp.  An end of file will also terminate the session and
-                 exit.
+                 ffttpp.  An end of file will also terminate the session and ex-
+                 it.
 
      ccaassee        Toggle remote computer file name case mapping during mmggeett
                  commands.  When ccaassee is on (default is off), remote computer
@@ -87,21 +87,21 @@ DDEESSCCRRIIPPTTIIOONN
                  local directory with the letters mapped to lower case.
 
      ccdd _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y
-                 Change the working directory on the remote machine to
-                 _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y.
+                 Change the working directory on the remote machine to _r_e_m_o_t_e_-
+                 _d_i_r_e_c_t_o_r_y.
 
      ccdduupp        Change the remote machine working directory to the parent of
                  the current remote machine working directory.
 
      cchhmmoodd _m_o_d_e _f_i_l_e_-_n_a_m_e
-                 Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the
-                 remote sytem to _m_o_d_e.
+                 Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the re-
+                 mote sytem to _m_o_d_e.
 
      cclloossee       Terminate the FTP session with the remote server, and return
                  to the command interpreter.  Any defined macros are erased.
 
-     ccrr          Toggle carriage return stripping during ascii type file
-                 retrieval.  Records are denoted by a carriage return/linefeed
+     ccrr          Toggle carriage return stripping during ascii type file re-
+                 trieval.  Records are denoted by a carriage return/linefeed
                  sequence during ascii type file transfer.  When ccrr is on (the
                  default), carriage returns are stripped from this sequence to
                  conform with the UNIX single linefeed record delimiter.
@@ -125,9 +125,9 @@ DDEESSCCRRIIPPTTIIOONN
                  _l_o_c_a_l_-_f_i_l_e.  If interactive prompting is on, ffttpp will prompt
                  the user to verify that the last argument is indeed the tar-
                  get local file for receiving ddiirr output.  If no directory is
-                 specified, the current working directory on the remote
-                 machine is used.  If no local file is specified, or
-                 _l_o_c_a_l_-_f_i_l_e is --, output comes to the terminal.
+                 specified, the current working directory on the remote ma-
+                 chine is used.  If no local file is specified, or _l_o_c_a_l_-_f_i_l_e
+                 is --, output comes to the terminal.
 
      ddiissccoonnnneecctt  A synonym for _c_l_o_s_e.
 
@@ -153,12 +153,12 @@ DDEESSCCRRIIPPTTIIOONN
                  exact result depends on the foreign operating system and ftp
                  server, and can be previewed by doing `mls remote-files -'.
                  As a security measure, remotely globbed files that starts
-                 with `/' or contains `../', will not be automatically
-                 received. If you have interactive prompting turned off, these
+                 with `/' or contains `../', will not be automatically re-
+                 ceived. If you have interactive prompting turned off, these
                  filenames will be ignored.  Note: mmggeett and mmppuutt are not meant
                  to transfer entire directory subtrees of files.  That can be
-                 done by transferring a tar(1) archive of the subtree (in
-                 binary mode).
+                 done by transferring a tar(1) archive of the subtree (in bi-
+                 nary mode).
 
      hhaasshh        Toggle hash-sign (``#'') printing for each data block trans-
                  ferred.  The size of a data block is 1024 bytes.
@@ -182,7 +182,7 @@ DDEESSCCRRIIPPTTIIOONN
                  machine.  The listing includes any system-dependent informa-
                  tion that the server chooses to include; for example, most
                  UNIX systems will produce output from the command `ls -l'.
-                 (See also nnlliisstt.)  If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified,
+                 (See also nnlliisstt.) If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified,
                  the current working directory is used.  If interactive
                  prompting is on, ffttpp will prompt the user to verify that the
                  last argument is indeed the target local file for receiving
@@ -194,18 +194,17 @@ DDEESSCCRRIIPPTTIIOONN
                  _m_a_c_r_o_-_n_a_m_e; a null line (consecutive newline characters in a
                  file or carriage returns from the terminal) terminates macro
                  input mode.  There is a limit of 16 macros and 4096 total
-                 characters in all defined macros.  Macros remain defined
-                 until a cclloossee command is executed.  The macro processor
-                 interprets `$' and `\' as special characters.  A `$' followed
-                 by a number (or numbers) is replaced by the corresponding
-                 argument on the macro invocation command line.  A `$' fol-
-                 lowed by an `i' signals that macro processor that the execut-
-                 ing macro is to be looped.  On the first pass `$i' is
-                 replaced by the first argument on the macro invocation com-
-                 mand line, on the second pass it is replaced by the second
-                 argument, and so on.  A `\' followed by any character is
-                 replaced by that character.  Use the `\' to prevent special
-                 treatment of the `$'.
+                 characters in all defined macros.  Macros remain defined un-
+                 til a cclloossee command is executed.  The macro processor inter-
+                 prets `$' and `\' as special characters.  A `$' followed by a
+                 number (or numbers) is replaced by the corresponding argument
+                 on the macro invocation command line.  A `$' followed by an
+                 `i' signals that macro processor that the executing macro is
+                 to be looped.  On the first pass `$i' is replaced by the
+                 first argument on the macro invocation command line, on the
+                 second pass it is replaced by the second argument, and so on.
+                 A `\' followed by any character is replaced by that charac-
+                 ter.  Use the `\' to prevent special treatment of the `$'.
 
      mmddeelleettee [_r_e_m_o_t_e_-_f_i_l_e_s]
                  Delete the _r_e_m_o_t_e_-_f_i_l_e_s on the remote machine.
@@ -240,8 +239,8 @@ DDEESSCCRRIIPPTTIIOONN
                  ``stream'' mode.
 
      mmooddttiimmee _f_i_l_e_-_n_a_m_e
-                 Show the last modification time of the file on the remote
-                 machine.
+                 Show the last modification time of the file on the remote ma-
+                 chine.
 
      mmppuutt _l_o_c_a_l_-_f_i_l_e_s
                  Expand wild cards in the list of local files given as argu-
@@ -257,20 +256,20 @@ DDEESSCCRRIIPPTTIIOONN
                  _g_e_t.
 
      nnlliisstt [_r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y] [_l_o_c_a_l_-_f_i_l_e]
-                 Print a  list of the files in a directory on the remote
-                 machine.  If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the cur-
-                 rent working directory is used.  If interactive prompting is
-                 on, ffttpp will prompt the user to verify that the last argument
-                 is indeed the target local file for receiving nnlliisstt output.
-                 If no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the
-                 output is sent to the terminal.
+                 Print a  list of the files in a directory on the remote ma-
+                 chine.  If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the current
+                 working directory is used.  If interactive prompting is on,
+                 ffttpp will prompt the user to verify that the last argument is
+                 indeed the target local file for receiving nnlliisstt output.  If
+                 no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the output
+                 is sent to the terminal.
 
      nnmmaapp [_i_n_p_a_t_t_e_r_n _o_u_t_p_a_t_t_e_r_n]
                  Set or unset the filename mapping mechanism.  If no arguments
                  are specified, the filename mapping mechanism is unset.  If
                  arguments are specified, remote filenames are mapped during
-                 mmppuutt commands and ppuutt commands issued without a specified
-                 remote target filename.  If arguments are specified, local
+                 mmppuutt commands and ppuutt commands issued without a specified re-
+                 mote target filename.  If arguments are specified, local
                  filenames are mapped during mmggeett commands and ggeett commands
                  issued without a specified local target filename.  This com-
                  mand is useful when connecting to a non-UNIX remote computer
@@ -281,24 +280,24 @@ DDEESSCCRRIIPPTTIIOONN
                  settings).  Variable templating is accomplished by including
                  the sequences `$1', `$2', ..., `$9' in _i_n_p_a_t_t_e_r_n.  Use `\' to
                  prevent this special treatment of the `$' character.  All
-                 other characters are treated literally, and are used to
-                 determine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values.  For example,
+                 other characters are treated literally, and are used to de-
+                 termine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values.  For example,
                  given _i_n_p_a_t_t_e_r_n $1.$2 and the remote file name "mydata.data",
                  $1 would have the value "mydata", and $2 would have the value
                  "data".  The _o_u_t_p_a_t_t_e_r_n determines the resulting mapped file-
                  name.  The sequences `$1', `$2', ...., `$9' are replaced by
-                 any value resulting from the _i_n_p_a_t_t_e_r_n template.  The
-                 sequence `$0' is replace by the original filename.  Addition-
-                 ally, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if
-                 _s_e_q_1 is not a null string; otherwise it is replaced by _s_e_q_2.
-                 For example, the command
+                 any value resulting from the _i_n_p_a_t_t_e_r_n template.  The se-
+                 quence `$0' is replace by the original filename.  Additional-
+                 ly, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if _s_e_q_1
+                 is not a null string; otherwise it is replaced by _s_e_q_2.  For
+                 example, the command
 
                        nmap $1.$2.$3 [$1,$2].[$2,file]
 
                  would yield the output filename "myfile.data" for input file-
                  names "myfile.data" and "myfile.data.old", "myfile.file" for
-                 the input filename "myfile", and "myfile.myfile" for the
-                 input filename ".myfile".  Spaces may be included in
+                 the input filename "myfile", and "myfile.myfile" for the in-
+                 put filename ".myfile".  Spaces may be included in
                  _o_u_t_p_a_t_t_e_r_n, as in the example: `nmap $1 sed "s/  *$//" > $1'
                  .  Use the `\' character to prevent special treatment of the
                  `$','[','[', and `,' characters.
@@ -309,8 +308,8 @@ DDEESSCCRRIIPPTTIIOONN
                  lation mechanism is unset.  If arguments are specified, char-
                  acters in remote filenames are translated during mmppuutt com-
                  mands and ppuutt commands issued without a specified remote tar-
-                 get filename.  If arguments are specified, characters in
-                 local filenames are translated during mmggeett commands and ggeett
+                 get filename.  If arguments are specified, characters in lo-
+                 cal filenames are translated during mmggeett commands and ggeett
                  commands issued without a specified local target filename.
                  This command is useful when connecting to a non-UNIX remote
                  computer with different file naming conventions or practices.
@@ -322,9 +321,9 @@ DDEESSCCRRIIPPTTIIOONN
      ooppeenn _h_o_s_t [_p_o_r_t]
                  Establish a connection to the specified _h_o_s_t FTP server.  An
                  optional port number may be supplied, in which case, ffttpp will
-                 attempt to contact an FTP server at that port.  If the
-                 aauuttoo--llooggiinn option is on (default), ffttpp will also attempt to
-                 automatically log the user in to the FTP server (see below).
+                 attempt to contact an FTP server at that port.  If the aauuttoo--
+                 llooggiinn option is on (default), ffttpp will also attempt to auto-
+                 matically log the user in to the FTP server (see below).
 
      ppaassssiivvee     Toggle passive mode.  If passive mode is turned on (default
                  is off), the ftp client will send a PASV command for all data
@@ -336,9 +335,8 @@ DDEESSCCRRIIPPTTIIOONN
                  tens on a port and sends that address to the remote server,
                  who connects back to it.  Passive mode is useful when using
                  ffttpp through a gateway router or host that controls the direc-
-                 tionality of traffic.  (Note that though ftp servers are
-                 required to support the PASV command by RFC 1123, some do
-                 not.)
+                 tionality of traffic.  (Note that though ftp servers are re-
+                 quired to support the PASV command by RFC 1123, some do not.)
 
      pprroommpptt      Toggle interactive prompting.  Interactive prompting occurs
                  during multiple file transfers to allow the user to selec-
@@ -354,15 +352,15 @@ DDEESSCCRRIIPPTTIIOONN
                  ondary control connection.  Enter the command "proxy ?" to
                  see other ftp commands executable on the secondary connec-
                  tion.  The following commands behave differently when pref-
-                 aced by pprrooxxyy: ooppeenn will not define new macros during the
-                 auto-login process, cclloossee will not erase existing macro defi-
-                 nitions, ggeett and mmggeett transfer files from the host on the
-                 primary control connection to the host on the secondary con-
-                 trol connection, and ppuutt, mmppuutt, and aappppeenndd transfer files
-                 from the host on the secondary control connection to the host
-                 on the primary control connection.  Third party file trans-
-                 fers depend upon support of the ftp protocol PASV command by
-                 the server on the secondary control connection.
+                 aced by pprrooxxyy: ooppeenn will not define new macros during the au-
+                 to-login process, cclloossee will not erase existing macro defini-
+                 tions, ggeett and mmggeett transfer files from the host on the pri-
+                 mary control connection to the host on the secondary control
+                 connection, and ppuutt, mmppuutt, and aappppeenndd transfer files from the
+                 host on the secondary control connection to the host on the
+                 primary control connection.  Third party file transfers de-
+                 pend upon support of the ftp protocol PASV command by the
+                 server on the secondary control connection.
 
      ppuutt _l_o_c_a_l_-_f_i_l_e [_r_e_m_o_t_e_-_f_i_l_e]
                  Store a local file on the remote machine.  If _r_e_m_o_t_e_-_f_i_l_e is
@@ -396,22 +394,22 @@ DDEESSCCRRIIPPTTIIOONN
                  is specified it is supplied to the server as well.
 
      rreemmootteessttaattuuss [_f_i_l_e_-_n_a_m_e]
-                 With no arguments, show status of remote machine.  If
-                 _f_i_l_e_-_n_a_m_e is specified, show status of _f_i_l_e_-_n_a_m_e on remote
-                 machine.
+                 With no arguments, show status of remote machine.  If _f_i_l_e_-
+                 _n_a_m_e is specified, show status of _f_i_l_e_-_n_a_m_e on remote ma-
+                 chine.
 
      rreennaammee [_f_r_o_m] [_t_o]
                  Rename the file _f_r_o_m on the remote machine, to the file _t_o.
 
-     rreesseett       Clear reply queue.  This command re-synchronizes com-
-                 mand/reply sequencing with the remote ftp server.  Resynchro-
-                 nization may be necessary following a violation of the ftp
-                 protocol by the remote server.
+     rreesseett       Clear reply queue.  This command re-synchronizes command/re-
+                 ply sequencing with the remote ftp server.  Resynchronization
+                 may be necessary following a violation of the ftp protocol by
+                 the remote server.
 
      rreessttaarrtt _m_a_r_k_e_r
                  Restart the immediately following ggeett or ppuutt at the indicated
-                 _m_a_r_k_e_r.  On UNIX systems, marker is usually a byte offset
-                 into the file.
+                 _m_a_r_k_e_r.  On UNIX systems, marker is usually a byte offset in-
+                 to the file.
 
      rrmmddiirr _d_i_r_e_c_t_o_r_y_-_n_a_m_e
                  Delete a directory on the remote machine.
@@ -424,14 +422,14 @@ DDEESSCCRRIIPPTTIIOONN
                  this process continues up to ".99", an error message is
                  printed, and the transfer does not take place.  The generated
                  unique filename will be reported.  Note that rruunniiqquuee will not
-                 affect local files generated from a shell command (see
-                 below).  The default value is off.
+                 affect local files generated from a shell command (see be-
+                 low).  The default value is off.
 
      sseenndd _l_o_c_a_l_-_f_i_l_e [_r_e_m_o_t_e_-_f_i_l_e]
                  A synonym for put.
 
-     sseennddppoorrtt    Toggle the use of PORT commands.  By default, ffttpp will
-                 attempt to use a PORT command when establishing a connection
+     sseennddppoorrtt    Toggle the use of PORT commands.  By default, ffttpp will at-
+                 tempt to use a PORT command when establishing a connection
                  for each data transfer.  The use of PORT commands can prevent
                  delays when performing multiple file transfers.  If the PORT
                  command fails, ffttpp will use the default data port.  When the
@@ -455,11 +453,11 @@ DDEESSCCRRIIPPTTIIOONN
 
      ssuunniiqquuee     Toggle storing of files on remote machine under unique file
                  names.  Remote ftp server must support ftp protocol STOU com-
-                 mand for successful completion.  The remote server will
-                 report unique name.  Default value is off.
+                 mand for successful completion.  The remote server will re-
+                 port unique name.  Default value is off.
 
-     ssyysstteemm      Show the type of operating system running on the remote
-                 machine.
+     ssyysstteemm      Show the type of operating system running on the remote ma-
+                 chine.
 
      tteenneexx       Set the file transfer type to that needed to talk to TENEX
                  machines.
@@ -489,9 +487,9 @@ DDEESSCCRRIIPPTTIIOONN
 
      vveerrbboossee     Toggle verbose mode.  In verbose mode, all responses from the
                  FTP server are displayed to the user.  In addition, if ver-
-                 bose is on, when a file transfer completes, statistics
-                 regarding the efficiency of the transfer are reported.  By
-                 default, verbose is on.
+                 bose is on, when a file transfer completes, statistics re-
+                 garding the efficiency of the transfer are reported.  By de-
+                 fault, verbose is on.
 
      ?? [_c_o_m_m_a_n_d]
                  A synonym for help.
@@ -513,20 +511,19 @@ DDEESSCCRRIIPPTTIIOONN
 AABBOORRTTIINNGG AA FFIILLEE TTRRAANNSSFFEERR
      To abort a file transfer, use the terminal interrupt key (usually Ctrl-
      C).  Sending transfers will be immediately halted.  Receiving transfers
-     will be halted by sending a ftp protocol ABOR command to the remote
-     server, and discarding any further data received.  The speed at which
-     this is accomplished depends upon the remote server's support for ABOR
-     processing.  If the remote server does not support the ABOR command, an
-     `ftp>' prompt will not appear until the remote server has completed send-
-     ing the requested file.
-
-     The terminal interrupt key sequence will be ignored when ffttpp has com-
-     pleted any local processing and is awaiting a reply from the remote
-     server.  A long delay in this mode may result from the ABOR processing
-     described above, or from unexpected behavior by the remote server,
-     including violations of the ftp protocol.  If the delay results from
-     unexpected remote server behavior, the local ffttpp program must be killed
-     by hand.
+     will be halted by sending a ftp protocol ABOR command to the remote serv-
+     er, and discarding any further data received.  The speed at which this is
+     accomplished depends upon the remote server's support for ABOR process-
+     ing.  If the remote server does not support the ABOR command, an `ftp>'
+     prompt will not appear until the remote server has completed sending the
+     requested file.
+
+     The terminal interrupt key sequence will be ignored when ffttpp has complet-
+     ed any local processing and is awaiting a reply from the remote server.
+     A long delay in this mode may result from the ABOR processing described
+     above, or from unexpected behavior by the remote server, including viola-
+     tions of the ftp protocol.  If the delay results from unexpected remote
+     server behavior, the local ffttpp program must be killed by hand.
 
 FFIILLEE NNAAMMIINNGG CCOONNVVEENNTTIIOONNSS
      Files specified as arguments to ffttpp commands are processed according to
@@ -539,8 +536,8 @@ FFIILLEE NNAAMMIINNGG CCOONNVVEENNTTIIOONNSS
           argument is interpreted as a shell command.  FFttpp then forks a shell,
           using popen(3) with the argument supplied, and reads (writes) from
           the stdout (stdin).  If the shell command includes spaces, the argu-
-          ment must be quoted; e.g.  ``" ls -lt"''.  A particularly useful
-          example of this mechanism is: ``dir more''.
+          ment must be quoted; e.g.  ``" ls -lt"''.  A particularly useful ex-
+          ample of this mechanism is: ``dir more''.
 
      3.   Failing the above checks, if ``globbing'' is enabled, local file
           names are expanded according to the rules used in the csh(1); c.f.
@@ -549,14 +546,14 @@ FFIILLEE NNAAMMIINNGG CCOONNVVEENNTTIIOONNSS
           operation is used.
 
      4.   For mmggeett commands and ggeett commands with unspecified local file
-          names, the local filename is the remote filename, which may be
-          altered by a ccaassee, nnttrraannss, or nnmmaapp setting.  The resulting filename
+          names, the local filename is the remote filename, which may be al-
+          tered by a ccaassee, nnttrraannss, or nnmmaapp setting.  The resulting filename
           may then be altered if rruunniiqquuee is on.
 
      5.   For mmppuutt commands and ppuutt commands with unspecified remote file
-          names, the remote filename is the local filename, which may be
-          altered by a nnttrraannss or nnmmaapp setting.  The resulting filename may
-          then be altered by the remote server if ssuunniiqquuee is on.
+          names, the remote filename is the local filename, which may be al-
+          tered by a nnttrraannss or nnmmaapp setting.  The resulting filename may then
+          be altered by the remote server if ssuunniiqquuee is on.
 
 FFIILLEE TTRRAANNSSFFEERR PPAARRAAMMEETTEERRSS
      The FTP specification specifies many parameters which may affect a file
@@ -565,8 +562,8 @@ FFIILLEE TTRRAANNSSFFEERR PPAARRAAMMEETTEERRSS
      FFttpp supports the ascii and image types of file transfer, plus local byte
      size 8 for tteenneexx mode transfers.
 
-     FFttpp supports only the default values for the remaining file transfer
-     parameters: mmooddee, ffoorrmm, and ssttrruucctt.
+     FFttpp supports only the default values for the remaining file transfer pa-
+     rameters: mmooddee, ffoorrmm, and ssttrruucctt.
 
 TTHHEE ..nneettrrcc FFIILLEE
      The _._n_e_t_r_c file contains login and initialization information used by the
@@ -575,12 +572,12 @@ TTHHEE ..nneettrrcc FFIILLEE
      new-lines:
 
      mmaacchhiinnee _n_a_m_e
-               Identify a remote machine _n_a_m_e.  The auto-login process
-               searches the _._n_e_t_r_c file for a mmaacchhiinnee token that matches the
-               remote machine specified on the ffttpp command line or as an ooppeenn
-               command argument.  Once a match is made, the subsequent _._n_e_t_r_c
-               tokens are processed, stopping when the end of file is reached
-               or another mmaacchhiinnee or a ddeeffaauulltt token is encountered.
+               Identify a remote machine _n_a_m_e.  The auto-login process search-
+               es the _._n_e_t_r_c file for a mmaacchhiinnee token that matches the remote
+               machine specified on the ffttpp command line or as an ooppeenn command
+               argument.  Once a match is made, the subsequent _._n_e_t_r_c tokens
+               are processed, stopping when the end of file is reached or an-
+               other mmaacchhiinnee or a ddeeffaauulltt token is encountered.
 
      ddeeffaauulltt   This is the same as mmaacchhiinnee _n_a_m_e except that ddeeffaauulltt matches
                any name.  There can be only one ddeeffaauulltt token, and it must be
@@ -588,9 +585,9 @@ TTHHEE ..nneettrrcc FFIILLEE
 
                      default login anonymous password user@site
 
-               thereby giving the user _a_u_t_o_m_a_t_i_c anonymous ftp login to
-               machines not specified in _._n_e_t_r_c.  This can be overridden by
-               using the --nn flag to disable auto-login.
+               thereby giving the user _a_u_t_o_m_a_t_i_c anonymous ftp login to ma-
+               chines not specified in _._n_e_t_r_c.  This can be overridden by us-
+               ing the --nn flag to disable auto-login.
 
      llooggiinn _n_a_m_e
                Identify a user on the remote machine.  If this token is pre-
@@ -644,4 +641,4 @@ BBUUGGSS
      rect transfers of binary files to and from 4.2BSD servers using the ascii
      type.  Avoid this problem by using the binary image type.
 
-4.2 Berkeley Distribution       April 27, 1996       4.2 Berkeley Distribution
+4.2 Berkeley Distribution       April 27, 1996                              10
diff --git a/crypto/heimdal/appl/ftp/ftpd/Makefile.in b/crypto/heimdal/appl/ftp/ftpd/Makefile.in
index ceefd1fc369b..90f820984874 100644
--- a/crypto/heimdal/appl/ftp/ftpd/Makefile.in
+++ b/crypto/heimdal/appl/ftp/ftpd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -306,7 +305,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -315,17 +315,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 ftpd$(EXEEXT): $(ftpd_OBJECTS) $(ftpd_DEPENDENCIES) 
 	@rm -f ftpd$(EXEEXT)
 	$(LINK) $(ftpd_LDFLAGS) $(ftpd_OBJECTS) $(ftpd_LDADD) $(LIBS)
@@ -390,10 +387,6 @@ install-man5: $(man5_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -433,10 +426,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -502,7 +491,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -553,12 +542,11 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "ftpcmd.c" || rm -f ftpcmd.c
 clean: clean-am
 
 clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8 b/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8
index b47920fbfb5d..4951f6a564b1 100644
--- a/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8
+++ b/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8
@@ -1,12 +1,11 @@
-FTPD(8)                 FreeBSD System Manager's Manual                FTPD(8)
+FTPD(8)                 NetBSD System Manager's Manual                 FTPD(8)
 
 NNAAMMEE
      ffttppdd - Internet File Transfer Protocol server
 
 SSYYNNOOPPSSIISS
-     ffttppdd [--aa _a_u_t_h_m_o_d_e] [--ddiillvvUU] [--gg _u_m_a_s_k] [--pp _p_o_r_t] [--TT _m_a_x_t_i_m_e_o_u_t]
-          [--tt _t_i_m_e_o_u_t] [--uu _d_e_f_a_u_l_t _u_m_a_s_k] [--BB | ----bbuuiillttiinn--llss]
-          [----ggoooodd--cchhaarrss==_s_t_r_i_n_g]
+     ffttppdd [--aa _a_u_t_h_m_o_d_e] [--ddiillvvUU] [--gg _u_m_a_s_k] [--pp _p_o_r_t] [--TT _m_a_x_t_i_m_e_o_u_t] [--tt
+     _t_i_m_e_o_u_t] [--uu _d_e_f_a_u_l_t _u_m_a_s_k] [--BB | ----bbuuiillttiinn--llss] [----ggoooodd--cchhaarrss==_s_t_r_i_n_g]
 
 DDEESSCCRRIIPPTTIIOONN
      FFttppdd is the Internet File Transfer Protocol server process.  The server
@@ -18,8 +17,7 @@ DDEESSCCRRIIPPTTIIOONN
      --aa      Select the level of authentication required.  Kerberised login
              can not be turned off. The default is to only allow kerberised
              login.  Other possibilities can be turned on by giving a string
-             of comma separated flags as argument to --aa.  Recognised flags
-             are:
+             of comma separated flags as argument to --aa. Recognised flags are:
 
              _p_l_a_i_n  Allow logging in with plaintext password. The password can
                     be a(n) OTP or an ordinary password.
@@ -28,8 +26,8 @@ DDEESSCCRRIIPPTTIIOONN
 
              _f_t_p    Allow anonymous login.
 
-             The following combination modes exists for backwards compatibil-
-             ity:
+             The following combination modes exists for backwards compatibili-
+             ty:
 
              _n_o_n_e   Same as _p_l_a_i_n_,_f_t_p.
 
@@ -57,17 +55,17 @@ DDEESSCCRRIIPPTTIIOONN
              period allowed may be set to _t_i_m_e_o_u_t seconds with the --TT option.
              The default limit is 2 hours.
 
-     --tt      The inactivity timeout period is set to _t_i_m_e_o_u_t seconds (the
-             default is 15 minutes).
+     --tt      The inactivity timeout period is set to _t_i_m_e_o_u_t seconds (the de-
+             fault is 15 minutes).
 
      --uu      Set the initial umask to something else than the default 027.
 
-     --UU      In previous versions of ffttppdd, when a passive mode client
-             requested a data connection to the server, the server would use
-             data ports in the range 1024..4999.  Now, by default, if the sys-
-             tem supports the IP_PORTRANGE socket option, the server will use
-             data ports in the range 49152..65535.  Specifying this option
-             will revert to the old behavior.
+     --UU      In previous versions of ffttppdd, when a passive mode client request-
+             ed a data connection to the server, the server would use data
+             ports in the range 1024..4999.  Now, by default, if the system
+             supports the IP_PORTRANGE socket option, the server will use data
+             ports in the range 49152..65535.  Specifying this option will re-
+             vert to the old behavior.
 
      --vv      Verbose mode.
 
@@ -77,8 +75,8 @@ DDEESSCCRRIIPPTTIIOONN
      ----ggoooodd--cchhaarrss==_s_t_r_i_n_g
              allowed anonymous upload filename chars
 
-     The file _/_e_t_c_/_n_o_l_o_g_i_n can be used to disable ftp access.  If the file
-     exists, ffttppdd displays it and exits.  If the file _/_e_t_c_/_f_t_p_w_e_l_c_o_m_e exists,
+     The file _/_e_t_c_/_n_o_l_o_g_i_n can be used to disable ftp access.  If the file ex-
+     ists, ffttppdd displays it and exits.  If the file _/_e_t_c_/_f_t_p_w_e_l_c_o_m_e exists,
      ffttppdd prints it before issuing the ``ready'' message.  If the file
      _/_e_t_c_/_m_o_t_d exists, ffttppdd prints it after a successful login.
 
@@ -140,9 +138,9 @@ DDEESSCCRRIIPPTTIIOONN
      The following non-standard or UNIX specific commands are supported by the
      SITE request.
 
-           UMASK      change umask, (e.g. SSIITTEE UUMMAASSKK 000022)
-           IDLE       set idle-timer, (e.g. SSIITTEE IIDDLLEE 6600)
-           CHMOD      change mode of a file (e.g. SSIITTEE CCHHMMOODD 775555 ffiilleennaammee)
+           UMASK      change umask, (e.g.  SSIITTEE UUMMAASSKK 000022)
+           IDLE       set idle-timer, (e.g.  SSIITTEE IIDDLLEE 6600)
+           CHMOD      change mode of a file (e.g.  SSIITTEE CCHHMMOODD 775555 ffiilleennaammee)
            FIND       quickly find a specific file with GNU locate(1).
            HELP       give help information.
 
@@ -167,8 +165,8 @@ DDEESSCCRRIIPPTTIIOONN
      FFttppdd authenticates users according to these rules.
 
            1.   If Kerberos authentication is used, the user must pass valid
-                tickets and the principal must be allowed to login as the
-                remote user.
+                tickets and the principal must be allowed to login as the re-
+                mote user.
 
            2.   The login name must be in the password data base, and not have
                 a null password (if kerberos is used the password field is not
@@ -177,8 +175,8 @@ DDEESSCCRRIIPPTTIIOONN
                 user has an OTP key, the response from a successful USER com-
                 mand will include an OTP challenge. The client may choose to
                 respond with a PASS command giving either a standard password
-                or an OTP one-time password. The server will automatically
-                determine which type of password it has been given and attempt
+                or an OTP one-time password. The server will automatically de-
+                termine which type of password it has been given and attempt
                 to authenticate accordingly. See otp(1) for more information
                 on OTP authentication.
 
@@ -204,8 +202,8 @@ DDEESSCCRRIIPPTTIIOONN
      In the last case, ffttppdd takes special measures to restrict the client's
      access privileges.  The server performs a chroot(2) to the home directory
      of the ``ftp'' user.  In order that system security is not breached, it
-     is recommended that the ``ftp'' subtree be constructed with care, con-
-     sider following these guidelines for anonymous ftp.
+     is recommended that the ``ftp'' subtree be constructed with care, consid-
+     er following these guidelines for anonymous ftp.
 
      In general all files should be owned by ``root'', and have non-write per-
      missions (644 or 755 depending on the kind of file). No files should be
@@ -253,8 +251,8 @@ DDEESSCCRRIIPPTTIIOONN
            _~_f_t_p_/_p_u_b  Traditional place to put whatever you want to make pub-
                      lic.
 
-     If you want guests to be able to upload files, create a _~_f_t_p_/_i_n_c_o_m_i_n_g
-     directory owned by ``root'', and group ``ftp'' with mode 730 (make sure
+     If you want guests to be able to upload files, create a _~_f_t_p_/_i_n_c_o_m_i_n_g di-
+     rectory owned by ``root'', and group ``ftp'' with mode 730 (make sure
      ``ftp'' is member of group ``ftp'').  The following restrictions apply to
      anonymous users:
 
@@ -267,8 +265,8 @@ DDEESSCCRRIIPPTTIIOONN
          and SSIITTEE CCHHMMOODD.
 
      ++oo   Filenames must start with an alpha-numeric character, and consist of
-         alpha-numeric characters or any of the following: + (plus), -
-         (minus), = (equal), _ (underscore), . (period), and , (comma).
+         alpha-numeric characters or any of the following: + (plus), - (mi-
+         nus), = (equal), _ (underscore), .  (period), and , (comma).
 
 FFIILLEESS
      /etc/ftpusers    Access list for users.
@@ -296,4 +294,4 @@ BBUUGGSS
 HHIISSTTOORRYY
      The ffttppdd command appeared in 4.2BSD.
 
-4.2 Berkeley Distribution       April 19, 1997       4.2 Berkeley Distribution
+4.2 Berkeley Distribution       April 19, 1997                               5
diff --git a/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5 b/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5
index 5a9b626f1af9..2957aee71641 100644
--- a/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5
+++ b/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5
@@ -1,4 +1,4 @@
-FTPUSERS(5)               FreeBSD File Formats Manual              FTPUSERS(5)
+FTPUSERS(5)               NetBSD Programmer's Manual               FTPUSERS(5)
 
 NNAAMMEE
      _/_e_t_c_/_f_t_p_u_s_e_r_s - FTP access list file
@@ -6,8 +6,8 @@ NNAAMMEE
 DDEESSCCRRIIPPTTIIOONN
      _/_e_t_c_/_f_t_p_u_s_e_r_s contains a list of users that should be allowed or denied
      FTP access. Each line contains a user, optionally followed by ``allow''
-     (anything but ``allow'' is ignored).  The semi-user ``*'' matches any
-     user.  Users that has an explicit ``allow'', or that does not match any
+     (anything but ``allow'' is ignored).  The semi-user ``*'' matches any us-
+     er.  Users that has an explicit ``allow'', or that does not match any
      line, are allowed access. Anyone else is denied access.
 
      Note that this is compatible with the old format, where this file con-
@@ -23,4 +23,4 @@ EEXXAAMMPPLLEESS
 SSEEEE AALLSSOO
      ftpd(8)
 
-KTH-KRB                           May 7, 1997                          KTH-KRB
+ KTH-KRB                          May 7, 1997                                1
diff --git a/crypto/heimdal/appl/kf/Makefile.in b/crypto/heimdal/appl/kf/Makefile.in
index f624bca2f4dd..c93213879bd6 100644
--- a/crypto/heimdal/appl/kf/Makefile.in
+++ b/crypto/heimdal/appl/kf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -276,7 +275,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -285,17 +285,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -305,7 +302,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -314,17 +312,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 kf$(EXEEXT): $(kf_OBJECTS) $(kf_DEPENDENCIES) 
 	@rm -f kf$(EXEEXT)
 	$(LINK) $(kf_LDFLAGS) $(kf_OBJECTS) $(kf_LDADD) $(LIBS)
@@ -372,10 +367,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -415,10 +406,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -484,7 +471,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -534,7 +521,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/kf/kf.cat1 b/crypto/heimdal/appl/kf/kf.cat1
index 24653e467017..30ae354ea924 100644
--- a/crypto/heimdal/appl/kf/kf.cat1
+++ b/crypto/heimdal/appl/kf/kf.cat1
@@ -1,12 +1,12 @@
-KF(1)                   FreeBSD General Commands Manual                  KF(1)
+KF(1)                       NetBSD Reference Manual                      KF(1)
 
 NNAAMMEE
      kkff - securly forward tickets
 
 SSYYNNOOPPSSIISS
      kkff [--pp _p_o_r_t | ----ppoorrtt=_p_o_r_t] [--ll _l_o_g_i_n | ----llooggiinn=_l_o_g_i_n] [--cc _c_c_a_c_h_e |
-        ----ccccaacchhee=_c_c_a_c_h_e] [--FF | ----ffoorrwwaarrddaabbllee] [--GG | ----nnoo--ffoorrwwaarrddaabbllee]
-        [--hh | ----hheellpp] [----vveerrssiioonn] _h_o_s_t _._._.
+     ----ccccaacchhee=_c_c_a_c_h_e] [--FF | ----ffoorrwwaarrddaabbllee] [--GG | ----nnoo--ffoorrwwaarrddaabbllee] [--hh |
+     ----hheellpp] [----vveerrssiioonn] _h_o_s_t _._._.
 
 DDEESSCCRRIIPPTTIIOONN
      The kkff program forwards tickets to a remove host through an authenticated
@@ -42,4 +42,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      kinit(1), telnet(1), kfd(8)
 
-Heimdal                          July 2, 2000                          Heimdal
+ Heimdal                         July 2, 2000                                1
diff --git a/crypto/heimdal/appl/kf/kfd.cat8 b/crypto/heimdal/appl/kf/kfd.cat8
index cd82a71b7a9b..65ec8ac4a9ea 100644
--- a/crypto/heimdal/appl/kf/kfd.cat8
+++ b/crypto/heimdal/appl/kf/kfd.cat8
@@ -1,11 +1,11 @@
-KFD(8)                  FreeBSD System Manager's Manual                 KFD(8)
+KFD(8)                  NetBSD System Manager's Manual                  KFD(8)
 
 NNAAMMEE
      kkffdd - receive forwarded tickets
 
 SSYYNNOOPPSSIISS
      kkffdd [--pp _p_o_r_t | ----ppoorrtt=_p_o_r_t] [--ii | ----iinneettdd] [--RR _r_e_g_p_a_g | ----rreeggppaagg=_r_e_g_p_a_g]
-         [--hh | ----hheellpp] [----vveerrssiioonn]
+     [--hh | ----hheellpp] [----vveerrssiioonn]
 
 DDEESSCCRRIIPPTTIIOONN
      This is the daemon for kf(1).  Supported options:
@@ -27,4 +27,4 @@ EEXXAAMMPPLLEESS
 SSEEEE AALLSSOO
      kf(1)
 
-Heimdal                          July 2, 2000                          Heimdal
+ Heimdal                         July 2, 2000                                1
diff --git a/crypto/heimdal/appl/login/Makefile.in b/crypto/heimdal/appl/login/Makefile.in
index 9fe40aa08e7a..a120639226ce 100644
--- a/crypto/heimdal/appl/login/Makefile.in
+++ b/crypto/heimdal/appl/login/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -287,7 +286,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -296,17 +296,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 login$(EXEEXT): $(login_OBJECTS) $(login_DEPENDENCIES) 
 	@rm -f login$(EXEEXT)
 	$(LINK) $(login_LDFLAGS) $(login_OBJECTS) $(login_LDADD) $(LIBS)
@@ -377,7 +374,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -427,7 +424,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/push/Makefile.in b/crypto/heimdal/appl/push/Makefile.in
index 7c905cb36923..699a33a5303b 100644
--- a/crypto/heimdal/appl/push/Makefile.in
+++ b/crypto/heimdal/appl/push/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -275,7 +274,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -284,37 +284,35 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 push$(EXEEXT): $(push_OBJECTS) $(push_DEPENDENCIES) 
 	@rm -f push$(EXEEXT)
 	$(LINK) $(push_LDFLAGS) $(push_OBJECTS) $(push_LDADD) $(LIBS)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
-	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+	  f="`echo $$p|sed '$(transform)'`"; \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
+	  elif test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  f="`echo $$p|sed '$(transform)'`"; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
@@ -359,10 +357,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -402,10 +396,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -471,7 +461,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -522,7 +512,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/push/pfrom.cat1 b/crypto/heimdal/appl/push/pfrom.cat1
index e9820845aad0..a9f31cd20e12 100644
--- a/crypto/heimdal/appl/push/pfrom.cat1
+++ b/crypto/heimdal/appl/push/pfrom.cat1
@@ -1,11 +1,11 @@
-PFROM(1)                FreeBSD General Commands Manual               PFROM(1)
+PFROM(1)                    NetBSD Reference Manual                   PFROM(1)
 
 NNAAMMEE
      ppffrroomm - fetch a list of the current mail via POP
 
 SSYYNNOOPPSSIISS
      ppffrroomm [--44 | ----kkrrbb44] [--55 | ----kkrrbb55] [--vv | ----vveerrbboossee] [--cc | ----ccoouunntt]
-           [----hheeaaddeerr] [--pp _p_o_r_t_-_s_p_e_c | ----ppoorrtt==_p_o_r_t_-_s_p_e_c]
+     [----hheeaaddeerr] [--pp _p_o_r_t_-_s_p_e_c | ----ppoorrtt==_p_o_r_t_-_s_p_e_c]
 
 DDEESSCCRRIIPPTTIIOONN
      ppffrroomm is a script that does push --from.
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
 SSEEEE AALLSSOO
      push(8)
 
-HEIMDAL                          March 4, 2000                         HEIMDAL
+ HEIMDAL                         March 4, 2000                               1
diff --git a/crypto/heimdal/appl/push/push.cat8 b/crypto/heimdal/appl/push/push.cat8
index d0c8d6d5adcd..7ddb72dcdc62 100644
--- a/crypto/heimdal/appl/push/push.cat8
+++ b/crypto/heimdal/appl/push/push.cat8
@@ -1,12 +1,12 @@
-PUSH(8)                 FreeBSD System Manager's Manual                PUSH(8)
+PUSH(8)                 NetBSD System Manager's Manual                 PUSH(8)
 
 NNAAMMEE
      ppuusshh - fetch mail via POP
 
 SSYYNNOOPPSSIISS
-     ppuusshh [--44 | ----kkrrbb44] [--55 | ----kkrrbb55] [--vv | ----vveerrbboossee] [--ff | ----ffoorrkk]
-          [--ll | ----lleeaavvee] [----ffrroomm] [--cc | ----ccoouunntt] [----hheeaaddeerrss=_h_e_a_d_e_r_s] [--pp
-          _p_o_r_t_-_s_p_e_c | ----ppoorrtt=_p_o_r_t_-_s_p_e_c] _p_o_-_b_o_x _f_i_l_e_n_a_m_e
+     ppuusshh [--44 | ----kkrrbb44] [--55 | ----kkrrbb55] [--vv | ----vveerrbboossee] [--ff | ----ffoorrkk] [--ll |
+     ----lleeaavvee] [----ffrroomm] [--cc | ----ccoouunntt] [----hheeaaddeerrss=_h_e_a_d_e_r_s] [--pp _p_o_r_t_-_s_p_e_c |
+     ----ppoorrtt=_p_o_r_t_-_s_p_e_c] _p_o_-_b_o_x _f_i_l_e_n_a_m_e
 
 DDEESSCCRRIIPPTTIIOONN
      ppuusshh retrieves mail from the post office box _p_o_-_b_o_x, and stores the mail
@@ -73,4 +73,4 @@ SSEEEE AALLSSOO
 HHIISSTTOORRYY
      ppuusshh was written while waiting for mmoovveemmaaiill to finish getting the mail.
 
-HEIMDAL                          May 31, 1998                          HEIMDAL
+ HEIMDAL                         May 31, 1998                                2
diff --git a/crypto/heimdal/appl/rcp/Makefile.in b/crypto/heimdal/appl/rcp/Makefile.in
index 921764ff59e7..2efb884bbc62 100644
--- a/crypto/heimdal/appl/rcp/Makefile.in
+++ b/crypto/heimdal/appl/rcp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -257,7 +256,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -266,17 +266,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 rcp$(EXEEXT): $(rcp_OBJECTS) $(rcp_DEPENDENCIES) 
 	@rm -f rcp$(EXEEXT)
 	$(LINK) $(rcp_LDFLAGS) $(rcp_OBJECTS) $(rcp_LDADD) $(LIBS)
@@ -347,7 +344,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -397,7 +394,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/rsh/Makefile.in b/crypto/heimdal/appl/rsh/Makefile.in
index bd4d285bbc60..c51a16e7724c 100644
--- a/crypto/heimdal/appl/rsh/Makefile.in
+++ b/crypto/heimdal/appl/rsh/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -322,7 +321,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -331,17 +331,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -351,7 +348,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -360,17 +358,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 rsh$(EXEEXT): $(rsh_OBJECTS) $(rsh_DEPENDENCIES) 
 	@rm -f rsh$(EXEEXT)
 	$(LINK) $(rsh_LDFLAGS) $(rsh_OBJECTS) $(rsh_LDADD) $(LIBS)
@@ -418,10 +413,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -461,10 +452,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -530,7 +517,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -580,7 +567,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/su/Makefile.in b/crypto/heimdal/appl/su/Makefile.in
index ac3a37230cd7..e5e7af81e646 100644
--- a/crypto/heimdal/appl/su/Makefile.in
+++ b/crypto/heimdal/appl/su/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -267,7 +266,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -276,17 +276,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 su$(EXEEXT): $(su_OBJECTS) $(su_DEPENDENCIES) 
 	@rm -f su$(EXEEXT)
 	$(LINK) $(su_LDFLAGS) $(su_OBJECTS) $(su_LDADD) $(LIBS)
@@ -357,7 +354,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -407,7 +404,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/ChangeLog b/crypto/heimdal/appl/telnet/ChangeLog
index f696871334dd..d0c8894e05a8 100644
--- a/crypto/heimdal/appl/telnet/ChangeLog
+++ b/crypto/heimdal/appl/telnet/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-21  Johan Danielsson  <joda@pdc.kth.se>
+
+	* libtelnet/kerberos5.c: pull up 1.52-1.53; also try to use the
+	session key (if this is really correct is beyond me, RFC2942 in
+	unclear on this point;
+	(kerberos5_is): check that the subkey is non-NULL
+
 2002-09-02  Johan Danielsson  <joda@pdc.kth.se>
 
 	* libtelnet/kerberos5.c: set AP_OPTS_USE_SUBKEY
diff --git a/crypto/heimdal/appl/telnet/Makefile.in b/crypto/heimdal/appl/telnet/Makefile.in
index 81ef4365c9dd..943254d28a3c 100644
--- a/crypto/heimdal/appl/telnet/Makefile.in
+++ b/crypto/heimdal/appl/telnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -348,7 +347,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -410,7 +409,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in b/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
index 828a4506490c..2b785052f519 100644
--- a/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
+++ b/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -338,7 +337,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -387,7 +386,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c b/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
index 8a4bf69241b7..a4316fba0a0a 100644
--- a/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
+++ b/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c
@@ -53,7 +53,7 @@
 
 #include <config.h>
 
-RCSID("$Id: kerberos5.c,v 1.51 2002/09/02 15:33:20 joda Exp $");
+RCSID("$Id: kerberos5.c,v 1.51.4.1 2002/10/21 14:28:31 joda Exp $");
 
 #ifdef	KRB5
 
@@ -425,6 +425,29 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
 	    return;
 	}
 
+	if (key_block == NULL) {
+	    ret = krb5_auth_con_getkey(context,
+				       auth_context,
+				       &key_block);
+	}
+	if (ret) {
+	    Data(ap, KRB_REJECT, "krb5_auth_con_getkey failed", -1);
+	    auth_finished(ap, AUTH_REJECT);
+	    if (auth_debug_mode)
+		printf("Kerberos V5: "
+		       "krb5_auth_con_getkey failed (%s)\r\n",
+		       krb5_get_err_text(context, ret));
+	    return;
+	}
+	if (key_block == NULL) {
+	    Data(ap, KRB_REJECT, "no subkey received", -1);
+	    auth_finished(ap, AUTH_REJECT);
+	    if (auth_debug_mode)
+		printf("Kerberos V5: "
+		       "krb5_auth_con_getremotesubkey returned NULL key\r\n");
+	    return;
+	}
+
 	if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
 	    ret = krb5_mk_rep(context, auth_context, &outbuf);
 	    if (ret) {
diff --git a/crypto/heimdal/appl/telnet/telnet/Makefile.in b/crypto/heimdal/appl/telnet/telnet/Makefile.in
index 8becca668d6f..897cf3e557fd 100644
--- a/crypto/heimdal/appl/telnet/telnet/Makefile.in
+++ b/crypto/heimdal/appl/telnet/telnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -283,7 +282,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -292,17 +292,14 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 telnet$(EXEEXT): $(telnet_OBJECTS) $(telnet_DEPENDENCIES) 
 	@rm -f telnet$(EXEEXT)
 	$(LINK) $(telnet_LDFLAGS) $(telnet_OBJECTS) $(telnet_LDADD) $(LIBS)
@@ -347,10 +344,6 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -416,7 +409,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -466,7 +459,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/telnet/telnet.cat1 b/crypto/heimdal/appl/telnet/telnet/telnet.cat1
index 4cfd2cc565b4..5bf4a649f97b 100644
--- a/crypto/heimdal/appl/telnet/telnet/telnet.cat1
+++ b/crypto/heimdal/appl/telnet/telnet/telnet.cat1
@@ -1,4 +1,4 @@
-TELNET(1)               FreeBSD General Commands Manual              TELNET(1)
+TELNET(1)                   NetBSD Reference Manual                  TELNET(1)
 
 NNAAMMEE
      tteellnneett - user interface to the TELNET protocol
@@ -9,8 +9,8 @@ SSYYNNOOPPSSIISS
 
 DDEESSCCRRIIPPTTIIOONN
      The tteellnneett command is used to communicate with another host using the
-     TELNET protocol.  If tteellnneett is invoked without the _h_o_s_t argument, it
-     enters command mode, indicated by its prompt (tteellnneett>>).  In this mode, it
+     TELNET protocol.  If tteellnneett is invoked without the _h_o_s_t argument, it en-
+     ters command mode, indicated by its prompt (tteellnneett>>).  In this mode, it
      accepts and executes the commands listed below.  If it is invoked with
      arguments, it performs an ooppeenn command with those arguments.
 
@@ -24,9 +24,9 @@ DDEESSCCRRIIPPTTIIOONN
      --EE      Stops any character from being recognized as an escape character.
 
      --FF      If Kerberos V5 authentication is being used, the --FF option allows
-             the local credentials to be forwarded to the remote system,
-             including any credentials that have already been forwarded into
-             the local environment.
+             the local credentials to be forwarded to the remote system, in-
+             cluding any credentials that have already been forwarded into the
+             local environment.
 
      --KK      Specifies no automatic login to the remote system.
 
@@ -42,10 +42,10 @@ DDEESSCCRRIIPPTTIIOONN
              Disables the _a_t_y_p_e type of authentication.
 
      --aa      Attempt automatic login.  Currently, this sends the user name via
-             the USER variable of the ENVIRON option if supported by the
-             remote system.  The name used is that of the current user as
-             returned by getlogin(2) if it agrees with the current user ID,
-             otherwise it is the name associated with the user ID.
+             the USER variable of the ENVIRON option if supported by the re-
+             mote system.  The name used is that of the current user as re-
+             turned by getlogin(2) if it agrees with the current user ID, oth-
+             erwise it is the name associated with the user ID.
 
      --cc      Disables the reading of the user's _._t_e_l_n_e_t_r_c file.  (See the
              ttooggggllee sskkiipprrcc command on this man page.)
@@ -62,8 +62,8 @@ DDEESSCCRRIIPPTTIIOONN
 
      --kk _r_e_a_l_m
              If Kerberos authentication is being used, the --kk option requests
-             that telnet obtain tickets for the remote host in realm realm
-             instead of the remote host's realm, as determined by
+             that telnet obtain tickets for the remote host in realm realm in-
+             stead of the remote host's realm, as determined by
              krb_realmofhost(3).
 
      --ll _u_s_e_r
@@ -119,14 +119,14 @@ DDEESSCCRRIIPPTTIIOONN
 
      If the LINEMODE option is enabled, or if the llooccaallcchhaarrss toggle is TRUE
      (the default for ``old line by line``; see below), the user's qquuiitt, iinnttrr,
-     and fflluusshh characters are trapped locally, and sent as TELNET protocol
-     sequences to the remote side.  If LINEMODE has ever been enabled, then
-     the user's ssuusspp and eeooff are also sent as TELNET protocol sequences, and
-     qquuiitt is sent as a TELNET ABORT instead of BREAK There are options (see
-     ttooggggllee aauuttoofflluusshh and ttooggggllee aauuttoossyynncchh below) which cause this action to
-     flush subsequent output to the terminal (until the remote host acknowl-
-     edges the TELNET sequence) and flush previous terminal input (in the case
-     of qquuiitt and iinnttrr).
+     and fflluusshh characters are trapped locally, and sent as TELNET protocol se-
+     quences to the remote side.  If LINEMODE has ever been enabled, then the
+     user's ssuusspp and eeooff are also sent as TELNET protocol sequences, and qquuiitt
+     is sent as a TELNET ABORT instead of BREAK There are options (see ttooggggllee
+     aauuttoofflluusshh and ttooggggllee aauuttoossyynncchh below) which cause this action to flush
+     subsequent output to the terminal (until the remote host acknowledges the
+     TELNET sequence) and flush previous terminal input (in the case of qquuiitt
+     and iinnttrr).
 
      While connected to a remote host, tteellnneett command mode may be entered by
      typing the tteellnneett ``escape character'' (initially ``^]'').  When in com-
@@ -155,8 +155,8 @@ DDEESSCCRRIIPPTTIIOONN
      cclloossee      Close a TELNET session and return to command mode.
 
      ddiissppllaayy _a_r_g_u_m_e_n_t _._._.
-                Displays all, or some, of the sseett and ttooggggllee values (see
-                below).
+                Displays all, or some, of the sseett and ttooggggllee values (see be-
+                low).
 
      eennccrryypptt _a_r_g_u_m_e_n_t _._._.
                 The encrypt command manipulates the information sent through
@@ -233,8 +233,8 @@ DDEESSCCRRIIPPTTIIOONN
                             remote side.
 
                 uunneexxppoorrtt _v_a_r_i_a_b_l_e
-                            Mark the variable _v_a_r_i_a_b_l_e to not be exported
-                            unless explicitly asked for by the remote side.
+                            Mark the variable _v_a_r_i_a_b_l_e to not be exported un-
+                            less explicitly asked for by the remote side.
 
                 lliisstt        List the current set of environment variables.
                             Those marked with a ** will be sent automatically,
@@ -256,17 +256,17 @@ DDEESSCCRRIIPPTTIIOONN
 
      mmooddee _t_y_p_e  _T_y_p_e is one of several options, depending on the state of the
                 TELNET session.  The remote host is asked for permission to go
-                into the requested mode.  If the remote host is capable of
-                entering that mode, the requested mode will be entered.
+                into the requested mode.  If the remote host is capable of en-
+                tering that mode, the requested mode will be entered.
 
                 cchhaarraacctteerr     Disable the TELNET LINEMODE option, or, if the
-                              remote side does not understand the LINEMODE
-                              option, then enter ``character at a time`` mode.
+                              remote side does not understand the LINEMODE op-
+                              tion, then enter ``character at a time`` mode.
 
                 lliinnee          Enable the TELNET LINEMODE option, or, if the
-                              remote side does not understand the LINEMODE
-                              option, then attempt to enter ``old-line-by-
-                              line`` mode.
+                              remote side does not understand the LINEMODE op-
+                              tion, then attempt to enter ``old-line-by-line``
+                              mode.
 
                 iissiigg (--iissiigg)  Attempt to enable (disable) the TRAPSIG mode of
                               the LINEMODE option.  This requires that the
@@ -298,15 +298,15 @@ DDEESSCCRRIIPPTTIIOONN
                 to specify the user name to be passed to the remote system via
                 the ENVIRON option.  When connecting to a non-standard port,
                 tteellnneett omits any automatic initiation of TELNET options.  When
-                the port number is preceded by a minus sign, the initial
-                option negotiation is done.  After establishing a connection,
+                the port number is preceded by a minus sign, the initial op-
+                tion negotiation is done.  After establishing a connection,
                 the file _._t_e_l_n_e_t_r_c in the users home directory is opened.
                 Lines beginning with a # are comment lines.  Blank lines are
                 ignored.  Lines that begin without white space are the start
                 of a machine entry.  The first thing on the line is the name
                 of the machine that is being connected to.  The rest of the
-                line, and successive lines that begin with white space are
-                assumed to be tteellnneett commands and are processed as if they had
+                line, and successive lines that begin with white space are as-
+                sumed to be tteellnneett commands and are processed as if they had
                 been typed in manually to the tteellnneett command prompt.
 
      qquuiitt       Close any open TELNET session and exit tteellnneett.  An end of file
@@ -324,8 +324,8 @@ DDEESSCCRRIIPPTTIIOONN
                         _f_r_o_m the remote system _t_o the user's terminal.
 
                 aayytt     Sends the TELNET AYT (Are You There) sequence, to
-                        which the remote system may or may not choose to
-                        respond.
+                        which the remote system may or may not choose to re-
+                        spond.
 
                 bbrrkk     Sends the TELNET BRK (Break) sequence, which may have
                         significance to the remote system.
@@ -363,9 +363,9 @@ DDEESSCCRRIIPPTTIIOONN
 
                 ssyynncchh   Sends the TELNET SYNCH sequence.  This sequence causes
                         the remote system to discard all previously typed (but
-                        not yet read) input.  This sequence is sent as TCP
-                        urgent data (and may not work if the remote system is
-                        a 4.2BSD system -- if it doesn't work, a lower case
+                        not yet read) input.  This sequence is sent as TCP ur-
+                        gent data (and may not work if the remote system is a
+                        4.2BSD system -- if it doesn't work, a lower case
                         ``r'' may be echoed on the terminal).
 
                 ddoo _c_m_d
@@ -397,17 +397,17 @@ DDEESSCCRRIIPPTTIIOONN
                 the ttooggggllee command may be explicitly set or unset using the
                 sseett and uunnsseett commands.
 
-                aayytt     If TELNET is in localchars mode, or LINEMODE is
-                        enabled, and the status character is typed, a TELNET
-                        AYT sequence (see sseenndd aayytt preceding) is sent to the
-                        remote host.  The initial value for the "Are You
-                        There" character is the terminal's status character.
+                aayytt     If TELNET is in localchars mode, or LINEMODE is en-
+                        abled, and the status character is typed, a TELNET AYT
+                        sequence (see sseenndd aayytt preceding) is sent to the re-
+                        mote host.  The initial value for the "Are You There"
+                        character is the terminal's status character.
 
                 eecchhoo    This is the value (initially ``^E'') which, when in
                         ``line by line'' mode, toggles between doing local
                         echoing of entered characters (for normal processing),
-                        and suppressing echoing of entered characters (for
-                        entering, say, a password).
+                        and suppressing echoing of entered characters (for en-
+                        tering, say, a password).
 
                 eeooff     If tteellnneett is operating in LINEMODE or ``old line by
                         line'' mode, entering this character as the first
@@ -483,23 +483,23 @@ DDEESSCCRRIIPPTTIIOONN
                         suspends the telnet command.  The initial state is to
                         disable the rlogin escape character.
 
-                ssttaarrtt   If the TELNET TOGGLE-FLOW-CONTROL option has been
-                        enabled, then this character is taken to be the termi-
+                ssttaarrtt   If the TELNET TOGGLE-FLOW-CONTROL option has been en-
+                        abled, then this character is taken to be the termi-
                         nal's ssttaarrtt character.  The initial value for the kill
                         character is taken to be the terminal's ssttaarrtt charac-
                         ter.
 
-                ssttoopp    If the TELNET TOGGLE-FLOW-CONTROL option has been
-                        enabled, then this character is taken to be the termi-
+                ssttoopp    If the TELNET TOGGLE-FLOW-CONTROL option has been en-
+                        abled, then this character is taken to be the termi-
                         nal's ssttoopp character.  The initial value for the kill
                         character is taken to be the terminal's ssttoopp charac-
                         ter.
 
-                ssuusspp    If tteellnneett is in llooccaallcchhaarrss mode, or LINEMODE is
-                        enabled, and the ssuussppeenndd character is typed, a TELNET
-                        SUSP sequence (see sseenndd ssuusspp above) is sent to the
-                        remote host.  The initial value for the suspend char-
-                        acter is taken to be the terminal's ssuussppeenndd character.
+                ssuusspp    If tteellnneett is in llooccaallcchhaarrss mode, or LINEMODE is en-
+                        abled, and the ssuussppeenndd character is typed, a TELNET
+                        SUSP sequence (see sseenndd ssuusspp above) is sent to the re-
+                        mote host.  The initial value for the suspend charac-
+                        ter is taken to be the terminal's ssuussppeenndd character.
 
                 ttrraacceeffiillee
                         This is the file to which the output, caused by
@@ -562,8 +562,8 @@ DDEESSCCRRIIPPTTIIOONN
                               above for details), tteellnneett refuses to display
                               any data on the user's terminal until the remote
                               system acknowledges (via a TELNET TIMING MARK
-                              option) that it has processed those TELNET
-                              sequences.  The initial value for this toggle is
+                              option) that it has processed those TELNET se-
+                              quences.  The initial value for this toggle is
                               TRUE if the terminal user had not done an "stty
                               noflsh", otherwise FALSE (see stty(1)).
 
@@ -581,8 +581,8 @@ DDEESSCCRRIIPPTTIIOONN
                 aauuttoollooggiinn     If the remote side supports the TELNET
                               AUTHENTICATION option TELNET attempts to use it
                               to perform automatic authentication.  If the
-                              AUTHENTICATION option is not supported, the
-                              user's login name are propagated through the
+                              AUTHENTICATION option is not supported, the us-
+                              er's login name are propagated through the
                               TELNET ENVIRON option.  This command is the same
                               as specifying _a option on the ooppeenn command.
 
@@ -612,15 +612,15 @@ DDEESSCCRRIIPPTTIIOONN
                               initial value for this toggle is FALSE.
 
                 ccrrmmoodd         Toggle carriage return mode.  When this mode is
-                              enabled, most carriage return characters
-                              received from the remote host will be mapped
-                              into a carriage return followed by a line feed.
-                              This mode does not affect those characters typed
-                              by the user, only those received from the remote
+                              enabled, most carriage return characters re-
+                              ceived from the remote host will be mapped into
+                              a carriage return followed by a line feed.  This
+                              mode does not affect those characters typed by
+                              the user, only those received from the remote
                               host.  This mode is not very useful unless the
-                              remote host only sends carriage return, but
-                              never line feed.  The initial value for this
-                              toggle is FALSE.
+                              remote host only sends carriage return, but nev-
+                              er line feed.  The initial value for this toggle
+                              is FALSE.
 
                 ddeebbuugg         Toggles socket level debugging (useful only to
                               the ssuuppeerr uusseerr).  The initial value for this
@@ -648,8 +648,8 @@ DDEESSCCRRIIPPTTIIOONN
                               toggle is FALSE.
 
                 ooppttiioonnss       Toggles the display of some internal tteellnneett pro-
-                              tocol processing (having to do with TELNET
-                              options).  The initial value for this toggle is
+                              tocol processing (having to do with TELNET op-
+                              tions).  The initial value for this toggle is
                               FALSE.
 
                 pprreettttyydduummpp    When the nneettddaattaa toggle is enabled, if
@@ -671,21 +671,21 @@ DDEESSCCRRIIPPTTIIOONN
 
                 vveerrbboossee__eennccrryypptt
                               When the vveerrbboossee__eennccrryypptt toggle is TRUE, TELNET
-                              prints out a message each time encryption is
-                              enabled or disabled.  The initial value for this
+                              prints out a message each time encryption is en-
+                              abled or disabled.  The initial value for this
                               toggle is FALSE.  Note:  Because of export con-
                               trols, data encryption is not supported outside
                               of the United States and Canada.
 
                 ??             Displays the legal ttooggggllee commands.
 
-     zz          Suspend tteellnneett.  This command only works when the user is
-                using the csh(1).
+     zz          Suspend tteellnneett.  This command only works when the user is us-
+                ing the csh(1).
 
      !! [_c_o_m_m_a_n_d]
                 Execute a single command in a subshell on the local system.
-                If ccoommmmaanndd is omitted, then an interactive subshell is
-                invoked.
+                If ccoommmmaanndd is omitted, then an interactive subshell is in-
+                voked.
 
      ?? [_c_o_m_m_a_n_d]
                 Get help.  With no arguments, tteellnneett prints a help summary.
@@ -711,4 +711,4 @@ NNOOTTEESS
      only recognized (and sent to the remote system) when it is the first
      character on a line.
 
-4.2 Berkeley Distribution        June 1, 1994        4.2 Berkeley Distribution
+4.2 Berkeley Distribution        June 1, 1994                               11
diff --git a/crypto/heimdal/appl/telnet/telnetd/Makefile.in b/crypto/heimdal/appl/telnet/telnetd/Makefile.in
index 9941aacc5886..a94720505adb 100644
--- a/crypto/heimdal/appl/telnet/telnetd/Makefile.in
+++ b/crypto/heimdal/appl/telnet/telnetd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -286,7 +285,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	  if test -f $$p \
 	     || test -f $$p1 \
 	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \
 	  else :; fi; \
@@ -295,17 +295,14 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
 	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
 	done
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 telnetd$(EXEEXT): $(telnetd_OBJECTS) $(telnetd_DEPENDENCIES) 
 	@rm -f telnetd$(EXEEXT)
 	$(LINK) $(telnetd_LDFLAGS) $(telnetd_OBJECTS) $(telnetd_LDADD) $(LIBS)
@@ -350,10 +347,6 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    8*) ;; \
-	    *) ext='8' ;; \
-	  esac; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -419,7 +412,7 @@ top_distdir = ../../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -469,7 +462,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8 b/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8
index b2056b239ff4..ce4c714fb85d 100644
--- a/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8
+++ b/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8
@@ -1,4 +1,4 @@
-TELNETD(8)              FreeBSD System Manager's Manual             TELNETD(8)
+TELNETD(8)              NetBSD System Manager's Manual              TELNETD(8)
 
 NNAAMMEE
      tteellnneettdd - DARPA TELNET protocol server
@@ -34,8 +34,8 @@ DDEESSCCRRIIPPTTIIOONN
                   valid  Only allow connections when the remote user can pro-
                          vide valid authentication information to identify the
                          remote user.  The login(1) command will provide any
-                         additional user verification needed if the remote
-                         user is not allowed automatic access to the specified
+                         additional user verification needed if the remote us-
+                         er is not allowed automatic access to the specified
                          account.
 
                   other  Only allow connections that supply some authentica-
@@ -105,22 +105,22 @@ DDEESSCCRRIIPPTTIIOONN
      --SS _t_o_s
 
      --uu _l_e_n       This option is used to specify the size of the field in the
-                  utmp structure that holds the remote host name.  If the
-                  resolved host name is longer than _l_e_n, the dotted decimal
-                  value will be used instead.  This allows hosts with very
-                  long host names that overflow this field to still be
-                  uniquely identified.  Specifying --uu00 indicates that only
-                  dotted decimal addresses should be put into the _u_t_m_p file.
+                  utmp structure that holds the remote host name.  If the re-
+                  solved host name is longer than _l_e_n, the dotted decimal val-
+                  ue will be used instead.  This allows hosts with very long
+                  host names that overflow this field to still be uniquely
+                  identified.  Specifying --uu00 indicates that only dotted deci-
+                  mal addresses should be put into the _u_t_m_p file.
 
-     --UU           This option causes tteellnneettdd to refuse connections from
-                  addresses that cannot be mapped back into a symbolic name
-                  via the gethostbyaddr(3) routine.
+     --UU           This option causes tteellnneettdd to refuse connections from ad-
+                  dresses that cannot be mapped back into a symbolic name via
+                  the gethostbyaddr(3) routine.
 
      --XX _a_u_t_h_t_y_p_e  This option is only valid if tteellnneettdd has been built with
                   support for the authentication option.  It disables the use
                   of _a_u_t_h_t_y_p_e authentication, and can be used to temporarily
-                  disable a specific authentication type without having to
-                  recompile tteellnneettdd.
+                  disable a specific authentication type without having to re-
+                  compile tteellnneettdd.
 
      --LL _p_a_t_h_n_a_m_e  Specify pathname to an alternative login program.
 
@@ -175,8 +175,8 @@ DDEESSCCRRIIPPTTIIOONN
      WILL SGA           Indicates that it will not be sending IAC GA, go
                         ahead, commands.
 
-     WILL STATUS        Indicates a willingness to send the client, upon
-                        request, of the current status of all TELNET options.
+     WILL STATUS        Indicates a willingness to send the client, upon re-
+                        quest, of the current status of all TELNET options.
 
      WILL TIMING-MARK   Whenever a DO TIMING-MARK command is received, it is
                         always responded to with a WILL TIMING-MARK
@@ -197,8 +197,8 @@ DDEESSCCRRIIPPTTIIOONN
                         ters remotely.
 
      DO ECHO            This is not really supported, but is sent to identify
-                        a 4.2BSD telnet(1) client, which will improperly
-                        respond with WILL ECHO.  If a WILL ECHO is received, a
+                        a 4.2BSD telnet(1) client, which will improperly re-
+                        spond with WILL ECHO.  If a WILL ECHO is received, a
                         DONT ECHO will be sent in response.
 
      DO TERMINAL-TYPE   Indicates a desire to be able to request the name of
@@ -236,8 +236,8 @@ DDEESSCCRRIIPPTTIIOONN
                         linemode.  Note that the [--kk] option can be used to
                         disable this.
 
-     DO AUTHENTICATION  Only sent if tteellnneettdd is compiled with support for
-                        authentication, and indicates a willingness to receive
+     DO AUTHENTICATION  Only sent if tteellnneettdd is compiled with support for au-
+                        thentication, and indicates a willingness to receive
                         authentication information for automatic login.
 
      DO ENCRYPT         Only sent if tteellnneettdd is compiled with support for data
@@ -290,4 +290,4 @@ BBUUGGSS
 
      TTeellnneettdd never sends TELNET IAC GA (go ahead) commands.
 
-4.2 Berkeley Distribution        June 1, 1994        4.2 Berkeley Distribution
+4.2 Berkeley Distribution        June 1, 1994                                5
diff --git a/crypto/heimdal/appl/test/Makefile.in b/crypto/heimdal/appl/test/Makefile.in
index 713f291315ad..932b267ed506 100644
--- a/crypto/heimdal/appl/test/Makefile.in
+++ b/crypto/heimdal/appl/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -55,7 +55,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -335,11 +334,7 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 gssapi_client$(EXEEXT): $(gssapi_client_OBJECTS) $(gssapi_client_DEPENDENCIES) 
 	@rm -f gssapi_client$(EXEEXT)
 	$(LINK) $(gssapi_client_LDFLAGS) $(gssapi_client_OBJECTS) $(gssapi_client_LDADD) $(LIBS)
@@ -431,7 +426,7 @@ top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@for file in $(DISTFILES); do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -480,7 +475,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"