[src/trunk]: src/external/gpl2/rcs - merge local changes

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

details:   https://anonhg.NetBSD.org/src/rev/07c85405a5af
branches:  trunk
changeset: 342921:07c85405a5af
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 14 04:22:38 2016 +0000

description:
- merge local changes
- provide reach-over infrastructure

diffstat:

 external/gpl2/rcs/Makefile               |    3 +
 external/gpl2/rcs/Makefile.inc           |   12 +
 external/gpl2/rcs/bin/Makefile           |    3 +
 external/gpl2/rcs/bin/Makefile.inc       |    2 +
 external/gpl2/rcs/bin/ci/Makefile        |    5 +
 external/gpl2/rcs/bin/co/Makefile        |    7 +
 external/gpl2/rcs/bin/ident/Makefile     |    5 +
 external/gpl2/rcs/bin/merge/Makefile     |    5 +
 external/gpl2/rcs/bin/rcs/Makefile       |    6 +
 external/gpl2/rcs/bin/rcsclean/Makefile  |    5 +
 external/gpl2/rcs/bin/rcsdiff/Makefile   |    5 +
 external/gpl2/rcs/bin/rcsfreeze/Makefile |    6 +
 external/gpl2/rcs/bin/rcsmerge/Makefile  |    5 +
 external/gpl2/rcs/bin/rlog/Makefile      |    9 +
 external/gpl2/rcs/dist/man/ci.1          |   10 +-
 external/gpl2/rcs/dist/man/co.1          |   12 +-
 external/gpl2/rcs/dist/man/ident.1       |    6 +-
 external/gpl2/rcs/dist/man/merge.1       |   13 +-
 external/gpl2/rcs/dist/man/rcs.1         |   90 ++----
 external/gpl2/rcs/dist/man/rcsclean.1    |    4 +-
 external/gpl2/rcs/dist/man/rcsdiff.1     |    4 +-
 external/gpl2/rcs/dist/man/rcsfile.5     |    6 +-
 external/gpl2/rcs/dist/man/rcsfreeze.1   |    2 +-
 external/gpl2/rcs/dist/man/rcsintro.1    |   89 ++----
 external/gpl2/rcs/dist/man/rcsmerge.1    |    6 +-
 external/gpl2/rcs/dist/man/rlog.1        |   26 +-
 external/gpl2/rcs/dist/rcs.ms            |    2 +-
 external/gpl2/rcs/dist/src/ci.c          |    5 +-
 external/gpl2/rcs/dist/src/co.c          |    2 +-
 external/gpl2/rcs/dist/src/ident.c       |   12 +-
 external/gpl2/rcs/dist/src/maketime.h    |    2 +-
 external/gpl2/rcs/dist/src/merge.c       |    2 +-
 external/gpl2/rcs/dist/src/merger.c      |    2 +-
 external/gpl2/rcs/dist/src/partime.c     |    2 +-
 external/gpl2/rcs/dist/src/partime.h     |    2 +-
 external/gpl2/rcs/dist/src/rcs.c         |   22 +-
 external/gpl2/rcs/dist/src/rcsbase.h     |   16 +-
 external/gpl2/rcs/dist/src/rcsclean.c    |   11 +-
 external/gpl2/rcs/dist/src/rcsdiff.c     |   11 +-
 external/gpl2/rcs/dist/src/rcsedit.c     |   33 +-
 external/gpl2/rcs/dist/src/rcsfcmp.c     |    2 +-
 external/gpl2/rcs/dist/src/rcsfnms.c     |   12 +-
 external/gpl2/rcs/dist/src/rcsfreeze.sh  |    2 +-
 external/gpl2/rcs/dist/src/rcsgen.c      |    5 +-
 external/gpl2/rcs/dist/src/rcskeep.c     |    5 +-
 external/gpl2/rcs/dist/src/rcskeys.c     |    5 +-
 external/gpl2/rcs/dist/src/rcslex.c      |   12 +-
 external/gpl2/rcs/dist/src/rcsmap.c      |    2 +-
 external/gpl2/rcs/dist/src/rcsmerge.c    |    2 +-
 external/gpl2/rcs/dist/src/rcsrev.c      |   23 +-
 external/gpl2/rcs/dist/src/rcssyn.c      |   14 +-
 external/gpl2/rcs/dist/src/rcstime.c     |    2 +-
 external/gpl2/rcs/dist/src/rcsutil.c     |    7 +-
 external/gpl2/rcs/dist/src/rlog.c        |   18 +-
 external/gpl2/rcs/dist/src/version.c     |    2 +-
 external/gpl2/rcs/include/conf.h         |  406 +++++++++++++++++++++++++++++++
 external/gpl2/rcs/lib/Makefile           |   23 +
 external/gpl2/rcs/rcs2netbsd             |  134 ++++++++++
 58 files changed, 915 insertions(+), 231 deletions(-)

