6 files changed, 77 insertions, 34 deletions

diff --git a/gnu/usr.bin/cvs/examples/Makefile b/gnu/usr.bin/cvs/examples/Makefile
index edb1cdc07566..e35847d16189 100644
--- a/gnu/usr.bin/cvs/examples/Makefile
+++ b/gnu/usr.bin/cvs/examples/Makefile
@@ -1,17 +1,18 @@
-# $Id: Makefile,v 1.5 1995/02/22 21:49:46 roberto Exp $
+# $Id: Makefile,v 1.3 1995/12/10 23:07:36 peter Exp $
 
-CVSFILES= commitinfo loginfo rcsinfo editinfo modules
+CVSFILES= checkoutlist commitinfo cvswrappers editinfo loginfo modules \
+	  rcsinfo rcstemplate taginfo unwrap wrap
 
 EXAMPDIR = /usr/share/examples/cvs
 
 NOMAN = noman
+NOOBJ = noobj
 
 all clean:
 	@echo -n
 
 install:
-	cd ${.CURDIR}; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CVSFILES} \
-		${DESTDIR}${EXAMPDIR}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CVSFILES} \
+		${DESTDIR}${EXAMPDIR}/examples
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/examples/commitinfo b/gnu/usr.bin/cvs/examples/commitinfo
index 7e602e2b2cb4..2846c713b024 100644
--- a/gnu/usr.bin/cvs/examples/commitinfo
+++ b/gnu/usr.bin/cvs/examples/commitinfo
@@ -1,5 +1,5 @@
 #
-# $Id: commitinfo,v 1.2 1992/03/31 04:19:47 berliner Exp $
+# $Id: commitinfo,v 1.1.1.2 1995/03/31 07:44:32 nate Exp $
 #
 # The "commitinfo" file is used to control pre-commit checks.
 # The filter on the right is invoked with the repository and a list 
@@ -7,15 +7,21 @@
 # cause the commit to be aborted.
 #
 # The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is the 
-# name of the filter to run.
+# against the directory that the change is being committed to, relative
+# to the $CVSROOT.  For the first match that is found, then the remainder
+# of the line is the name of the filter to run.
 #
 # If the repository name does not match any of the regular expressions in this
 # file, the "DEFAULT" line is used, if it is specified.
 #
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".
 #
-^cvs			checkforcvsid
-DEFAULT			checkforid
+# NOTE:  contrib/commit_prep usage:
+# -r	- record directories affected by commit for use with contrib/log_accum
+# -c	- check for things like "$Id" near head of file, no "$Log", etc.
+#
+^apc			$CVSROOT/CVSROOT/commit_prep -r -c
+^misc			$CVSROOT/CVSROOT/commit_prep -r
+CVSROOT			$CVSROOT/CVSROOT/commit_prep -r -c
+DEFAULT			$CVSROOT/CVSROOT/commit_prep
diff --git a/gnu/usr.bin/cvs/examples/editinfo b/gnu/usr.bin/cvs/examples/editinfo
index fb3f4e74fdf0..09b9f160a821 100644
--- a/gnu/usr.bin/cvs/examples/editinfo
+++ b/gnu/usr.bin/cvs/examples/editinfo
@@ -1,5 +1,5 @@
 #
-# $Id: editinfo,v 1.1 1992/03/21 06:49:39 berliner Exp $
+# $Id: editinfo,v 1.1.1.2 1995/03/31 07:44:37 nate Exp $
 #
 # The "editinfo" file is used to allow verification of logging
 # information.  It works best when a template (as specified in the
@@ -27,4 +27,6 @@
 # supported. There can be only one entry that matches a given
 # repository.
 #
+# Note there is no "edit" example script currently available....
+#
 DEFAULT			$CVSROOT/CVSROOT/edit "%s"
diff --git a/gnu/usr.bin/cvs/examples/loginfo b/gnu/usr.bin/cvs/examples/loginfo
index d9f82da82807..e9c25e064612 100644
--- a/gnu/usr.bin/cvs/examples/loginfo
+++ b/gnu/usr.bin/cvs/examples/loginfo
@@ -4,17 +4,36 @@
 # The "loginfo" file is used to control where "cvs commit" log information
 # is sent.  The first entry on a line is a regular expression which is tested
 # against the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
+# $CVSROOT.  For the first match that is found, then the remainder of the
+# line is a filter program that should expect log information on its standard
+# input.
 #
-# The filter program may use one and only one % modifier (ala printf).  If
-# %s is specified in the filter program, a brief title is included (enclosed
-# in single quotes) showing the modified file names.
+# If the repository name does not match any of the regular expressions in the
+# first field of this file, the "DEFAULT" line is used, if it is specified.
 #
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".
 #
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
+# The filter program may use one and only one "%s" modifier (ala printf).  If
+# such a "%s" is specified in the filter program, a brief title is included
+# (as one argument, enclosed in single quotes) showing the relative directory
+# name and listing the modified file names.
 #
