 @@ -1,17 +1,17 @@
 #!@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.
+#
 # This code was originally contributed to the NetBSD Foundation, Inc.
 # by 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
 @@ -98,26 +98,28 @@ while ($pattern = pop @searchlist) {
 #	    print "** Adding $key\n";
 	    print "$key\n";
 	    push @searchlist, $key;
 	    push @bl3result, $key;
+	}
+    }
+}
 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";
     open OUT, $makefile or die "can't open $makefile";
     $content = "";
     while (<OUT>) {
 	chomp($_);
 	$content .= $_;
+    }
     close OUT;
     $found = 0;
     for $pattern (@bl3result) {
 	if ($content =~ m/\Q$pattern/) {

 @@ -1,14 +1,14 @@
-.\"	$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.
 .\"
 .\" 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 May 18, 2013
+.Dd October 21, 2013
 .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
 @@ -77,34 +77,34 @@ x11/glib2
 EOF
 .Ed
 .Pp
 The complete procedure for a recursive dependency bump for
 category/package using
 .Nm
 and
 .Xr blbump 1
 would be:
 .Bd -literal -offset indent
 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
 .Sh SEE ALSO
 .Xr blbump 1 ,
 .Xr finddepends 1

 @@ -1,17 +1,16 @@
-# $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
+DISTNAME=		revbump-2.5
 PKGREVISION=		1
 CATEGORIES=		pkgtools
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Tools for bumping PKGREVISIONs (for pkgsrc developers)
 LICENSE=		modified-bsd
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes