 @@ -1,14 +1,14 @@
-.\"	$NetBSD: blbump.1,v 1.5 2008/10/17 14:23:58 he Exp $
+.\"	$NetBSD: blbump.1,v 1.6 2015/02/09 00:58:44 snj Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2005 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
 @@ -21,27 +21,27 @@
 .\" 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 March 7, 2006
+.Dd February 9, 2015
 .Dt BLBUMP 1
 .Os
 .Sh NAME
 .Nm blbump
 .Nd tool to help bumping dependencies in buildlink3 files automatically
 .Sh SYNOPSIS
 .Nm
 .Op Fl h
 .Op Fl p Ar pkgsrcdir
 .Op cat1/pkg1 ... catN/pkgN
 .Sh DESCRIPTION
 .Nm
 is a perl script for pkgsrc developers that simplifies bumping
 @@ -57,16 +57,21 @@ displays a short usage.
 .Pp
 If
 .Fl p
 is given,
 .Ar pkgsrcdir
 is used instead of the default
 .Pa /usr/pkgsrc .
 .Pp
 .Nm
 prints the package name
 (in
 .Ar category/package
 form) on stdout for each package where it failed.
 .Sh ENVIRONMENT
 .Ev PKGSRCDIR
 pkgsrc root directory.
 Defaults to
 .Pa /usr/pkgsrc .
 .Sh SEE ALSO
 .Xr finddepends 1 ,
 .Xr revbump 1

 @@ -24,32 +24,37 @@ Synopsys:
 Where:
     -h  Show this help
     -p  pkgsrc directory other than /usr/pkgsrc
     -v  verbose (not actually implemented yet)
     cvs-diff-u_output_file:
         The name of input. Usually the file including 'cvs diff -u'
         output (default cvs-diff)
 See Also:
     revbump(1) for how to use it.
 HELP
