Date: Sat, 24 Dec 2016 15:56:21 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429367 - in head/sysutils/backuppc: . files Message-ID: <201612241556.uBOFuLeR000569@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Sat Dec 24 15:56:20 2016 New Revision: 429367 URL: https://svnweb.freebsd.org/changeset/ports/429367 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@mezonplus.ru (maintainer) Added: head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm (contents, props changed) Modified: head/sysutils/backuppc/Makefile Modified: head/sysutils/backuppc/Makefile ============================================================================== --- head/sysutils/backuppc/Makefile Sat Dec 24 15:52:43 2016 (r429366) +++ head/sysutils/backuppc/Makefile Sat Dec 24 15:56:20 2016 (r429367) @@ -3,7 +3,7 @@ PORTNAME= backuppc PORTVERSION= 3.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= SF DISTNAME= BackupPC-${PORTVERSION} @@ -134,4 +134,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/files/patch-lib_BackupPC_Lib.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm Sat Dec 24 15:56:20 2016 (r429367) @@ -0,0 +1,20 @@ +--- lib/BackupPC/Lib.pm.orig 2016-11-08 08:08:02 UTC ++++ lib/BackupPC/Lib.pm +@@ -1261,7 +1261,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" +@@ -1270,7 +1270,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612241556.uBOFuLeR000569>