From 1c9f7bc09be264e1982fb069dcd49883b7b320b4 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 13 Apr 2006 18:58:17 +0000 Subject: finddepends: also look in options.mk files. Welcome to 1.6\! --- pkgtools/revbump/Makefile | 4 ++-- pkgtools/revbump/files/finddepends | 6 ++++-- pkgtools/revbump/files/finddepends.1 | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile index 81401a1efa6..c30a1352ec6 100644 --- a/pkgtools/revbump/Makefile +++ b/pkgtools/revbump/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2006/04/06 06:25:46 reed Exp $ +# $NetBSD: Makefile,v 1.9 2006/04/13 18:58:17 wiz Exp $ # -DISTNAME= revbump-1.5 +DISTNAME= revbump-1.6 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/revbump/files/finddepends b/pkgtools/revbump/files/finddepends index fae5eebcd2f..f56c087d8b0 100644 --- a/pkgtools/revbump/files/finddepends +++ b/pkgtools/revbump/files/finddepends @@ -1,7 +1,7 @@ #!@PERL@ -w # -*- perl -*- # -# $NetBSD: finddepends,v 1.3 2006/03/09 17:24:48 wiz Exp $ +# $NetBSD: finddepends,v 1.4 2006/04/13 18:58:17 wiz Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # @@ -40,7 +40,7 @@ use Getopt::Std; my ($PKGSRCDIR, $arg, $bl3, %bl3content, @bl3files, @bl3result, $content, $found, $key, $makefile, @makefiles, %opt, - $pattern, @searchlist); + @optionfiles, $pattern, @searchlist); $PKGSRCDIR = $ENV{PKGSRCDIR}; if (! $PKGSRCDIR) { @@ -106,6 +106,8 @@ while ($pattern = pop @searchlist) { print "\n"; @makefiles = <$PKGSRCDIR/*/*/Makefile*>; +@optionfiles = <$PKGSRCDIR/*/*/options.mk>; +push(@makefiles, @optionfiles); for $makefile (@makefiles) { # print "* reading $makefile\n"; diff --git a/pkgtools/revbump/files/finddepends.1 b/pkgtools/revbump/files/finddepends.1 index 4d43d307b75..9ae5c8710be 100644 --- a/pkgtools/revbump/files/finddepends.1 +++ b/pkgtools/revbump/files/finddepends.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: finddepends.1,v 1.3 2006/03/07 07:27:26 wiz Exp $ +.\" $NetBSD: finddepends.1,v 1.4 2006/04/13 18:58:17 wiz Exp $ .\" .\" Copyright (c) 2006 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 April 13, 2006 .Dt FINDDEPENDS 1 .Os .Sh NAME @@ -74,8 +74,8 @@ Defaults to .Dl finddepends security/libtasn1 .Pp would first output all buildlink3.mk files that include -security/libtasn1, and then all Makefiles that include any of the -found buildlink3.mk files. +security/libtasn1, and then all Makefiles and options.mk files that +include any of the found buildlink3.mk files. .Sh SEE ALSO .Xr blbump 1 , .Xr revbump 1 -- cgit v1.2.3