+}
 sub main() {
-    my ($PKGSRCDIR) =  '/usr/pkgsrc';
+    my ($PKGSRCDIR);
     my ($CVS_DIFF)  = 'cvs-diff';
     my ($file_to_edit);
     my ($stay, $mod) = (0,0);
     my ($Makefile, $buildlink3, $other) = (0, 0, 0);
     $PKGSRCDIR = $ENV{PKGSRCDIR};
     if (! $PKGSRCDIR) {
         $PKGSRCDIR = "/usr/pkgsrc";
+    }
     getopts('hvp:',\%opts);
     if ($ARGV[0])   { $CVS_DIFF = $ARGV[0]}
     if ($opts{'p'}) { $PKGSRCDIR = $opts{'p'}; }
     if ($opts{'h'}) { usage() ; exit ;}
    # for using rename, unlink
     chdir $PKGSRCDIR;
     open(CVS_DIFF, $CVS_DIFF) || die "Problem opening file $CVS_DIFF: $!\n";
     while(<CVS_DIFF>){
 	# Looking for the +++ filename line in cvs diff (supposed to use 'cvs diff -u')
 	$file_to_edit = '';
 	if ( /^\+\+\+ (\S+)/) {

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: check-cvs-diff.1,v 1.2 2014/12/16 11:38:54 wiz Exp $
+.\"	$NetBSD: check-cvs-diff.1,v 1.3 2015/02/09 00:58:44 snj 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,27 +21,27 @@
 .\" 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
+.Dd February 9, 2015
 .Dt CHECK-CVS-DIFF 1
 .Os
 .Sh NAME
 .Nm check-cvs-diff
 .Nd clean up unintended revbump(1) replacements
 .Sh SYNOPSIS
 .Nm
 .Op Fl hv
 .Op Fl p Ar pkgsrcdir
 .Ar cvs-diff-u_output-file
 .Sh DESCRIPTION
 .Nm
 is a perl script for pkgsrc developers that simplifies checking and replacing fixed
 @@ -63,17 +63,22 @@ is used instead of the default
 .Pa /usr/pkgsrc .
 .Pp
 If
 .Fl v
 is given,
 .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 ENVIRONMENT
 .Ev PKGSRCDIR
 pkgsrc root directory.
 Defaults to
 .Pa /usr/pkgsrc .
 .Sh SEE ALSO
 .Xr finddepends 1 ,
 .Xr replace-commonbump 1 ,
 .Xr revbump 1

 @@ -4,27 +4,27 @@
 # (1)
 # Travers all the files (with some filtering) over /usr/pkgsrc
 # pick up referenced -> referer relation and store them to %HASH
 #  (multiple files are concatinated by ';' )
 # (2)
 # read input (usually named 'commonbump'), and expand one line into
 # replacement referer lines, which are referenced  -> referer relation.
 use strict;
 use Getopt::Std;
 use File::Find;
 my(%HASH);	  		# referenced -> referer relation hash, referer is delimitted by ;
-my($PKGSRCDIR) = '/usr/pkgsrc';	# /usr/pkgsrc path, usually /usr/pkgsrc
+my($PKGSRCDIR);			# /usr/pkgsrc path, usually /usr/pkgsrc
 my($TABLE) = 'commonbump';	# name of file, list-of-files to process
 my(@TABLE);			# contents of file above
 my($debug) = 0;
 my($prefix) ;			# A part of path, top to pkgsrc, typically /usr/pkgsrc
 my($common_bump) = 0;		# count, not used for now (yet)
 my(%opts);
 our(@ARGV);
 my ($FILE)	= __FILE__;
     $FILE	=~ s,.*/([^/]+),$1,;	# pick leafname from __FILE__
 @@ -201,26 +201,32 @@ sub CheckAll() {
 	close(REFERENCED);
 	my $number = 0;
 	foreach my $referer (@referer) {
 	    $number += grep $referer, $HASH{$i};
+	}
 	$#referer++; 	# conpensate -1 -> 0, 0 -> 1 etc
     	if ($#referer <  $number) { print $#referer . ' ? ' . $number .' .. ', $i,' <- ', $HASH{$i}, ' ... <', "\n";}
     	if ($#referer >  $number) { print $#referer . ' ? ' . $number .' .. ', $i,' <- ', $HASH{$i}, ' ... >', "\n";}
+    }
+}
 sub main() {
     my($check_all) = 0;
     my($prefix);
     $PKGSRCDIR = $ENV{PKGSRCDIR};
     if (! $PKGSRCDIR) {
         $PKGSRCDIR = "/usr/pkgsrc";
+    }
     getopts('ahp:T:', \%opts);
     if ($opts{'a'}) { $check_all = 1;  }
     if ($opts{'h'}) { usage(); exit 0;}
     if ($opts{'p'}) { $PKGSRCDIR = $opts{'p'};}
     if ($opts{'T'}) { $TABLE = $opts{'T'};}
     $prefix = $PKGSRCDIR;
     $prefix =~ s|.*/pkgsrc/(.*)|$1|;
     CheckPkgsrcTree($PKGSRCDIR);
     GenerateHash($PKGSRCDIR, $prefix);
     ReadTable($TABLE);
     if ($check_all) { CheckAll(); }

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: replace-commonbump.1,v 1.2 2014/12/16 11:38:54 wiz Exp $
+.\"	$NetBSD: replace-commonbump.1,v 1.3 2015/02/09 00:58:44 snj 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
 @@ -21,27 +21,27 @@
 .\" 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
+.Dd February 9, 2015
 .Dt REPLACE-COMMONBUMP 1
 .Os
 .Sh NAME
 .Nm replace-commonbump
 .Nd tool to help expanding (replacing) commonbump file to the real list of Makefiles
 .Sh SYNOPSIS
 .Nm
 .Op Fl ah
 .Op Fl p Ar pkgsrcdir
 .Op Fl T Ar list_file
 .Sh DESCRIPTION
 .Nm
 is a perl script for pkgsrc developers.
 @@ -110,18 +110,23 @@ which usually lists
 or
 .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 ENVIRONMENT
 .Ev PKGSRCDIR
 pkgsrc root directory.
 Defaults to
 .Pa /usr/pkgsrc .
 .Sh SEE ALSO
 .Xr blbump 1 ,
 .Xr check-cvs-diff 1 ,
 .Xr finddepends 1 ,
 .Xr revbump 1

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: revbump.1,v 1.23 2014/12/16 11:38:54 wiz Exp $
+.\"	$NetBSD: revbump.1,v 1.24 2015/02/09 00:58:44 snj 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
 @@ -21,27 +21,27 @@
 .\" 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 August 22, 2014
+.Dd February 9, 2015
 .Dt REVBUMP 1
 .Os
 .Sh NAME
 .Nm revbump
 .Nd tool to help bump PKGREVISIONs automatically
 .Sh SYNOPSIS
 .Nm
 .Op Fl h
 .Op Fl p Ar pkgsrcdir
 .Op cat1/pkg1 ... catN/pkgN
 .Sh DESCRIPTION
 .Nm
 is a perl script for pkgsrc developers that simplifies bumping
 @@ -90,18 +90,23 @@ grep buildlink3.mk allbump | sed 's/.bui
 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 ENVIRONMENT
 .Ev PKGSRCDIR
 pkgsrc root directory.
 Defaults to
 .Pa /usr/pkgsrc .
 .Sh SEE ALSO
 .Xr blbump 1 ,
 .Xr check-cvs-diff 1 ,
 .Xr finddepends 1 ,
 .Xr replace-commonbump 1

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.32 2014/12/15 23:25:54 mef Exp $
+# $NetBSD: Makefile,v 1.33 2015/02/09 00:58:44 snj Exp $
-PKGNAME=		revbump-2.10
+PKGNAME=		revbump-2.11
 CATEGORIES=		pkgtools
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Tools for bumping PKGREVISIONs (for pkgsrc developers)
 LICENSE=		modified-bsd
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 USE_TOOLS+=	perl:run
 USE_LANGUAGES=	# empty
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1