CVS commit: pkgsrc/pkgtools/revbump

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Nov 18 04:18:22 UTC 2022

Modified Files:
        pkgsrc/pkgtools/revbump: Makefile
        pkgsrc/pkgtools/revbump/files: check-cvs-diff

Log Message:
revbump: fix support for Python >= 3.10 in check-cvs-diff

One regex was missing the final potential digit to strip off.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/pkgtools/revbump/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/revbump/files/check-cvs-diff

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.48 pkgsrc/pkgtools/revbump/Makefile:1.49
--- pkgsrc/pkgtools/revbump/Makefile:1.48       Thu Nov 17 07:25:30 2022
+++ pkgsrc/pkgtools/revbump/Makefile    Fri Nov 18 04:18:22 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2022/11/17 07:25:30 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2022/11/18 04:18:22 gutteridge Exp $
 
-PKGNAME=               revbump-2.16
+PKGNAME=               revbump-2.17
 CATEGORIES=            pkgtools
 
 MAINTAINER=            wiz%NetBSD.org@localhost

Index: pkgsrc/pkgtools/revbump/files/check-cvs-diff
diff -u pkgsrc/pkgtools/revbump/files/check-cvs-diff:1.5 pkgsrc/pkgtools/revbump/files/check-cvs-diff:1.6
--- pkgsrc/pkgtools/revbump/files/check-cvs-diff:1.5    Thu Nov 17 07:25:30 2022
+++ pkgsrc/pkgtools/revbump/files/check-cvs-diff        Fri Nov 18 04:18:22 2022
@@ -1,7 +1,7 @@
 #!@PERL@ -w
 # -*- perl -*-
 #
-# $NetBSD: check-cvs-diff,v 1.5 2022/11/17 07:25:30 wiz Exp $
+# $NetBSD: check-cvs-diff,v 1.6 2022/11/18 04:18:22 gutteridge Exp $
 #
 # read output of (cd /usr/pkgsrc; cvs diff -u ) and check if
 # py* and ruby* strings are left in buildlink3.mk.
@@ -71,8 +71,8 @@ sub main() {
                open(EDIT, $file_to_edit ) || print STDERR "Problem opening file $file_to_edit: $! \n";
                while(<EDIT>) {
                    if ( /^BUILDLINK.*py27/ )    {  $_=~    s/py27/\${PYPKGPREFIX}/   ; $edit++;}
-                   if ( /^BUILDLINK.*py3[0-9]*/ )    {  $_=~    s/py3[0-9]/\${PYPKGPREFIX}/   ;
-                                                   print STDERR "   py3[0-9] found at $file_to_edit\n";
+                   if ( /^BUILDLINK.*py3[0-9]*/ )    {  $_=~    s/py3[0-9]*/\${PYPKGPREFIX}/   ;
+                                                   print STDERR "   py3[0-9]* found at $file_to_edit\n";
                                                    ; $edit++;}
                    if ( /^BUILDLINK.*ruby[0-9][0-9]*/ ) {  $_=~ s/ruby[0-9][0-9]*/\${RUBY_PKGPREFIX}/ ; $edit++;}
                    print NEW $_;