-DEFAULT			$CVSROOT/CVSROOT/log.pl %s $CVSROOT/CVSROOT/commitlog
+# NOTE: contrib/log usage:  (currently requires perl)
+#	-d		- turn debugging on....
+#	-m mailto	- send mail to "mailto" (multiple -m's permitted)
+#	-f logfile	- required arg:  save messages to logfile
+#	%s		- may follow other options at the end of the line
+#
+# NOTE: contrib/log_accum usage:  (currently requires perl)
+# (must have 'commit_prep -r' in commitinfo)
+#	-d		- turn debugging on....
+#	-M modulename	- use this as the module name (necessary for sub-dirs)
+#	-m mailto	- send mail to "mailto" (multiple -m's permitted) [optional]
+#	-f logfile	- save messages to logfile [optional]
+#	%s		- must follow other options at the end of the line
+#
+# without perl you could do this:
+#DEFAULT		(echo ""; who am i; date; cat) >> $CVSROOT/CVSROOT/commitlog
+#
+DEFAULT			$CVSROOT/CVSROOT/log -f $CVSROOT/CVSROOT/commitlog  %s
diff --git a/gnu/usr.bin/cvs/examples/modules b/gnu/usr.bin/cvs/examples/modules
index 891ae3dfee5f..254add1e3674 100644
--- a/gnu/usr.bin/cvs/examples/modules
+++ b/gnu/usr.bin/cvs/examples/modules
@@ -1,6 +1,7 @@
 #
-# CVS Modules file for Prisma sources
-# $CVSid: @(#)modules 1.5 92/03/31 $
+# The CVS Modules File
+#
+#ident	"@(#)cvs/examples:$Name:  $:$Id: modules,v 1.2 1995/12/10 23:08:01 peter Exp $"
 #
 # Three different line formats are valid:
 #	key	-a    aliases...
@@ -10,6 +11,7 @@
 # Where "options" are composed of:
 #	-i prog		Run "prog" on "cvs commit" from top-level of module.
 #	-o prog		Run "prog" on "cvs checkout" of module.
+#	-e prog		Run "prog" on "cvs export" of module.
 #	-t prog		Run "prog" on "cvs rtag" of module.
 #	-u prog		Run "prog" on "cvs update" of module.
 #	-d dir		Place module in directory "dir" instead of module name.
@@ -28,14 +30,27 @@
 
 # Convenient aliases
 world		-a .
-kernel		-a sys lang/adb sparcsim
 
 # CVSROOT support
 CVSROOT		-i /usr/local/bin/mkmodules CVSROOT
+commitinfo	-i /usr/local/bin/mkmodules CVSROOT commitinfo
+cvswrappers	-i /usr/local/bin/mkmodules CVSROOT cvswrappers
+editinfo	-i /usr/local/bin/mkmodules CVSROOT editinfo
 modules		-i /usr/local/bin/mkmodules CVSROOT modules
 loginfo		-i /usr/local/bin/mkmodules CVSROOT loginfo
-commitinfo	-i /usr/local/bin/mkmodules CVSROOT commitinfo
 rcsinfo		-i /usr/local/bin/mkmodules CVSROOT rcsinfo
+rcstemplate	-i /usr/local/bin/mkmodules CVSROOT rcstemplate
+taginfo		-i /usr/local/bin/mkmodules CVSROOT taginfo
+
+# Add more modules here 
+#
+# END_REQUIRED_CONTENT (this comment for cvsinit)
+#
+# The remainder was for the Prisma OS sources
+#
+
+# another convenient alias
+kernel		-a sys lang/adb sparcsim
 
 # The "sys" entry exists only to make symbolic links after checkout
 sys		-o sys/tools/make_links sys
diff --git a/gnu/usr.bin/cvs/examples/rcsinfo b/gnu/usr.bin/cvs/examples/rcsinfo
index 21a7b471ff62..b7e9cc09298d 100644
--- a/gnu/usr.bin/cvs/examples/rcsinfo
+++ b/gnu/usr.bin/cvs/examples/rcsinfo
@@ -1,18 +1,18 @@
 #
-# $Id: rcsinfo,v 1.3 1992/04/10 18:59:14 berliner Exp $
+#ident	"@(#)cvs/examples:$Name:  $:$Id: rcsinfo,v 1.2 1995/12/10 23:08:06 peter Exp $"
 #
 # The "rcsinfo" file is used to control templates with which the editor
 # is invoked on commit and import.
 #
 # The first entry on a line is a regular expression which is tested
 # against the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is the 
-# name of the file that contains the template.
+# $CVSROOT.  For the first match that is found, then the remainder of the
+# line is the name of the file that contains the template.
 #
 # If the repository name does not match any of the regular expressions in this
 # file, the "DEFAULT" line is used, if it is specified.
 #
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
+# If the name "ALL" appears as a regular expression it is always used
+# in addition to the first matching regex or "DEFAULT".
 #
-DEFAULT			/src/master/CVSROOT/rcstemplate
+DEFAULT			$CVSROOT/CVSROOT/rcstemplate