summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2016-06-08 18:02:43 +0000
committerwiz <wiz>2016-06-08 18:02:43 +0000
commit9f40a51bbf2457383deb27d291166fe95e95fcd2 (patch)
treea82c81132bf09652c19e1dbc68a56d121dad67f3
parent67ae168840889ff4fd612ea2d02adfdd069fd744 (diff)
downloadpkgsrc-9f40a51bbf2457383deb27d291166fe95e95fcd2.tar.gz
Escape some { for perl-5.22. Bump version.
-rw-r--r--pkgtools/revbump/Makefile5
-rw-r--r--pkgtools/revbump/files/replace-commonbump6
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile
index ded5bbd9e8c..104dd6fec4c 100644
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2015/06/12 10:50:56 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/06/08 18:02:43 wiz Exp $
-PKGNAME= revbump-2.11
-PKGREVISION= 1
+PKGNAME= revbump-2.12
CATEGORIES= pkgtools
MAINTAINER= wiz@NetBSD.org
diff --git a/pkgtools/revbump/files/replace-commonbump b/pkgtools/revbump/files/replace-commonbump
index c1f46485933..ef58ba207ff 100644
--- a/pkgtools/revbump/files/replace-commonbump
+++ b/pkgtools/revbump/files/replace-commonbump
@@ -121,11 +121,11 @@ sub GenerateHash ($$) {
if ( $included =~ m|options.mk| ) { next;}
if ( $included =~ m|enigmail.mk| ) { next;}
- $included =~ s,\${.CURDIR},$shortname,;
- if ($included =~ /\${([^}]+)}/ ) {
+ $included =~ s,\$\{.CURDIR},$shortname,;
+ if ($included =~ /\$\{([^}]+)}/ ) {
my($varname) = $1;
my($value) = show_var($varname, $shortdir);
- $included =~ s/\${[^}]+}/$value/;
+ $included =~ s/\$\{[^}]+}/$value/;
if ($value eq '') {
print STDERR
$FILE, ': ', __LINE__, ' Value ${', $varname, '} is empty at ', $shortdir, "\n";