CVS commit: pkgsrc/pkgtools/revbump

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 14 05:12:15 UTC 2023

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

Log Message:
revbump: update to 3.5.

Add -x option to non-recursively bump just one package.
Useful if you want to create your revbump list manually.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/pkgtools/revbump/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/revbump/files/revbump.py
cvs rdiff -u -r1.3 -r1.4 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.

Modified files:

Index: pkgsrc/pkgtools/revbump/Makefile
diff -u pkgsrc/pkgtools/revbump/Makefile:1.56 pkgsrc/pkgtools/revbump/Makefile:1.57
--- pkgsrc/pkgtools/revbump/Makefile:1.56       Sun Jul 16 10:12:22 2023
+++ pkgsrc/pkgtools/revbump/Makefile    Mon Aug 14 05:12:15 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2023/07/16 10:12:22 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2023/08/14 05:12:15 wiz Exp $
 
-PKGNAME=               revbump-3.4
+PKGNAME=               revbump-3.5
 CATEGORIES=            pkgtools
 
 MAINTAINER=            wiz%NetBSD.org@localhost

Index: pkgsrc/pkgtools/revbump/files/revbump.py
diff -u pkgsrc/pkgtools/revbump/files/revbump.py:1.4 pkgsrc/pkgtools/revbump/files/revbump.py:1.5
--- pkgsrc/pkgtools/revbump/files/revbump.py:1.4        Sun Jul 16 10:12:22 2023
+++ pkgsrc/pkgtools/revbump/files/revbump.py    Mon Aug 14 05:12:15 2023
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# $NetBSD: revbump.py,v 1.4 2023/07/16 10:12:22 wiz Exp $
+# $NetBSD: revbump.py,v 1.5 2023/08/14 05:12:15 wiz Exp $
 #
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -185,6 +185,8 @@ parser.add_argument('-p', dest='pkgsrcdi
                     help='path to the pkgsrc root directory', action='store')
 parser.add_argument('-w', dest='wip', default=False,
                     help='include wip in search', action='store_true')
+parser.add_argument('-x', dest='recursive', default=True,
+                    help='do not recurse packages to bump', action='store_false')
 args = parser.parse_args()
 
 if not pathlib.Path(args.pkgsrcdir).exists() or \
@@ -193,6 +195,13 @@ if not pathlib.Path(args.pkgsrcdir).exis
     print(f'invalid pkgsrc directory "{args.pkgsrcdir}"')
     sys.exit(1)
 
+if not args.recursive:
+    revbump(args.package)
+    if pathlib.Path(args.pkgsrcdir + '/' +
+                    args.package + '/buildlink3.mk').exists():
+        bl3bump(args.package)
+    sys.exit(0)
+
 if args.package == 'lang/go':
     searchlist = ['lang/go/version.mk']
 else:

Index: pkgsrc/pkgtools/revbump/files/revbump.py.1
diff -u pkgsrc/pkgtools/revbump/files/revbump.py.1:1.3 pkgsrc/pkgtools/revbump/files/revbump.py.1:1.4
--- pkgsrc/pkgtools/revbump/files/revbump.py.1:1.3      Sun Jul 16 10:12:22 2023
+++ pkgsrc/pkgtools/revbump/files/revbump.py.1  Mon Aug 14 05:12:15 2023
@@ -1,4 +1,4 @@
-.\"    $NetBSD: revbump.py.1,v 1.3 2023/07/16 10:12:22 wiz Exp $
+.\"    $NetBSD: revbump.py.1,v 1.4 2023/08/14 05:12:15 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 July 16, 2023
+.Dd August 14, 2023
 .Dt REVBUMP.PY 1
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nd tool to bump PKGREVISIONs automatically
 .Sh SYNOPSIS
 .Nm
-.Op Fl hnw
+.Op Fl hnwx
 .Op Fl o Ar output
 .Op Fl p Ar pkgsrcdir
 .Ar category/package
@@ -84,6 +84,10 @@ Defaults to
 Also bump packages in the
 .Pa wip/
 subtree.
+.It Fl x
+Only bump the package given on the command line (do not recurse, do
+not write a commitlist).
+Use this if you generated your list of packages to bump manually.
 .El
 .Pp
 For bumping all go packages, use