From 6893a29f128def13b6267204fb1d5fd3b26f8556 Mon Sep 17 00:00:00 2001
From: snj <snj>
Date: Mon, 9 Feb 2015 00:58:44 +0000
Subject: These go to eleven.

revbump-2.11:
- Honor PKGSRCDIR in check-cvs-diff and replace-commonbump
- Document PKGSRCDIR all the man pages, not just in finddepends(1)
---
 pkgtools/revbump/Makefile                   | 4 ++--
 pkgtools/revbump/files/blbump.1             | 9 +++++++--
 pkgtools/revbump/files/check-cvs-diff       | 7 ++++++-
 pkgtools/revbump/files/check-cvs-diff.1     | 9 +++++++--
 pkgtools/revbump/files/replace-commonbump   | 8 +++++++-
 pkgtools/revbump/files/replace-commonbump.1 | 9 +++++++--
 pkgtools/revbump/files/revbump.1            | 9 +++++++--
 7 files changed, 43 insertions(+), 12 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile
index 67f7f0a718c..ad1d513bd8c 100644
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,6 +1,6 @@
-# $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
diff --git a/pkgtools/revbump/files/blbump.1 b/pkgtools/revbump/files/blbump.1
index 52db3a84645..f55083698b5 100644
--- a/pkgtools/revbump/files/blbump.1
+++ b/pkgtools/revbump/files/blbump.1
@@ -1,4 +1,4 @@
-.\"	$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.
 .\"
@@ -31,7 +31,7 @@
 .\" 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
@@ -67,6 +67,11 @@ 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
diff --git a/pkgtools/revbump/files/check-cvs-diff b/pkgtools/revbump/files/check-cvs-diff
index 417af7a41ba..46365c44c47 100644
--- a/pkgtools/revbump/files/check-cvs-diff
+++ b/pkgtools/revbump/files/check-cvs-diff
@@ -34,12 +34,17 @@ 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'}; }
diff --git a/pkgtools/revbump/files/check-cvs-diff.1 b/pkgtools/revbump/files/check-cvs-diff.1
index e017da8fecd..080d51bd6c4 100644
--- a/pkgtools/revbump/files/check-cvs-diff.1
+++ b/pkgtools/revbump/files/check-cvs-diff.1
@@ -1,4 +1,4 @@
-.\"	$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.
 .\"
@@ -31,7 +31,7 @@
 .\" 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
@@ -73,6 +73,11 @@ 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 ,
diff --git a/pkgtools/revbump/files/replace-commonbump b/pkgtools/revbump/files/replace-commonbump
index 61dd1f53b9a..46da917ab31 100644
--- a/pkgtools/revbump/files/replace-commonbump
+++ b/pkgtools/revbump/files/replace-commonbump
@@ -14,7 +14,7 @@ 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
@@ -211,6 +211,12 @@ sub CheckAll() {
 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;  }
diff --git a/pkgtools/revbump/files/replace-commonbump.1 b/pkgtools/revbump/files/replace-commonbump.1
index 4772e1996c3..544b4f57093 100644
--- a/pkgtools/revbump/files/replace-commonbump.1
+++ b/pkgtools/revbump/files/replace-commonbump.1
@@ -1,4 +1,4 @@
-.\"	$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.
 .\"
@@ -31,7 +31,7 @@
 .\" 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
@@ -120,6 +120,11 @@ 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 ,
diff --git a/pkgtools/revbump/files/revbump.1 b/pkgtools/revbump/files/revbump.1
index ae3306dd133..648ad50c729 100644
--- a/pkgtools/revbump/files/revbump.1
+++ b/pkgtools/revbump/files/revbump.1
@@ -1,4 +1,4 @@
-.\"	$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.
 .\"
@@ -31,7 +31,7 @@
 .\" 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
@@ -100,6 +100,11 @@ 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 ,
-- 
cgit v1.2.3