Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_168950234219230"
MIME-Version: 1.0
Date: Sun, 16 Jul 2023 10:12:22 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/pkgtools/revbump
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: wiz@netbsd.org
Message-Id: <20230716101222.B0243FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_168950234219230
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Jul 16 10:12:22 UTC 2023

Modified Files:
	pkgsrc/pkgtools/revbump: Makefile
	pkgsrc/pkgtools/revbump/files: revbump.py revbump.py.1

Log Message:
revbump: update to 3.4

Do not bump go-bin and go1[0-9]* for lang/go, requested by bsiegert@.
Add -n to just print list of packages that would be bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/pkgtools/revbump/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/revbump/files/revbump.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/pkgtools/revbump/files/revbump.py.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_168950234219230
Content-Disposition: inline
Content-Length: 3925
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/pkgtools/revbump/Makefile
diff -u pkgsrc/pkgtools/revbump/Makefile:1.55 pkgsrc/pkgtools/revbump/Makefile:1.56
--- pkgsrc/pkgtools/revbump/Makefile:1.55	Sat Jul  1 09:13:24 2023
+++ pkgsrc/pkgtools/revbump/Makefile	Sun Jul 16 10:12:22 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2023/07/01 09:13:24 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2023/07/16 10:12:22 wiz Exp $
 
-PKGNAME=		revbump-3.3
+PKGNAME=		revbump-3.4
 CATEGORIES=		pkgtools
 
 MAINTAINER=		wiz@NetBSD.org

Index: pkgsrc/pkgtools/revbump/files/revbump.py
diff -u pkgsrc/pkgtools/revbump/files/revbump.py:1.3 pkgsrc/pkgtools/revbump/files/revbump.py:1.4
--- pkgsrc/pkgtools/revbump/files/revbump.py:1.3	Sat Jun 10 14:35:29 2023
+++ pkgsrc/pkgtools/revbump/files/revbump.py	Sun Jul 16 10:12:22 2023
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# $NetBSD: revbump.py,v 1.3 2023/06/10 14:35:29 wiz Exp $
+# $NetBSD: revbump.py,v 1.4 2023/07/16 10:12:22 wiz Exp $
 #
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -175,6 +175,9 @@ parser = argparse.ArgumentParser(descrip
                                  ' link against a given package')
 parser.add_argument('package', help='package for which we want to find' +
                     ' its dependencies')
+parser.add_argument('-n', dest='test', default=False,
+                    help='print list of packages that would be bumped, but' +
+                    ' do not actually bump', action='store_true')
 parser.add_argument('-o', dest='output', default='commitlist',
                     help='output file containing the directories with changes',
                     action='store')
@@ -274,10 +277,18 @@ if args.package == 'lang/perl5':
 
 directories = [path[:path.rfind('/')] for path in makefile_result + bl3result]
 directories = filter(lambda name: name != args.package, directories)
-with open(args.output, 'w', encoding='utf-8') as f:
-    f.write(args.package + '\n')
+if args.package == 'lang/go':
+    directories = filter(lambda name: name != 'lang/go-bin'
+                         and not re.match('lang/go1[0-9]*', name), directories)
+if args.test:
+    print(args.package)
     for directory in sorted(set(directories)):
-        revbump(directory)
-        f.write(directory + '\n')
-for bl3file in sorted(set(bl3result)):
-    bl3bump(bl3file[:-len('/buildlink3.mk')])
+        print(directory)
+else:
+    with open(args.output, 'w', encoding='utf-8') as f:
+        f.write(args.package + '\n')
+        for directory in sorted(set(directories)):
+            revbump(directory)
+            f.write(directory + '\n')
+        for bl3file in sorted(set(bl3result)):
+            bl3bump(bl3file[:-len('/buildlink3.mk')])

Index: pkgsrc/pkgtools/revbump/files/revbump.py.1
diff -u pkgsrc/pkgtools/revbump/files/revbump.py.1:1.2 pkgsrc/pkgtools/revbump/files/revbump.py.1:1.3
--- pkgsrc/pkgtools/revbump/files/revbump.py.1:1.2	Sat Jun 10 14:35:29 2023
+++ pkgsrc/pkgtools/revbump/files/revbump.py.1	Sun Jul 16 10:12:22 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: revbump.py.1,v 1.2 2023/06/10 14:35:29 wiz Exp $
+.\"	$NetBSD: revbump.py.1,v 1.3 2023/07/16 10:12:22 wiz Exp $
 .\"
 .\" Copyright (c) 2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 10, 2023
+.Dd July 16, 2023
 .Dt REVBUMP.PY 1
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nd tool to bump PKGREVISIONs automatically
 .Sh SYNOPSIS
 .Nm
-.Op Fl hw
+.Op Fl hnw
 .Op Fl o Ar output
 .Op Fl p Ar pkgsrcdir
 .Ar category/package
@@ -64,6 +64,9 @@ supports the following options:
 .Bl -tag -width 12n -offset indent
 .It Fl h
 Show the usage.
+.It Fl n
+Print the list of packages that would be bumped, but do not actually
+bump them.
 .It Fl o Ar output
 Write the list of changed package directories (relative to the
 .Pa pkgsrc


--_----------=_168950234219230--