Attachment 176768 Details for Bug 214308 – sysutils/backuppc patch-devel

[patch] sysutils/backuppc patch-devel

backuppc-devel-4.0.0alpha3_5.patch (text/plain), 1.83 KB, created by Alexander Moisseev on 2016-11-08 09:18:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Moisseev

Created: 2016-11-08 09:18:23 UTC

Size: 1.83 KB

patch

obsolete

>diff -ruN backuppc-devel.orig/files/patch-lib_BackupPC_Lib.pm backuppc-devel/files/patch-lib_BackupPC_Lib.pm
>--- backuppc-devel.orig/files/patch-lib_BackupPC_Lib.pm	1970-01-01 03:00:00.000000000 +0300
>+++ backuppc-devel/files/patch-lib_BackupPC_Lib.pm	2016-11-08 11:13:38.000000000 +0300
>@@ -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;
>diff -ruN backuppc-devel.orig/Makefile backuppc-devel/Makefile
>--- backuppc-devel.orig/Makefile	2016-11-08 10:51:49.359840000 +0300
>+++ backuppc-devel/Makefile	2016-11-08 11:40:33.521104000 +0300
>@@ -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 @@
> 	${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>

Flags:

moiseev: maintainer-approval+

Actions: View | Diff

Attachments on bug 214308: 176767 | 176768