diffs (truncated from 2391 to 300 lines):

diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/Makefile        Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+SUBDIR = lib .WAIT bin
+.include <bsd.subdir.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/Makefile.inc    Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+.include <bsd.own.mk>
+
+BINDIR=/usr/bin
+DIST=${NETBSDSRCDIR}/external/gpl2/rcs
+IDIST=${DIST}/dist
+
+PROGDPLIBS+=   rcs ${DIST}/lib
+CPPFLAGS+=     -I${DIST}/include
+
+.PATH: ${IDIST}/src ${IDIST}/man
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/Makefile    Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+SUBDIR = ci co ident merge rcs rcsclean rcsdiff rcsfreeze rcsmerge rlog
+.include <bsd.subdir.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/Makefile.inc        Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/14 04:22:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/ci/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/ci/Makefile Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  ci
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/co/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/co/Makefile Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  co
+
+CWARNFLAGS.clang+=     -Wno-format-extra-args
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/ident/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/ident/Makefile      Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  ident
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/merge/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/merge/Makefile      Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  merge
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/rcs/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/rcs/Makefile        Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  rcs
+MAN=   rcs.1 rcsfile.5 rcsintro.1
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/rcsclean/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/rcsclean/Makefile   Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  rcsclean
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/rcsdiff/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/rcsdiff/Makefile    Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  rcsdiff
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/rcsfreeze/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/rcsfreeze/Makefile  Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+MAN=   rcsfreeze.1
+SCRIPTS=rcsfreeze.sh
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/rcsmerge/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/rcsmerge/Makefile   Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:38 christos Exp $
+
+PROG=  rcsmerge
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/bin/rlog/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/rcs/bin/rlog/Makefile       Thu Jan 14 04:22:38 2016 +0000
@@ -0,0 +1,9 @@
+#      $NetBSD: Makefile,v 1.1 2016/01/14 04:22:39 christos Exp $
+
+PROG=  rlog
+LINKS= ${BINDIR}/rlog ${BINDIR}/rcslog
+MLINKS=        rlog.1 rcslog.1
+
+CWARNFLAGS.clang+=     -Wno-string-plus-int
+
+.include <bsd.prog.mk>
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/dist/man/ci.1
--- a/external/gpl2/rcs/dist/man/ci.1   Thu Jan 14 04:21:48 2016 +0000
+++ b/external/gpl2/rcs/dist/man/ci.1   Thu Jan 14 04:22:38 2016 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ci.1,v 1.1.1.1 2016/01/14 03:05:06 christos Exp $
+.\"    $NetBSD: ci.1,v 1.2 2016/01/14 04:22:39 christos Exp $
 .\"
 .de Id
 .ds Rv \\$3
@@ -483,7 +483,7 @@
 .IR suffixes
 is installation-dependent; normally it is
 .B ,v/
-for hosts like Unix that permit commas in filenames,
+for hosts like UNIX that permit commas in filenames,
 and is empty (i.e. just the empty suffix) for other hosts.
 .TP
 .BI \-z zone
@@ -708,14 +708,14 @@
 Consult a trustworthy expert if there are any doubts.
 It is best if the
 .B seteuid
-system call works as described in Posix 1003.1a Draft 5,
+system call works as described in POSIX 1003.1a Draft 5,
 because \*r can switch back and forth easily
 between real and effective users, even if the real user is
 .BR root .
 If not, the second best is if the
 .B setuid
 system call supports saved setuid
-(the {\s-1_POSIX_SAVED_IDS\s0} behavior of Posix 1003.1-1990);
+(the {\s-1_POSIX_SAVED_IDS\s0} behavior of POSIX 1003.1-1990);
 this fails only if the real or effective user is
 .BR root .
 If \*r detects any failure in setuid, it quits immediately.
@@ -895,7 +895,7 @@
 .br
 Walter F. Tichy,
 \*r\*-A System for Version Control,
