diff options
| author | wiz <wiz@pkgsrc.org> | 2020-03-08 17:06:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-03-08 17:06:16 +0000 |
| commit | 7a97253a4f3b695538ff670d0b852b4ef02f0619 (patch) | |
| tree | 83b38895dddea6e5ed86c0873efa040830b6f4c8 /pkgtools/revbump | |
| parent | 894e22c1060820f3e713d9ffea90eb53e98076f1 (diff) | |
| download | pkgsrc-7a97253a4f3b695538ff670d0b852b4ef02f0619.tar.gz | |
revbump: 2.15: update check-cvs-diff for current ruby and python versions.
Diffstat (limited to 'pkgtools/revbump')
| -rw-r--r-- | pkgtools/revbump/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/revbump/files/check-cvs-diff | 22 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile index 859103baa60..f3c0072254c 100644 --- a/pkgtools/revbump/Makefile +++ b/pkgtools/revbump/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2020/01/26 17:32:00 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2020/03/08 17:06:16 wiz Exp $ -PKGNAME= revbump-2.14 -PKGREVISION= 2 +PKGNAME= revbump-2.15 CATEGORIES= pkgtools MAINTAINER= wiz@NetBSD.org diff --git a/pkgtools/revbump/files/check-cvs-diff b/pkgtools/revbump/files/check-cvs-diff index 46365c44c47..8049e411a1e 100644 --- a/pkgtools/revbump/files/check-cvs-diff +++ b/pkgtools/revbump/files/check-cvs-diff @@ -2,7 +2,7 @@ # -*- perl -*- # # read output of (cd /usr/pkgsrc; cvs diff -u ) and check if -# py{27,34} and ruby200 string are left in buildlink3.mk. +# py* and ruby* strings are left in buildlink3.mk. # They are then modified to Variable representation. #" use strict; @@ -15,7 +15,7 @@ $my_name =~ s#(.*)/##; sub usage(){ print <<HELP; -$my_name: +$my_name: Read cvs diff -u output (of named file) and substitute if the string py27, py34 or ruby200 is found in the corresponding changes in diff. @@ -26,12 +26,12 @@ Where: -p pkgsrc directory other than /usr/pkgsrc -v verbose (not actually implemented yet) cvs-diff-u_output_file: - The name of input. Usually the file including 'cvs diff -u' - output (default cvs-diff) + The name of input. Usually the file including 'cvs diff -u' + output (default cvs-diff) See Also: revbump(1) for how to use it. HELP -} +} sub main() { my ($PKGSRCDIR); @@ -50,9 +50,9 @@ sub main() { if ($opts{'p'}) { $PKGSRCDIR = $opts{'p'}; } if ($opts{'h'}) { usage() ; exit ;} - # for using rename, unlink + # for using rename, unlink chdir $PKGSRCDIR; - + open(CVS_DIFF, $CVS_DIFF) || die "Problem opening file $CVS_DIFF: $!\n"; while(<CVS_DIFF>){ # Looking for the +++ filename line in cvs diff (supposed to use 'cvs diff -u') @@ -69,15 +69,15 @@ 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.*py34/ ) { $_=~ s/py34/\${PYPKGPREFIX}/ ; - print STDERR " py34 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.*ruby200/ ) { $_=~ s/ruby200/\${RUBY_PKGPREFIX}/ ; $edit++;} + if ( /^BUILDLINK.*ruby[0-9][0-9]*/ ) { $_=~ s/ruby[0-9][0-9]*/\${RUBY_PKGPREFIX}/ ; $edit++;} print NEW $_; } close(EDIT); close(NEW); - if ($edit) { unlink $file_to_edit; + if ($edit) { unlink $file_to_edit; rename $new_file, $file_to_edit; $mod++;} else { |