Module Name: othersrc Committed By: lukem Date: Sun Apr 25 09:29:43 UTC 2021
Modified Files: othersrc/usr.bin/tnftp: ChangeLog othersrc/usr.bin/tnftp/src: Makefile.am Makefile.in Log Message: Change tnftp(1) to refer to "tnftp" instead of "ftp". To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 othersrc/usr.bin/tnftp/ChangeLog cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/Makefile.am cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/src/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.74 othersrc/usr.bin/tnftp/ChangeLog:1.75 --- othersrc/usr.bin/tnftp/ChangeLog:1.74 Sun Apr 25 08:05:49 2021 +++ othersrc/usr.bin/tnftp/ChangeLog Sun Apr 25 09:29:43 2021 @@ -1,6 +1,8 @@ -$NetBSD: ChangeLog,v 1.74 2021/04/25 08:05:49 lukem Exp $ +$NetBSD: ChangeLog,v 1.75 2021/04/25 09:29:43 lukem Exp $ -Sun Apr 25 08:00:14 UTC 2021 lukem +Sun Apr 25 09:24:51 UTC 2021 lukem + + * Change tnftp(1) to refer to "tnftp" instead of "ftp". * Merge NetBSD ftp from 20200608 to 20210131: * Fix signal handler restoration. Avoids intermittent crash. Index: othersrc/usr.bin/tnftp/src/Makefile.am diff -u othersrc/usr.bin/tnftp/src/Makefile.am:1.5 othersrc/usr.bin/tnftp/src/Makefile.am:1.6 --- othersrc/usr.bin/tnftp/src/Makefile.am:1.5 Sun Jul 5 09:37:53 2020 +++ othersrc/usr.bin/tnftp/src/Makefile.am Sun Apr 25 09:29:43 2021 @@ -1,4 +1,4 @@ -## $NetBSD: Makefile.am,v 1.5 2020/07/05 09:37:53 lukem Exp $ +## $NetBSD: Makefile.am,v 1.6 2021/04/25 09:29:43 lukem Exp $ bin_PROGRAMS = tnftp @@ -56,7 +56,8 @@ man1_MANS = \ tnftp.1 tnftp.1: ftp.1 - cp $(srcdir)/ftp.1 tnftp.1 + sed -e 's/^.Dt FTP/.Dt TNFTP/' -e 's/^.Nm ftp/.Nm tnftp/' \ + $(srcdir)/ftp.1 > tnftp.1 CLEANFILES = \ tnftp.1 Index: othersrc/usr.bin/tnftp/src/Makefile.in diff -u othersrc/usr.bin/tnftp/src/Makefile.in:1.16 othersrc/usr.bin/tnftp/src/Makefile.in:1.17 --- othersrc/usr.bin/tnftp/src/Makefile.in:1.16 Sun Jul 5 10:19:32 2020 +++ othersrc/usr.bin/tnftp/src/Makefile.in Sun Apr 25 09:29:43 2021 @@ -859,7 +859,8 @@ uninstall-man: uninstall-man1 tnftp.1: ftp.1 - cp $(srcdir)/ftp.1 tnftp.1 + sed -e 's/^.Dt FTP/.Dt TNFTP/' -e 's/^.Nm ftp/.Nm tnftp/' \ + $(srcdir)/ftp.1 > tnftp.1 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.