<!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>[143389] trunk/dports/net/munin</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/143389">143389</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-12-11 15:08:13 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>munin: switch to p5.22 with the perl5 portgroup (#48365), use ascii encoding to avoid build failure</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetmuninPortfile">trunk/dports/net/munin/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetmuninfilespatchencodingsdiff">trunk/dports/net/munin/files/patch-encodings.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetmuninPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/munin/Portfile (143388 => 143389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/munin/Portfile 2015-12-11 22:21:19 UTC (rev 143388)
+++ trunk/dports/net/munin/Portfile 2015-12-11 23:08:13 UTC (rev 143389)
</span><span class="lines">@@ -2,10 +2,11 @@
</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">
</span><span class="cx"> name munin
</span><span class="cx"> version 1.4.7
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx"> license GPL-2
</span><span class="cx"> categories net
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -31,12 +32,14 @@
</span><span class="cx"> checksums rmd160 b25c0a4d7d7613592757132290b7158228ea2a67 \
</span><span class="cx"> sha256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
</span><span class="cx">
</span><del>-depends_lib port:perl5.16 \
- port:p5.16-module-build \
- port:p5.16-net-server \
- port:p5.16-net-snmp \
- port:p5.16-net-ssleay
</del><ins>+perl5.branches 5.22
</ins><span class="cx">
</span><ins>+depends_lib port:perl${perl5.major} \
+ port:p${perl5.major}-module-build \
+ port:p${perl5.major}-net-server \
+ port:p${perl5.major}-net-snmp \
+ port:p${perl5.major}-net-ssleay
+
</ins><span class="cx"> # munindoc needs at least groff version 1.20.1 for good Unicode support.
</span><span class="cx">
</span><span class="cx"> depends_run port:groff
</span><span class="lines">@@ -45,9 +48,11 @@
</span><span class="cx"> use_parallel_build no
</span><span class="cx"> patchfiles patch-Makefile-javaplugin \
</span><span class="cx"> patch-Makefile.config \
</span><del>- patch-munin-node.conf.in
</del><ins>+ patch-munin-node.conf.in \
+ patch-encodings.diff
+
</ins><span class="cx"> post-patch {
</span><del>- reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|" \
</del><ins>+ reinplace "s|/usr/bin/perl|${perl5.bin}|" \
</ins><span class="cx"> ${worksrcpath}/master/_bin/munin-update.in \
</span><span class="cx"> ${worksrcpath}/node/extras/munin-node-sched \
</span><span class="cx"> ${worksrcpath}/node/extras/munin-node-simple.in \
</span><span class="lines">@@ -72,7 +77,7 @@
</span><span class="cx"> LIBDIR=${prefix}/lib/munin \
</span><span class="cx"> HTMLDIR=${prefix}/www/munin \
</span><span class="cx"> CGIDIR=${prefix}/www/cgi-bin \
</span><del>- PERL=${prefix}/bin/perl5.16
</del><ins>+ PERL=${perl5.bin}
</ins><span class="cx"> destroot.args PREFIX=${destroot}${prefix} \
</span><span class="cx"> CONFDIR=${destroot}${prefix}/etc/munin \
</span><span class="cx"> DBDIR=${destroot}${prefix}/var/munin \
</span><span class="lines">@@ -83,7 +88,7 @@
</span><span class="cx"> LIBDIR=${destroot}${prefix}/lib/munin \
</span><span class="cx"> HTMLDIR=${destroot}${prefix}/www/munin \
</span><span class="cx"> CGIDIR=${destroot}${prefix}/www/cgi-bin \
</span><del>- PERL=${prefix}/bin/perl5.16
</del><ins>+ PERL=${perl5.bin}
</ins><span class="cx"> destroot.keepdirs ${destroot}${prefix}/var/log/munin \
</span><span class="cx"> ${destroot}${prefix}/var/run/munin \
</span><span class="cx"> ${destroot}${prefix}/etc/munin/plugins \
</span><span class="lines">@@ -103,11 +108,11 @@
</span><span class="cx">
</span><span class="cx"> variant server description {Install Munin server} {
</span><span class="cx"> depends_lib-append port:rrdtool \
</span><del>- port:p5.16-html-template \
- port:p5.16-time-hires \
- port:p5.16-digest-md5 \
- port:p5.16-text-balanced \
- port:p5.16-log-log4perl
</del><ins>+ port:p${perl5.major}-html-template \
+ port:p${perl5.major}-time-hires \
+ port:p${perl5.major}-digest-md5 \
+ port:p${perl5.major}-text-balanced \
+ port:p${perl5.major}-log-log4perl
</ins><span class="cx"> destroot.target-append install-master-prime
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsnetmuninfilespatchencodingsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/munin/files/patch-encodings.diff (0 => 143389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/munin/files/patch-encodings.diff (rev 0)
+++ trunk/dports/net/munin/files/patch-encodings.diff 2015-12-11 23:08:13 UTC (rev 143389)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+--- master/_bin/munin-gather.in
++++ master/_bin/munin-gather.in
+@@ -980,7 +980,7 @@ Please report other bugs in the bug tracker at L<http://munin.sf.net/>.
+
+ =head1 COPYRIGHT
+
+-Copyright © 2002-2008 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
++Copyright (C) 2002-2008 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
+ Nicolai Langfeldt / Linpro AS.
+
+ This is free software; see the source for copying conditions. There is
+--- master/_bin/munin-graph.in
++++ master/_bin/munin-graph.in
+@@ -3,7 +3,7 @@
+
+ =begin comment
+
+-Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne Øierud,
++Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne Oeierud,
+ Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
+
+ This program is free software; you can redistribute it and/or
+--- master/_bin/munin-html.in
++++ master/_bin/munin-html.in
+@@ -4,7 +4,7 @@
+ =begin comment
+
+ Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Kjell Magne
+-Øierud, Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
++Oeierud, Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+--- master/_bin/munin-update.in
++++ master/_bin/munin-update.in
+@@ -210,7 +210,7 @@ The Munin Team. FIX
+
+ =head1 COPYRIGHT
+
+-Copyright © 2002-2009 Jimmy Olsen, Audun Ytterdal, Tore Andersson, Kjell-Magne Øierud, Linpro AS, Redpill Linpro AS
++Copyright (C) 2002-2009 Jimmy Olsen, Audun Ytterdal, Tore Andersson, Kjell-Magne Oeierud, Linpro AS, Redpill Linpro AS
+
+ This is free software; see the source for copying conditions. There is
+ NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
+--- node/doc/munin-node.conf.pod
++++ node/doc/munin-node.conf.pod
+@@ -171,7 +171,7 @@ Jimmy Olsen.
+ =head1 COPYRIGHT
+
+ Copyright (C) 2002-2006 Audun Ytterdal, Jimmy Olsen, Dagfin Ilmari
+-Mans\xE5ker, Nicolai Langfeldt
++Mansaaker, Nicolai Langfeldt
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
</ins></span></pre>
</div>
</div>
</body>
</html>