 @@ -1,14 +1,14 @@
-.\"	$NetBSD: check-cvs-diff.1,v 1.1 2014/12/15 23:25:54 mef Exp $
+.\"	$NetBSD: check-cvs-diff.1,v 1.2 2014/12/16 11:38:54 wiz Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2005 The NetBSD Foundation, Inc.
 .\"
 .\" This code was originally contributed to the NetBSD Foundation, Inc.
 .\" by Makoto Fujiwara <mef@NetBSD.org>.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
 @@ -21,57 +21,59 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
 .\" CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 .\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
 .\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 .\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd December 14, 2014
 .Dt CHECK-CVS-DIFF 1
 .Os
 .Sh NAME
 .Nm check-cvs-diff
-.Nd tool to check if revbump process described in revbump(1) results including py27, py34 or ruby200
+.Nd clean up unintended revbump(1) replacements
 in the files. And then replaces the strings by the variable notation.
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl hv
 .Op Fl p Ar pkgsrcdir
-.Op Fl v
+.Ar cvs-diff-u_output-file
 cvs-diff-u_output-file
 .Sh DESCRIPTION
 .Nm
 is a perl script for pkgsrc developers that simplifies checking and replacing fixed
-version number in revbump resultant tree, Makefile and buildlink3.mk files.
+version number in
-It reads `cvs diff -u' output written in named file, and if above mentioned strings found in the diff, replaces it in corresponding file by apropriate variable notation.
+.Xr revbump 1
 resultant tree, Makefile and buildlink3.mk files.
 It reads `cvs diff -u' output written in named file, and if above
 mentioned strings are found in the diff, replaces them in corresponding
 file by the appropriate variables.
 .Pp
 .Nm Fl h
 displays a short usage.
 .Pp
 If
 .Fl p
 is given,
 .Ar pkgsrcdir
 is used instead of the default
 .Pa /usr/pkgsrc .
 .Pp
 If
 .Fl v
 is given,
-it outputs some verbose information.
+.Nm
 outputs more verbose information.
 .Pp
 .Nm
 prints the package name
 (in
 .Ar category/package
 form) on stdout for each package where it failed, but usually none.
 .Sh SEE ALSO
 .Xr revbump 1 ,
 .Xr finddepends 1 ,
-.Xr replace-commonbump 1
+.Xr replace-commonbump 1 ,
 .Xr revbump 1

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: replace-commonbump.1,v 1.1 2014/12/15 23:25:54 mef Exp $
+.\"	$NetBSD: replace-commonbump.1,v 1.2 2014/12/16 11:38:54 wiz Exp $
 .\"
 .\" Copyright (c) 2014 The NetBSD Foundation, Inc.
 .\"
 .\" This code was originally contributed to the NetBSD Foundation, Inc.
 .\" by Makoto Fujiwara <mef@NetBSD.org>.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
 @@ -26,81 +26,102 @@
 .\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 .\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd December 14, 2014
 .Dt REPLACE-COMMONBUMP 1
 .Os
 .Sh NAME
 .Nm replace-commonbump
-.Nd tool to help expanding (replacing) commonbump file to the real list of Makefile's.
+.Nd tool to help expanding (replacing) commonbump file to the real list of Makefiles
 .Sh SYNOPSIS
 .Nm
-.Op Fl a
+.Op Fl ah
 .Op Fl h
 .Op Fl p Ar pkgsrcdir
 .Op Fl T Ar list_file
 .Sh DESCRIPTION
 .Nm
-is a perl script for pkgsrc developers. It simplifies the process expanding
+is a perl script for pkgsrc developers.
-`commonbump' file into `commonbump-replace'. Commonbump file is to be created by the first stage of revbump process, as is described in revbump(1).
+It simplifies the process expanding
 .Pa commonbump
 file into
 .Pa commonbump-replace .
 The
 .Pa commonbump
 file is to be created by the first stage of the
 .Dv PKGREVISION
 bump process as described in
 .Xr revbump 1 .
 .Pp
 .Nm Fl h
 displays a short usage.
 .Pp
 If
 .Fl p
 is given,
 .Ar pkgsrcdir
 is used instead of the default
 .Pa /usr/pkgsrc .
 .Pp
 If
 .Fl a
 is given,
