pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/revbump revbump: fix support for Python >= 3....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7506c17b8308
branches:  trunk
changeset: 388375:7506c17b8308
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Fri Nov 18 04:18:22 2022 +0000

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

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

diffstat:

 pkgtools/revbump/Makefile             |  4 ++--
 pkgtools/revbump/files/check-cvs-diff |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 132e06dd15f3 -r 7506c17b8308 pkgtools/revbump/Makefile
--- a/pkgtools/revbump/Makefile Thu Nov 17 23:51:43 2022 +0000
+++ b/pkgtools/revbump/Makefile Fri Nov 18 04:18:22 2022 +0000
@@ -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
diff -r 132e06dd15f3 -r 7506c17b8308 pkgtools/revbump/files/check-cvs-diff
--- a/pkgtools/revbump/files/check-cvs-diff     Thu Nov 17 23:51:43 2022 +0000
+++ b/pkgtools/revbump/files/check-cvs-diff     Fri Nov 18 04:18:22 2022 +0000
@@ -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 @@
                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 $_;



Home | Main Index | Thread Index | Old Index