diff options
| author | wiz <wiz@pkgsrc.org> | 2013-10-21 10:43:28 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-10-21 10:43:28 +0000 |
| commit | c325b48bf32e96014831159477036053858f2e3e (patch) | |
| tree | 0f24693e09d5a313bbdca8f07a6680b64bfe2591 /pkgtools | |
| parent | 3046a6083560da0394db65cdc1b4e040154478fe (diff) | |
| download | pkgsrc-c325b48bf32e96014831159477036053858f2e3e.tar.gz | |
2.5:
finddepends: Also search in mozilla-common.mk.
Update instructions.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/revbump/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/revbump/files/finddepends | 4 | ||||
| -rw-r--r-- | pkgtools/revbump/files/revbump.1 | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile index 73bf564fd35..78a55a25838 100644 --- a/pkgtools/revbump/Makefile +++ b/pkgtools/revbump/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2013/05/31 12:41:47 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2013/10/21 10:43:28 wiz Exp $ -DISTNAME= revbump-2.4 -PKGREVISION= 1 +DISTNAME= revbump-2.5 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/revbump/files/finddepends b/pkgtools/revbump/files/finddepends index d03132bee7d..00e8a227d78 100644 --- a/pkgtools/revbump/files/finddepends +++ b/pkgtools/revbump/files/finddepends @@ -1,7 +1,7 @@ #!@PERL@ -w # -*- perl -*- # -# $NetBSD: finddepends,v 1.7 2013/03/17 15:27:18 obache Exp $ +# $NetBSD: finddepends,v 1.8 2013/10/21 10:43:28 wiz Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # @@ -108,6 +108,8 @@ print "\n"; @makefiles = <$PKGSRCDIR/*/*/Makefile*>; @optionfiles = <$PKGSRCDIR/*/*/options.mk>; push(@makefiles, @optionfiles); +@optionfiles = <$PKGSRCDIR/*/*/mozilla-common.mk>; +push(@makefiles, @optionfiles); for $makefile (@makefiles) { # print "* reading $makefile\n"; diff --git a/pkgtools/revbump/files/revbump.1 b/pkgtools/revbump/files/revbump.1 index dbb3f5076ce..f59bd4ebe01 100644 --- a/pkgtools/revbump/files/revbump.1 +++ b/pkgtools/revbump/files/revbump.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: revbump.1,v 1.15 2013/05/18 13:22:57 wiz Exp $ +.\" $NetBSD: revbump.1,v 1.16 2013/10/21 10:43:28 wiz Exp $ .\" .\" Copyright (c) 2003, 2004, 2005, 2006, 2010, 2012, 2013 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 May 18, 2013 +.Dd October 21, 2013 .Dt REVBUMP 1 .Os .Sh NAME @@ -87,21 +87,21 @@ would be: cd /usr/pkgsrc finddepends category/package \*[Gt] allbump grep buildlink3.mk allbump | sed 's/.buildlink3.mk//' \*[Gt] bl3bump -grep Makefile.common allbump > commonbump +grep -e Makefile.common -e mozilla-common.mk allbump > commonbump [read commonbump and replace entries with all packages including the - corresponding Makefile.common file] + corresponding Makefile.common or mozilla-common.mk file] cat allbump commonbump | sed 's,/[^/]*$,,' | sort -u \*[Gt] makebump revbump \*[Lt] makebump \*[Gt] makebump.manual [if a package is listed in makebump.manual outside a line "Updated ... from ... to ...", handle the PKGREVISION bump manually] blbump \*[Lt] bl3bump \*[Gt] bl3bump.manual [handle the *ABI_DEPENDS* bumps in bl3bump.manual manually, usually none] -cvs diff `cat makebump` +cvs diff `cat makebump` | less [look for PYPKGPREFIX -\*[Gt] py27 and RUBY_PKGPREFIX -\*[Gt] ruby19 expansions in buildlink files and any unrelated diffs you have in your local tree, and fix them] -cvs diff `cat bl3bump makebump` +cvs diff `cat bl3bump makebump` | less cvs commit `cat bl3bump makebump` rm allbump bl3bump* makebump* commonbump .Ed |