-check all pkgsrc tree, disregard neither to
+check the whole pkgsrc tree, disregard both the
 .Fl T
-option nor to the default `commonbump' file.
+option and the default
-It will check if "# used by" is included or not, usually in Makefile.common in the package.
+.Pa commonbump
 file.
 It will check if
 .Dq # used by
 is included or not, usually in Makefile.common in the package.
 .Pp
 If
 .Fl T
 is given,
 .Ar list_file
 is used instead of the default
-.Pa `commonbump' .
+.Pa commonbump .
 .Pp
 .Nm
 prints the package name
 (in
 .Ar category/package
 form) on stdout for each package where it failed, but usually none.
 .Pp
 The internal process is divided into three stages.
 .Bl -enum
-.item
+.It
-(1)
+Read entire pkgsrc tree and check the
 Read entire pkgsrc tree and check a
 .Ar referer -> referenced
 relation,
 then internally keeps (opposite)
 .Ar referenced -> referer
 relation table.
 .It
-.item
+Read a file, named
-(2) Read a file, named `commonbump' or the other name given with -T, which
+.Pa commonbump
-usually lists Makefile.common or *common.mk files to be expanded.
+or the argument given with
 .Fl T ,
-.item
+which usually lists
-(3) Now expands the filename listed in `commonbump' into the list of packagename/Makefile by
+.Pa Makefile.common
-referenced -> referer relation. It then outputs to the file
+or
-`commonbump.replaced' (currently the name is fixed).
+.Pa *common.mk
 files to be expanded.
 .It
 Expand the filenames listed in
 .Pa commonbump
 into the list of packagename/Makefile by the
 referenced -> referer relation.
 .Nm
 then outputs to the file
 .Pa commonbump.replaced
 (currently the name is fixed).
 .El
 .Sh SEE ALSO
 .Xr revbump 1 ,
 .Xr blbump 1 ,
 .Xr check-cvs-diff 1 ,
-.Xr finddepends 1
+.Xr finddepends 1 ,
 .Xr revbump 1

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: revbump.1,v 1.22 2014/12/15 23:25:54 mef Exp $
+.\"	$NetBSD: revbump.1,v 1.23 2014/12/16 11:38:54 wiz Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2005, 2006, 2010, 2012, 2013, 2014 The NetBSD Foundation, Inc.
 .\"
 .\" This code was originally contributed to the NetBSD Foundation, Inc.
 .\" by Julio Merino <jmmv@NetBSD.org> and Thomas Klausner <wiz@NetBSD.org>.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in
 @@ -86,22 +86,22 @@ would be:
 .Bd -literal -offset indent
 cd /usr/pkgsrc ;
 finddepends category/package | sort -u \*[Gt] allbump ;
 grep buildlink3.mk allbump | sed 's/.buildlink3.mk//' \*[Gt] bl3bump ;
 grep -e Makefile.common -e mk$ allbump | grep -v -e buildlink3.mk -e options.mk > commonbump ;
 replace-commonbump ;
 cat allbump commonbump.replaced | sed 's,/[^/]*$,,' | sort -u \*[Gt] makebump ;
 revbump \*[Lt] makebump | tee makebump.manual ;
 # [if a package is listed in makebump.manual, handle the PKGREVISION bump manually]
 blbump \*[Lt] bl3bump | tee bl3bump.manual ;
 # [handle the *ABI_DEPENDS* bumps in bl3bump.manual manually, usually none] ;
 cvs diff -u `cat makebump` > cvs-diff ;
 check-cvs-diff  ;
 cvs diff `cat bl3bump makebump` | less
 cvs commit `cat bl3bump makebump`
 rm allbump bl3bump* makebump* commonbump* cvs-diff
 .Ed
 .Sh SEE ALSO
 .Xr blbump 1 ,
 .Xr check-cvs-diff 1 ,
 .Xr finddepends 1 ,
-.Xr replace-commonbump 1,
+.Xr replace-commonbump 1
 .Xr check-cvs-diff 1