-.I "Software\*-Practice & Experience"
+.I "Software\*-Practice \*[Am] Experience"
 .BR 15 ,
 7 (July 1985), 637-654.
 .br
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/dist/man/co.1
--- a/external/gpl2/rcs/dist/man/co.1   Thu Jan 14 04:21:48 2016 +0000
+++ b/external/gpl2/rcs/dist/man/co.1   Thu Jan 14 04:22:38 2016 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: co.1,v 1.1.1.1 2016/01/14 03:05:06 christos Exp $
+.\"    $NetBSD: co.1,v 1.2 2016/01/14 04:22:39 christos Exp $
 .\"
 .de Id
 .ds Rv \\$3
@@ -36,7 +36,7 @@
 Checkout with locking also requires the caller to be on the access list of
 the \*r file, unless he is the owner of the
 file or the superuser, or the access list is empty.
-Checkout without locking is not subject to accesslist restrictions, and is
+Checkout without locking is not subject to access list restrictions, and is
 not affected by the presence of locks.
 .PP
 A revision is selected by options for revision or branch number,
@@ -217,7 +217,7 @@
 This acts like
 .BR \-ko ,
 except it performs all working file input and output in binary mode.
-This makes little difference on Posix and Unix hosts,
+This makes little difference on POSIX and UNIX hosts,
 but on DOS-like hosts one should use
 .B "rcs\ \-i\ \-kb"
 to initialize an \*r file intended to be used for binary files.
@@ -397,7 +397,7 @@
 are the ends of two branches that have
 .I rev2
 as a common ancestor.  If
-.IR rev1 < rev2 < rev3
+.IR rev1 \*[Lt] rev2 \*[Lt] rev3
 on the same branch,
 joining generates a new revision which is like
 .I rev3,
@@ -724,7 +724,7 @@
 .br
 Walter F. Tichy,
 \*r\*-A System for Version Control,
-.I "Software\*-Practice & Experience"
+.I "Software\*-Practice \*[Am] Experience"
 .BR 15 ,
 7 (July 1985), 637-654.
 .SH LIMITS
@@ -733,6 +733,6 @@
 There is no way to selectively suppress the expansion of keywords, except
 by writing them differently.  In nroff and troff, this is done by embedding the
 null-character
-.B \e&
+.B \e\*[Am]
 into the keyword.
 .br
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/dist/man/ident.1
--- a/external/gpl2/rcs/dist/man/ident.1        Thu Jan 14 04:21:48 2016 +0000
+++ b/external/gpl2/rcs/dist/man/ident.1        Thu Jan 14 04:22:38 2016 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ident.1,v 1.1.1.1 2016/01/14 03:05:06 christos Exp $
+.\"    $NetBSD: ident.1,v 1.2 2016/01/14 04:22:39 christos Exp $
 .\"
 .de Id
 .ds Rv \\$3
@@ -48,7 +48,7 @@
 contains
 .IP
 .ft 3
-#include <stdio.h>
+#include \*[Lt]stdio.h\*[Gt]
 .br
 static char const rcsid[] =
 .br
@@ -179,6 +179,6 @@
 .br
 Walter F. Tichy,
 \*r\*-A System for Version Control,
-.I "Software\*-Practice & Experience"
+.I "Software\*-Practice \*[Am] Experience"
 .BR 15 ,
 7 (July 1985), 637-654.
diff -r d60f4cf99bf4 -r 07c85405a5af external/gpl2/rcs/dist/man/merge.1
--- a/external/gpl2/rcs/dist/man/merge.1        Thu Jan 14 04:21:48 2016 +0000
+++ b/external/gpl2/rcs/dist/man/merge.1        Thu Jan 14 04:22:38 2016 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: merge.1,v 1.1.1.1 2016/01/14 03:05:06 christos Exp $
+.\"    $NetBSD: merge.1,v 1.2 2016/01/14 04:22:39 christos Exp $
 .\"
 .de Id
 .ds Rv \\$3
@@ -45,19 +45,19 @@
 If a conflict is found,
 .B merge
 normally outputs a warning and brackets the conflict with
-.B <<<<<<<
+.B \*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]
 and
-.B >>>>>>>
+.B \*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]
 lines.
 A typical conflict will look like this:
 .LP
 .RS
 .nf
-.BI <<<<<<< " file A"
+.BI \*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt]\*[Lt] " file A"
 .I "lines in file A"
 .B "======="
 .I "lines in file B"
-.BI >>>>>>> " file B"
+.BI \*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt]\*[Gt] " file B"
 .RE
 .fi
 .LP
@@ -116,8 +116,9 @@
 .TP
 .BI \-q
 Quiet; do not warn about conflicts.
+.TP
 .BI \-V
-Print \*r's version number.
+Print version number.
 .SH DIAGNOSTICS
 Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.