diff options
| author | wiz <wiz@pkgsrc.org> | 2014-05-15 23:50:14 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-05-15 23:50:14 +0000 |
| commit | 19e9a89437c338a59ad2c34246c491a9796f92f4 (patch) | |
| tree | 8cb340b023b0f71c90c0babaeb82d93f2975b5c9 /pkgtools/revbump | |
| parent | 492a189ce9b9e513e679a6b836378b512b23b7a9 (diff) | |
| download | pkgsrc-19e9a89437c338a59ad2c34246c491a9796f92f4.tar.gz | |
Do not look for matches in Makefile comments (noted by adam).
Strip trailing slashes on package names.
The reason for this is that the package's own buildlink3.mk file usually
matches category/package, but not category/package/ (because the only
match is "BUILDLINK_PKGSRCDIR.foo").
Bump version.
Diffstat (limited to 'pkgtools/revbump')
| -rw-r--r-- | pkgtools/revbump/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/revbump/files/finddepends | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile index 541372e4b35..0b84865522e 100644 --- a/pkgtools/revbump/Makefile +++ b/pkgtools/revbump/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2014/05/06 12:41:46 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2014/05/15 23:50:14 wiz Exp $ -PKGNAME= revbump-2.6 +PKGNAME= revbump-2.7 CATEGORIES= pkgtools MAINTAINER= wiz@NetBSD.org diff --git a/pkgtools/revbump/files/finddepends b/pkgtools/revbump/files/finddepends index 2604a728a80..ab6513185ef 100644 --- a/pkgtools/revbump/files/finddepends +++ b/pkgtools/revbump/files/finddepends @@ -1,7 +1,7 @@ #!@PERL@ -w # -*- perl -*- # -# $NetBSD: finddepends,v 1.9 2014/05/06 12:41:46 wiz Exp $ +# $NetBSD: finddepends,v 1.10 2014/05/15 23:50:14 wiz Exp $ # # Copyright (c) 2006, 2014 The NetBSD Foundation, Inc. # @@ -61,6 +61,7 @@ if ($opt{p}) { usage if (1 ne @ARGV); $arg = shift; +$arg =~ s,/$,,g; @searchlist = (); push @searchlist, $arg; @@ -77,7 +78,8 @@ foreach $bl3 (@bl3files) { $content = ""; while (<OUT>) { chomp($_); - $content .= $_ unless $_ =~ m"^#"; + next if m/^\s*#/; + $content .= $_; } close OUT; $bl3content{$bl3} = $content; @@ -123,6 +125,7 @@ for $makefile (@makefiles) { $content = ""; while (<OUT>) { chomp($_); + next if m/^\s*#/; $content .= $_; } close OUT; |