<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c008c5cee67113103690daad2d349f8a56589fb4">https://github.com/macports/macports-ports/commit/c008c5cee67113103690daad2d349f8a56589fb4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c008c5c backuppc: update to version 4.3.2 using github repo
</span>c008c5c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c008c5cee67113103690daad2d349f8a56589fb4
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat May 9 10:27:11 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> backuppc: update to version 4.3.2 using github repo
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add variant +perl5_30, default +perl5_28
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * now depends on CPAN module BackupPC::XS
</span>---
sysutils/backuppc/Portfile | 59 +++++++++++-----------
.../{patch-progs.diff => patch-configure.pl.diff} | 9 ++--
sysutils/backuppc/files/patch-docdir.diff | 43 ----------------
3 files changed, 35 insertions(+), 76 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/backuppc/Portfile b/sysutils/backuppc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3dc4e79..f8f7c62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/backuppc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/backuppc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,25 +3,25 @@
</span> PortSystem 1.0
PortGroup active_variants 1.1
PortGroup perl5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name backuppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup backuppc backuppc 4.3.2
</span> categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://backuppc.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://backuppc.github.io/backuppc/
</span>
description BackupPC is a high-performance, enterprise-grade system for backing up Linux, WinXX and Mac OS X PCs and laptops to a server.
long_description ${description} BackupPC is highly configurable and easy to install and maintain.
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/backuppc/backuppc/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
perl5.require_variant yes
perl5.conflict_variants yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.26 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.26 5.28 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.default_branch 5.28
</span> perl5.create_variants ${perl5.branches}
require_active_variants mod_perl2 ${perl5.variant}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,18 +30,20 @@ depends_lib port:bzip2 \
</span> port:gzip \
port:mod_perl2 \
port:openssh \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-archive-zip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-compress-raw-zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-file-rsyncp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-backuppc-xs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-cgi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-encode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-file-listing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-getopt-long \
</span> port:par2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl5.major} \
</span> port:rsync \
port:samba3
distname BackupPC-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f9160354a47ea04cfd0da1bcd400850615af9e07 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fbade2c8d8039297e826a75d2c39d5ac9a6f66e0c84c0cf8c4cef0bcf64d2152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d61dfc2cacbd7821a41203e53de95d6eb702b2b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b8d5f94bd1073209bb68d4f822ec15e65e1b1358308fb783b1df349f3c3574b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 642628
</span>
configure.args --batch \
--backuppc-user=backuppc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,29 +56,15 @@ configure.args --batch \
</span> --config-dir ${prefix}/etc/BackupPC \
--log-dir ${prefix}/var/log/BackupPC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-docdir.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-progs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${prefix}/var/backups \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/backups/cpool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/backups/log \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/backups/trash \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/backups/pool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/backups/pc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/backups/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/log/BackupPC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/wwwbackup/htdocs\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/wwwbackup/logs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set hostname [exec "hostname"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.pl.diff
</span>
post-patch {
reinplace "s|@@PERL@@|perl${perl5.major}|g" ${worksrcpath}/configure.pl
reinplace "s|@@PERL_FULL@@|${perl5.bin}|g" ${worksrcpath}/configure.pl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set hostname [exec "hostname"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
ui_debug "Hostname: ${hostname}"
configure.args-append --hostname ${hostname}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +78,19 @@ configure {
</span>
build {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${prefix}/var/backups \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/backups/cpool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/backups/log \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/backups/trash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/backups/pool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/backups/pc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/backups/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/BackupPC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/wwwbackup/htdocs\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/wwwbackup/logs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
# destroot for the web skeleton
xinstall -d -m 770 -g backuppc -o backuppc ${destroot}${prefix}/var/wwwbackup
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/backuppc/files/patch-progs.diff b/sysutils/backuppc/files/patch-configure.pl.diff
</span>similarity index 75%
rename from sysutils/backuppc/files/patch-progs.diff
rename to sysutils/backuppc/files/patch-configure.pl.diff
<span style='display:block; white-space:pre;color:#808080;'>index d9cc242..76a9e73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/backuppc/files/patch-progs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/backuppc/files/patch-configure.pl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.pl.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.pl.orig 2020-02-17 11:40:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.pl 2020-05-08 22:36:34.000000000 -0700
</span> @@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@@PERL_FULL@@
#============================================================= -*-perl-*-
#
# configure.pl: Configuration and installation program for BackupPC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,8 +247,8 @@ if ( $opts{fhs} ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,9 +363,9 @@
</span> # These are the programs whose paths we need to find
#
my %Programs = (
- perl => "PerlPath",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'gtar/tar' => "TarClientPath",
</span> + '@@PERL@@' => "PerlPath",
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsync_bpc => "RsyncBackupPCPath",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'gtar/tar' => "TarClientPath",
</span> + gnutar => "TarClientPath",
smbclient => "SmbClientPath",
nmblookup => "NmbLookupPath",
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/backuppc/files/patch-docdir.diff b/sysutils/backuppc/files/patch-docdir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 964dde4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/backuppc/files/patch-docdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.pl.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,7 +522,7 @@ exit unless prompt("--> Do you want to continue?", "y") =~ /y/i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create install directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--foreach my $dir ( qw(bin doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+foreach my $dir ( qw(bin share/doc/BackupPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/BackupPC/CGI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/BackupPC/Config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/BackupPC/Lang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -693,9 +693,9 @@ foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Making Apache configuration file for suid-perl\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--printf("Installing docs in $DestDir$Conf{InstallDir}/doc\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+printf("Installing docs in $DestDir$Conf{InstallDir}/share/doc/BackupPC\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/share/doc/BackupPC/$doc", 0444);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("Installing config.pl and hosts in $DestDir$Conf{ConfDir}\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -948,7 +948,7 @@ will need to do:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - Edit the list of hosts to backup in $Conf{ConfDir}/hosts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- - Read the documentation in $Conf{InstallDir}/doc/BackupPC.html.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - Read the documentation in $Conf{InstallDir}/share/doc/BackupPC/doc/BackupPC.html.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Please pay special attention to the security section.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - Verify that the CGI script BackupPC_Admin runs correctly. You might
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/BackupPC/CGI/View.pm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/BackupPC/CGI/View.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@ sub action
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $file = $bpc->ConfDir() . "/hosts";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $linkHosts = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elsif ( $type eq "docs" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $file = $bpc->InstallDir() . "/doc/BackupPC.html";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elsif ( $host ne "" ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( !defined($In{num}) ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get the latest LOG file
</span></pre><pre style='margin:0'>
</pre>