<!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>[129017] trunk/dports/net/monarch</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/129017">129017</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-12-03 05:19:01 -0800 (Wed, 03 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>monarch: switch from perl5.12 to perl5.16, remove ineffective +server variant, various destroot fixups, dependencies, use notes rather than post-activate ui_msg, minor white space for lint (#44405).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetmonarchPortfile">trunk/dports/net/monarch/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetmonarchfilespatchnmap_scannmap_scancdiff">trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetmonarchfilespatchnmap_scannmap_scanc">trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetmonarchPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/monarch/Portfile (129016 => 129017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/monarch/Portfile 2014-12-03 12:50:08 UTC (rev 129016)
+++ trunk/dports/net/monarch/Portfile 2014-12-03 13:19:01 UTC (rev 129017)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><ins>+
</ins><span class="cx"> PortSystem 1.0
</span><del>-
</del><ins>+
</ins><span class="cx"> name monarch
</span><span class="cx"> version 2.5.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> license GPL-2
</span><span class="cx"> categories net
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -13,49 +14,45 @@
</span><span class="cx"> homepage http://sourceforge.net/projects/monarch
</span><span class="cx"> platforms darwin
</span><span class="cx"> master_sites sourceforge
</span><ins>+
</ins><span class="cx"> checksums md5 68658989ff485ac58a42035c3a927362
</span><del>-patchfiles patch-nmap_scan-nmap_scan.c
-depends_build port:nagios
</del><ins>+
</ins><span class="cx"> depends_lib path:bin/mysql_config5:mysql5 \
</span><del>- port:p5.12-libwww-perl \
- port:p5.12-xml-namespacesupport \
- port:p5.12-xml-sax \
- port:p5.12-xml-libxml \
- port:p5.12-nmap-scanner \
- port:p5.12-dbi \
- port:p5.12-dbd-mysql \
- port:p5.12-cgi-ajax \
- port:p5.12-class-accessor
-patch.post_args -F 3
</del><ins>+ port:nagios \
+ port:p5.16-libwww-perl \
+ port:p5.16-xml-namespacesupport \
+ port:p5.16-xml-sax \
+ port:p5.16-xml-libxml \
+ port:p5.16-nmap-scanner \
+ port:p5.16-dbi \
+ port:p5.16-dbd-mysql \
+ port:p5.16-cgi-ajax \
+ port:p5.16-class-accessor
+
+patchfiles patch-nmap_scan-nmap_scan.c.diff
+
</ins><span class="cx"> use_configure no
</span><span class="cx"> build {}
</span><span class="cx">
</span><del>-variant server {
-# This variant doesn't do anything in this port, it only exists to trigger the server
-# variant in the mysql5 port.
-}
</del><ins>+set monarchdir ${prefix}/share/groundwork/monarch
</ins><span class="cx">
</span><del>-variant_set server
-
-set monarchdir ${prefix}/groundwork/monarch
-
</del><span class="cx"> destroot {
</span><span class="cx"> xinstall -m 755 -d ${destroot}${monarchdir}
</span><del>- system "cp -R ${worksrcpath}/* ${destroot}${monarchdir}"
</del><ins>+ eval copy [glob ${worksrcpath}/*] ${destroot}${monarchdir}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
</del><ins>+ eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.16|g" \
</ins><span class="cx"> [glob ${destroot}${monarchdir}/*.pl]
</span><span class="cx">
</span><del>- eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g" \
- [glob ${destroot}${monarchdir}/*.cgi]
</del><ins>+ eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.16|g" \
+ [glob ${destroot}${monarchdir}/*.cgi] \
+ [glob ${destroot}${monarchdir}/*.p*]
</ins><span class="cx">
</span><del>- eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g" \
- [glob ${destroot}${monarchdir}/*.p*]
-
</del><span class="cx"> eval reinplace "s|/usr/local/groundwork/monarch|${monarchdir}|g" \
</span><del>- [glob ${destroot}${monarchdir}/*.*]
</del><ins>+ [glob ${destroot}${monarchdir}/*.cgi] \
+ [glob ${destroot}${monarchdir}/*.pl] \
+ ${destroot}${monarchdir}/monarch.sql
</ins><span class="cx">
</span><span class="cx"> # Fix mysqldump location
</span><span class="cx"> reinplace "s|/usr/bin/mysqldump|${prefix}/bin/mysqldump5|g" \
</span><span class="lines">@@ -80,8 +77,8 @@
</span><span class="cx"> ${destroot}${monarchdir}/bin
</span><span class="cx">
</span><span class="cx"> # Delete precompiled Linux version of nmap_scan_one and leftover nmap_scan_one.pl
</span><del>- file delete ${destroot}${monarchdir}/nmap_scan_one
- file delete ${destroot}${monarchdir}/nmap_scan_one.pl
</del><ins>+ delete ${destroot}${monarchdir}/nmap_scan_one
+ delete ${destroot}${monarchdir}/nmap_scan_one.pl
</ins><span class="cx">
</span><span class="cx"> # End enable Nmap-Scanner
</span><span class="cx">
</span><span class="lines">@@ -91,9 +88,10 @@
</span><span class="cx"> system "chown root ${destroot}${monarchdir}/bin/nmap_scan_one"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-activate {
</del><span class="cx">
</span><del>-ui_msg "\n **** To complete the Monarch installation ****
</del><ins>+notes "
+
+**** To complete the Monarch installation ****
</ins><span class="cx">
</span><span class="cx"> Read the README at ${prefix}/share/groundwork/monarch/ for full information.
</span><span class="cx">
</span><span class="lines">@@ -194,7 +192,5 @@
</span><span class="cx"> NOTE: No login is required for the monarch_ez.cgi interface, so you will need to use Apache
</span><span class="cx"> username(s)/password(s) just like you use for the Nagios monitor interface to maintain
</span><span class="cx"> secure access.
</span><del>-\n"
-}
-
</del><ins>+"
</ins><span class="cx"> livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)\\.tar"
</span></span></pre></div>
<a id="trunkdportsnetmonarchfilespatchnmap_scannmap_scanc"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c (129016 => 129017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c 2014-12-03 12:50:08 UTC (rev 129016)
+++ trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c 2014-12-03 13:19:01 UTC (rev 129017)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- nmap_scan/nmap_scan.c.org 2008-06-17 15:41:59.000000000 -0700
-+++ nmap_scan/nmap_scan.c 2009-04-16 23:34:38.000000000 -0700
-@@ -1,8 +1,8 @@
- #include <signal.h>
- #include <sys/param.h>
- #include <pwd.h>
--static char *nmap_pl = "/usr/local/groundwork/monarch/bin/nmap_scan_one.pl";
--static char *trusted_env[]={"PATH=/usr/local/groundwork/bin:/usr/bin:/usr/sbin:/sbin:/bin",0};
-+static char *nmap_pl = "__PREFIX__/groundwork/monarch/bin/nmap_scan_one.pl";
-+static char *trusted_env[]={"PATH=__PREFIX__/groundwork/monarch/bin:__PREFIX__/bin:__PREFIX__/sbin:/usr/bin:/usr/sbin:/sbin:/bin",0};
- int main(int argc, char *argv[])
- {
- char *ip_address = argv[1];
</del></span></pre></div>
<a id="trunkdportsnetmonarchfilespatchnmap_scannmap_scancdifffromrev129015trunkdportsnetmonarchfilespatchnmap_scannmap_scanc"></a>
<div class="copfile"><h4>Copied: trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff (from rev 129015, trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c) (0 => 129017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff (rev 0)
+++ trunk/dports/net/monarch/files/patch-nmap_scan-nmap_scan.c.diff 2014-12-03 13:19:01 UTC (rev 129017)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- nmap_scan/nmap_scan.c.org 2008-06-17 15:41:59.000000000 -0700
++++ nmap_scan/nmap_scan.c 2009-04-16 23:34:38.000000000 -0700
+@@ -1,8 +1,8 @@
+ #include <signal.h>
+ #include <sys/param.h>
+ #include <pwd.h>
+-static char *nmap_pl = "/usr/local/groundwork/monarch/bin/nmap_scan_one.pl";
+-static char *trusted_env[]={"PATH=/usr/local/groundwork/bin:/usr/bin:/usr/sbin:/sbin:/bin",0};
++static char *nmap_pl = "__PREFIX__/groundwork/monarch/bin/nmap_scan_one.pl";
++static char *trusted_env[]={"PATH=__PREFIX__/groundwork/monarch/bin:__PREFIX__/bin:__PREFIX__/sbin:/usr/bin:/usr/sbin:/sbin:/bin",0};
+ int main(int argc, char *argv[])
+ {
+ char *ip_address = argv[1];
</ins></span></pre>
</div>
</div>
</body>
</html>