diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2022-11-18 04:18:22 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2022-11-18 04:18:22 +0000 |
| commit | 663333d8ca09fbe35e09431b4a949ad1355bf9c3 (patch) | |
| tree | 70b8257b817b935e26a97e50367cf3c9f521ffd8 | |
| parent | f29869ae996324973fd3412835f84e88d2318f85 (diff) | |
| download | pkgsrc-663333d8ca09fbe35e09431b4a949ad1355bf9c3.tar.gz | |
revbump: fix support for Python >= 3.10 in check-cvs-diff
One regex was missing the final potential digit to strip off.
| -rw-r--r-- | pkgtools/revbump/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/revbump/files/check-cvs-diff | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile index 998e0a155e9..2efe46e3ab2 100644 --- a/pkgtools/revbump/Makefile +++ b/pkgtools/revbump/Makefile @@ -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 diff --git a/pkgtools/revbump/files/check-cvs-diff b/pkgtools/revbump/files/check-cvs-diff index 4202b9ac70f..0fc0e242775 100644 --- a/pkgtools/revbump/files/check-cvs-diff +++ b/pkgtools/revbump/files/check-cvs-diff @@ -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 $_; |