[143389] trunk/dports/net/munin
mojca at macports.org
mojca at macports.org
Sat Dec 12 09:46:46 PST 2015
Revision: 143389
https://trac.macports.org/changeset/143389
Author: mojca at macports.org
Date: 2015-12-11 15:08:13 -0800 (Fri, 11 Dec 2015)
Log Message:
-----------
munin: switch to p5.22 with the perl5 portgroup (#48365), use ascii encoding to avoid build failure
Modified Paths:
--------------
trunk/dports/net/munin/Portfile
Added Paths:
-----------
trunk/dports/net/munin/files/patch-encodings.diff
Modified: trunk/dports/net/munin/Portfile
===================================================================
--- 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)
@@ -2,10 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup perl5 1.0
name munin
version 1.4.7
-revision 3
+revision 4
license GPL-2
categories net
maintainers nomaintainer
@@ -31,12 +32,14 @@
checksums rmd160 b25c0a4d7d7613592757132290b7158228ea2a67 \
sha256 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
-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
+perl5.branches 5.22
+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
+
# munindoc needs at least groff version 1.20.1 for good Unicode support.
depends_run port:groff
@@ -45,9 +48,11 @@
use_parallel_build no
patchfiles patch-Makefile-javaplugin \
patch-Makefile.config \
- patch-munin-node.conf.in
+ patch-munin-node.conf.in \
+ patch-encodings.diff
+
post-patch {
- reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|" \
+ reinplace "s|/usr/bin/perl|${perl5.bin}|" \
${worksrcpath}/master/_bin/munin-update.in \
${worksrcpath}/node/extras/munin-node-sched \
${worksrcpath}/node/extras/munin-node-simple.in \
@@ -72,7 +77,7 @@
LIBDIR=${prefix}/lib/munin \
HTMLDIR=${prefix}/www/munin \
CGIDIR=${prefix}/www/cgi-bin \
- PERL=${prefix}/bin/perl5.16
+ PERL=${perl5.bin}
destroot.args PREFIX=${destroot}${prefix} \
CONFDIR=${destroot}${prefix}/etc/munin \
DBDIR=${destroot}${prefix}/var/munin \
@@ -83,7 +88,7 @@
LIBDIR=${destroot}${prefix}/lib/munin \
HTMLDIR=${destroot}${prefix}/www/munin \
CGIDIR=${destroot}${prefix}/www/cgi-bin \
- PERL=${prefix}/bin/perl5.16
+ PERL=${perl5.bin}
destroot.keepdirs ${destroot}${prefix}/var/log/munin \
${destroot}${prefix}/var/run/munin \
${destroot}${prefix}/etc/munin/plugins \
@@ -103,11 +108,11 @@
variant server description {Install Munin server} {
depends_lib-append port:rrdtool \
- 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
+ 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
destroot.target-append install-master-prime
}
Added: trunk/dports/net/munin/files/patch-encodings.diff
===================================================================
--- 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)
@@ -0,0 +1,55 @@
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/8e1cbb6e/attachment.html>
More information about the macports-changes
mailing list