<!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>[143668] trunk/dports/aqua/PsyncX</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/143668">143668</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-12-17 03:42:44 -0800 (Thu, 17 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>PsyncX: use perl5.22; make logfile writable; run psync 32-bit because it uses Carbon</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaPsyncXPortfile">trunk/dports/aqua/PsyncX/Portfile</a></li>
<li><a href="#trunkdportsaquaPsyncXfilespatchrunpsyncdiff">trunk/dports/aqua/PsyncX/files/patch-runpsync.diff</a></li>
<li><a href="#trunkdportsaquaPsyncXfilesrunpsync">trunk/dports/aqua/PsyncX/files/runpsync</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaPsyncXPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/PsyncX/Portfile (143667 => 143668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/PsyncX/Portfile 2015-12-17 11:37:20 UTC (rev 143667)
+++ trunk/dports/aqua/PsyncX/Portfile 2015-12-17 11:42:44 UTC (rev 143668)
</span><span class="lines">@@ -2,11 +2,12 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup perl5 1.0
</ins><span class="cx"> PortGroup xcode 1.0
</span><span class="cx">
</span><span class="cx"> name PsyncX
</span><span class="cx"> version 2.2.2
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories aqua sysutils
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="cx"> homepage http://psyncx.sourceforge.net/
</span><span class="lines">@@ -23,11 +24,12 @@
</span><span class="cx"> svn.revision 29
</span><span class="cx"> worksrcdir trunk
</span><span class="cx">
</span><del>-set perl_version 5.16
-depends_lib port:perl${perl_version} \
- port:p${perl_version}-macosx-file
</del><ins>+perl5.branches 5.22
</ins><span class="cx">
</span><del>-# p5.12-macosx-file is 32-bit only
</del><ins>+depends_lib port:perl${perl5.major} \
+ port:p${perl5.major}-macosx-file
+
+# p5-macosx-file is 32-bit only
</ins><span class="cx"> supported_archs i386 ppc
</span><span class="cx">
</span><span class="cx"> # I don't know why these files aren't in the psyncx subversion repository.
</span><span class="lines">@@ -49,16 +51,23 @@
</span><span class="cx"> ${worksrcpath}/CronController.m \
</span><span class="cx"> ${worksrcpath}/CronJob.m \
</span><span class="cx"> ${worksrcpath}/runpsync
</span><del>- reinplace "s|@PERL@|${prefix}/bin/perl${perl_version}|g" \
</del><ins>+ reinplace "s|@PERL@|${perl5.bin}|g" \
</ins><span class="cx"> ${worksrcpath}/psyncapplescript \
</span><span class="cx"> ${worksrcpath}/psyncwriter \
</span><span class="cx"> ${worksrcpath}/runpsync
</span><ins>+ reinplace "s|@PSYNC@|${prefix}/bin/psync-${perl5.major}|g" \
+ ${worksrcpath}/runpsync
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -W ${worksrcpath} psyncwriter runpsync ${destroot}${prefix}/bin
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+post-activate {
+ touch ${prefix}/var/log/psync.log
+ file attributes ${prefix}/var/log/psync.log -permissions a+rw
+}
+
</ins><span class="cx"> # "PsyncX is officially unsupported" —http://psyncx.sourceforge.net/
</span><span class="cx"> livecheck.type none
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaquaPsyncXfilespatchrunpsyncdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/PsyncX/files/patch-runpsync.diff (143667 => 143668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/PsyncX/files/patch-runpsync.diff 2015-12-17 11:37:20 UTC (rev 143667)
+++ trunk/dports/aqua/PsyncX/files/patch-runpsync.diff 2015-12-17 11:42:44 UTC (rev 143668)
</span><span class="lines">@@ -1,13 +1,22 @@
</span><del>---- runpsync.orig 2006-07-17 00:42:35.000000000 -0500
-+++ runpsync 2011-05-07 23:24:24.000000000 -0500
</del><ins>+--- runpsync.orig 2015-12-17 05:29:52.000000000 -0600
++++ runpsync 2015-12-17 05:31:03.000000000 -0600
</ins><span class="cx"> @@ -1,4 +1,4 @@
</span><span class="cx"> -#!/usr/bin/perl
</span><span class="cx"> +#!@PERL@
</span><span class="cx">
</span><span class="cx"> ### Copyright 2003 AcornSoft ###
</span><span class="cx">
</span><del>-@@ -43,11 +43,11 @@
</del><ins>+@@ -13,7 +13,7 @@
+ $arch = "";
+ }
</ins><span class="cx">
</span><ins>+-$psync = "$arch/usr/local/bin/psync";
++$psync = "$arch@PSYNC@";
+
+ # Turn off buffering
+ $|=1;
+@@ -56,8 +56,8 @@
+
</ins><span class="cx"> if(-d $mainHD && -d $secondHD) {
</span><span class="cx">
</span><span class="cx"> -print `touch /var/log/psync.log`;
</span><span class="lines">@@ -16,12 +25,8 @@
</span><span class="cx"> +open(STDOUT, "| tee @PREFIX@/var/log/psync.log");
</span><span class="cx"> $now=localtime();
</span><span class="cx"> print "Backup begun $now\n";
</span><del>--open(INPUT, "/usr/local/bin/psync $d $f $r '$mainHD' '$secondHD'|");
-+open(INPUT, "@PREFIX@/bin/psync $d $f $r '$mainHD' '$secondHD'|");
-
- while(<INPUT>) {
- print $_;
-@@ -58,7 +58,7 @@
</del><ins>+ open(INPUT, "$psync $d $f $r '$mainHD' '$secondHD'|");
+@@ -71,7 +71,7 @@
</ins><span class="cx"> close STDOUT;
</span><span class="cx"> } # end if
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkdportsaquaPsyncXfilesrunpsync"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/PsyncX/files/runpsync (143667 => 143668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/PsyncX/files/runpsync 2015-12-17 11:37:20 UTC (rev 143667)
+++ trunk/dports/aqua/PsyncX/files/runpsync 2015-12-17 11:42:44 UTC (rev 143668)
</span><span class="lines">@@ -2,6 +2,19 @@
</span><span class="cx">
</span><span class="cx"> ### Copyright 2003 AcornSoft ###
</span><span class="cx">
</span><ins>+use Config;
+$osx_version = qx/sw_vers -productVersion | cut -d . -f 2/;
+chomp $osx_version;
+if ($osx_version > 4) {
+# run 32-bit because MacOSX::File uses Carbon
+$arch = "/usr/bin/arch -" . (substr($Config{byteorder}, 0, 1) == "1" ? "i386" : "ppc") . " ";
+} else {
+# arch on 10.4 and earlier doesn't have this capability
+$arch = "";
+}
+
+$psync = "$arch/usr/local/bin/psync";
+
</ins><span class="cx"> # Turn off buffering
</span><span class="cx"> $|=1;
</span><span class="cx">
</span><span class="lines">@@ -47,13 +60,13 @@
</span><span class="cx"> open(STDOUT, "| tee /var/log/psync.log");
</span><span class="cx"> $now=localtime();
</span><span class="cx"> print "Backup begun $now\n";
</span><del>-open(INPUT, "/usr/local/bin/psync $d $f $r '$mainHD' '$secondHD'|");
</del><ins>+open(INPUT, "$psync $d $f $r '$mainHD' '$secondHD'|");
</ins><span class="cx">
</span><span class="cx"> while(<INPUT>) {
</span><span class="cx"> print $_;
</span><span class="cx"> }
</span><span class="cx"> $now=localtime();
</span><del>-print "Backup completed: $now";
</del><ins>+print "Backup completed: $now\n";
</ins><span class="cx"> close INPUT;
</span><span class="cx"> close STDOUT;
</span><span class="cx"> } # end if
</span></span></pre>
</div>
</div>
</body>
</html>