svn commit: r429368 - in head/sysutils/backuppc-devel: . files
Matthew Seaman
matthew at FreeBSD.org
Sat Dec 24 15:56:57 UTC 2016
Author: matthew
Date: Sat Dec 24 15:56:56 2016
New Revision: 429368
URL: https://svnweb.freebsd.org/changeset/ports/429368
Log:
- add www/p5-CGI dependency (CGI was removed in Perl 5.22)
- escape "{" literal in regexps (was deprecated in Perl 5.22)
PR: 214308
Submitted by: moiseev at mezonplus.ru
Added:
head/sysutils/backuppc-devel/files/patch-lib_BackupPC_Lib.pm (contents, props changed)
Modified:
head/sysutils/backuppc-devel/Makefile
Modified: head/sysutils/backuppc-devel/Makefile
==============================================================================
--- head/sysutils/backuppc-devel/Makefile Sat Dec 24 15:56:20 2016 (r429367)
+++ head/sysutils/backuppc-devel/Makefile Sat Dec 24 15:56:56 2016 (r429368)
@@ -3,7 +3,7 @@
PORTNAME= backuppc
DISTVERSION= 4.0.0alpha3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
PKGNAMESUFFIX= -devel
@@ -121,4 +121,10 @@ do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/backuppc
${CP} ${WRKSRC}/update.pl ${STAGEDIR}${PREFIX}/libexec/backuppc/update.pl
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502200
+RUN_DEPENDS+= p5-CGI>0:www/p5-CGI
+.endif
+
+.include <bsd.port.post.mk>
Added: head/sysutils/backuppc-devel/files/patch-lib_BackupPC_Lib.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/backuppc-devel/files/patch-lib_BackupPC_Lib.pm Sat Dec 24 15:56:56 2016 (r429368)
@@ -0,0 +1,20 @@
+--- lib/BackupPC/Lib.pm.orig 2016-11-08 08:12:44 UTC
++++ lib/BackupPC/Lib.pm
+@@ -1097,7 +1097,7 @@ sub cmdVarSubstitute
+ #
+ # Replace scalar variables first
+ #
+- $arg =~ s[\${(\w+)}(\+?)]{
++ $arg =~ s[\$\{(\w+)}(\+?)]{
+ exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY"
+ ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
+ : "\${$1}$2"
+@@ -1106,7 +1106,7 @@ sub cmdVarSubstitute
+ # Now replicate any array arguments; this just works for just one
+ # array var in each argument.
+ #
+- if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
++ if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
+ my $pre = $1;
+ my $var = $2;
+ my $esc = $3;
More information about the svn-ports-head
mailing list