<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[144339] trunk/dports/sysutils/backuppc</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/144339">144339</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-01-06 14:02:07 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>backuppc: upgrade to 3.3.1 (#49571), create a mess with perl variants (#48365)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbackuppcPortfile">trunk/dports/sysutils/backuppc/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbackuppcfilespatchdocdirdiff">trunk/dports/sysutils/backuppc/files/patch-docdir.diff</a></li>
<li><a href="#trunkdportssysutilsbackuppcfilespatchprogsdiff">trunk/dports/sysutils/backuppc/files/patch-progs.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbackuppcfilespatchconfigurepldiff">trunk/dports/sysutils/backuppc/files/patch-configure.pl.diff</a></li>
<li><a href="#trunkdportssysutilsbackuppcfilespatchlibbackuppccgiviewpmdiff">trunk/dports/sysutils/backuppc/files/patch-lib-backuppc-cgi-view.pm.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsbackuppcPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/backuppc/Portfile (144338 => 144339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/backuppc/Portfile 2016-01-06 20:49:09 UTC (rev 144338)
+++ trunk/dports/sysutils/backuppc/Portfile 2016-01-06 22:02:07 UTC (rev 144339)
</span><span class="lines">@@ -2,12 +2,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup active_variants 1.1
+PortGroup perl5 1.0
</ins><span class="cx">
</span><span class="cx"> name backuppc
</span><span class="cx"> categories sysutils
</span><del>-version 3.1.0
-revision 2
-set perl_version 5.16
</del><ins>+version 3.3.1
</ins><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license GPL-2+
</span><span class="cx"> homepage http://backuppc.sourceforge.net/
</span><span class="lines">@@ -19,24 +19,34 @@
</span><span class="cx">
</span><span class="cx"> master_sites sourceforge
</span><span class="cx">
</span><ins>+# TODO:
+# - remove 5.16 once we upgrade to 5.22 as default
+# - remove the variants once mod_perl2 switches to 5.22 only
+perl5.require_variant yes
+perl5.conflict_variants yes
+perl5.branches 5.16 5.22
+perl5.create_variants ${perl5.branches}
+# TODO: this has to be the same branch as for mod_perl2
+perl5.default_branch 5.22
+require_active_variants mod_perl2 ${perl5.variant}
+
</ins><span class="cx"> depends_lib port:bzip2 \
</span><span class="cx"> port:gnutar \
</span><span class="cx"> port:gzip \
</span><span class="cx"> port:mod_perl2 \
</span><span class="cx"> port:openssh \
</span><del>- port:p${perl_version}-archive-zip \
- port:p${perl_version}-compress-raw-zlib \
- port:p${perl_version}-file-rsyncp \
</del><ins>+ port:p${perl5.major}-archive-zip \
+ port:p${perl5.major}-compress-raw-zlib \
+ port:p${perl5.major}-file-rsyncp \
</ins><span class="cx"> port:par2 \
</span><del>- port:perl${perl_version} \
</del><ins>+ port:perl${perl5.major} \
</ins><span class="cx"> port:rsync \
</span><span class="cx"> port:samba3
</span><span class="cx">
</span><span class="cx"> distname BackupPC-${version}
</span><span class="cx">
</span><del>-checksums md5 84b4471852ef910768eae9963ef932d2 \
- sha1 3bd6d637f4f08f2fda44a12668b91d47c4abb0a7 \
- rmd160 22d4cb6dd76f846fde489a301852f50e8db1ae1d
</del><ins>+checksums rmd160 3db4d6a54c9cde61fa434292b53f18ded73dbb83 \
+ sha256 c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c
</ins><span class="cx">
</span><span class="cx"> configure.args --batch \
</span><span class="cx"> --backuppc-user=backuppc \
</span><span class="lines">@@ -46,10 +56,11 @@
</span><span class="cx"> --html-dir ${prefix}/var/wwwbackup/htdocs/backuppc \
</span><span class="cx"> --html-dir-url /backuppc \
</span><span class="cx"> --install-dir ${prefix} \
</span><del>- --config-dir ${prefix}/etc/BackupPC
</del><ins>+ --config-dir ${prefix}/etc/BackupPC \
+ --log-dir ${prefix}/var/log/BackupPC
</ins><span class="cx">
</span><del>-patchfiles patch-configure.pl.diff \
- patch-lib-backuppc-cgi-view.pm.diff
</del><ins>+patchfiles patch-docdir.diff \
+ patch-progs.diff
</ins><span class="cx">
</span><span class="cx"> destroot.violate_mtree yes
</span><span class="cx">
</span><span class="lines">@@ -72,9 +83,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure {
</span><del>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure.pl
- reinplace "s|@@PREFIX@@|${prefix}/|g" ${worksrcpath}/lib/BackupPC/CGI/View.pm
-
</del><span class="cx"> addgroup backuppc
</span><span class="cx"> set gid [existsgroup backuppc]
</span><span class="cx"> adduser backuppc gid=${gid} realname=BackupPC
</span><span class="lines">@@ -102,9 +110,10 @@
</span><span class="cx"> xinstall -d -m 770 -g backuppc -o backuppc ${destroot}${prefix}/var/log/BackupPC
</span><span class="cx">
</span><span class="cx"> # create backup directory
</span><del>- system -W ${worksrcpath} "${prefix}/bin/perl${perl_version} configure.pl ${configure.args}"
- xinstall -d -m 755 ${destroot}${prefix}/share/doc/
- move ${destroot}${prefix}/doc ${destroot}${prefix}/share/doc/BackupPC
</del><ins>+ system -W ${worksrcpath} "${prefix}/bin/perl${perl5.major} configure.pl ${configure.args}"
+ # done with a patch for now:
+ #xinstall -d -m 755 ${destroot}${prefix}/share/doc/
+ #move ${destroot}${prefix}/doc ${destroot}${prefix}/share/doc/BackupPC
</ins><span class="cx">
</span><span class="cx"> # install the launch scripts
</span><span class="cx"> xinstall -d -m 755 ${destroot}/Library/LaunchDaemons
</span></span></pre></div>
<a id="trunkdportssysutilsbackuppcfilespatchconfigurepldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/backuppc/files/patch-configure.pl.diff (144338 => 144339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/backuppc/files/patch-configure.pl.diff 2016-01-06 20:49:09 UTC (rev 144338)
+++ trunk/dports/sysutils/backuppc/files/patch-configure.pl.diff 2016-01-06 22:02:07 UTC (rev 144339)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>---- configure.pl (saved version)
-+++ (current document)
-@@ -231,9 +231,9 @@
- #
- if ( $opts{fhs} ) {
- $Conf{TopDir} ||= "/data/BackupPC";
-- $Conf{ConfDir} ||= $opts{"config-dir"} || "/etc/BackupPC";
-+ $Conf{ConfDir} ||= $opts{"config-dir"} || "@@PREFIX@@/etc/BackupPC";
- $Conf{InstallDir} ||= "/usr/local/BackupPC";
-- $Conf{LogDir} ||= $opts{"log-dir"} || "/var/log/BackupPC";
-+ $Conf{LogDir} = "@@PREFIX@@/var/log/BackupPC";;
- }
-
- #
-@@ -265,7 +265,7 @@
- }
- $Conf{$Programs{$prog}} = $path if ( !length($Conf{$Programs{$prog}}) );
- }
--
-+$Conf{$Programs{'gtar/tar'}} = "@@PREFIX@@/bin/gnutar";
- while ( 1 ) {
- print <<EOF;
-
</del></span></pre></div>
<a id="trunkdportssysutilsbackuppcfilespatchdocdirdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/backuppc/files/patch-docdir.diff (0 => 144339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/backuppc/files/patch-docdir.diff (rev 0)
+++ trunk/dports/sysutils/backuppc/files/patch-docdir.diff 2016-01-06 22:02:07 UTC (rev 144339)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+--- configure.pl.orig
++++ configure.pl
+@@ -522,7 +522,7 @@ exit unless prompt("--> Do you want to continue?", "y") =~ /y/i;
+ #
+ # Create install directories
+ #
+-foreach my $dir ( qw(bin doc
++foreach my $dir ( qw(bin share/doc/BackupPC
+ lib/BackupPC/CGI
+ lib/BackupPC/Config
+ lib/BackupPC/Lang
+@@ -693,9 +693,9 @@ foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc
+ printf("Making Apache configuration file for suid-perl\n");
+ InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644);
+
+-printf("Installing docs in $DestDir$Conf{InstallDir}/doc\n");
++printf("Installing docs in $DestDir$Conf{InstallDir}/share/doc/BackupPC\n");
+ foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) {
+- InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444);
++ InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/share/doc/BackupPC/$doc", 0444);
+ }
+
+ printf("Installing config.pl and hosts in $DestDir$Conf{ConfDir}\n");
+@@ -948,7 +948,7 @@ will need to do:
+
+ - Edit the list of hosts to backup in $Conf{ConfDir}/hosts.
+
+- - Read the documentation in $Conf{InstallDir}/doc/BackupPC.html.
++ - Read the documentation in $Conf{InstallDir}/share/doc/BackupPC/doc/BackupPC.html.
+ Please pay special attention to the security section.
+
+ - Verify that the CGI script BackupPC_Admin runs correctly. You might
+--- lib/BackupPC/CGI/View.pm.orig
++++ lib/BackupPC/CGI/View.pm
+@@ -89,7 +89,7 @@ sub action
+ $file = $bpc->ConfDir() . "/hosts";
+ $linkHosts = 1;
+ } elsif ( $type eq "docs" ) {
+- $file = $bpc->InstallDir() . "/doc/BackupPC.html";
++ $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html";
+ } elsif ( $host ne "" ) {
+ if ( !defined($In{num}) ) {
+ # get the latest LOG file
</ins></span></pre></div>
<a id="trunkdportssysutilsbackuppcfilespatchlibbackuppccgiviewpmdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/backuppc/files/patch-lib-backuppc-cgi-view.pm.diff (144338 => 144339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/backuppc/files/patch-lib-backuppc-cgi-view.pm.diff 2016-01-06 20:49:09 UTC (rev 144338)
+++ trunk/dports/sysutils/backuppc/files/patch-lib-backuppc-cgi-view.pm.diff 2016-01-06 22:02:07 UTC (rev 144339)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- lib/BackupPC/CGI/View.pm 2007-11-25 19:00:07.000000000 -0800
-+++ lib/BackupPC/CGI/View.pm.new 2009-08-03 11:28:00.000000000 -0700
-@@ -86,7 +86,7 @@
- $file = $bpc->ConfDir() . "/hosts";
- $linkHosts = 1;
- } elsif ( $type eq "docs" ) {
-- $file = $bpc->InstallDir() . "/doc/BackupPC.html";
-+ $file = "@@PREFIX@@share/doc/BackupPC/BackupPC.html";
- } elsif ( $host ne "" ) {
- if ( !defined($In{num}) ) {
- # get the latest LOG file
</del></span></pre></div>
<a id="trunkdportssysutilsbackuppcfilespatchprogsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/backuppc/files/patch-progs.diff (0 => 144339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/backuppc/files/patch-progs.diff (rev 0)
+++ trunk/dports/sysutils/backuppc/files/patch-progs.diff 2016-01-06 22:02:07 UTC (rev 144339)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- configure.pl.orig
++++ configure.pl
+@@ -247,8 +247,8 @@ if ( $opts{fhs} ) {
+ # These are the programs whose paths we need to find
+ #
+ my %Programs = (
+- perl => "PerlPath",
+- 'gtar/tar' => "TarClientPath",
++ 'perl5.22' => "PerlPath",
++ gnutar => "TarClientPath",
+ smbclient => "SmbClientPath",
+ nmblookup => "NmbLookupPath",
+ rsync => "RsyncClientPath",
</ins></span></pre>
</div>
</div>
</body>
</html>