<!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>[129005] trunk/dports/net/monarch/Portfile</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/129005">129005</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-12-02 17:38:42 -0800 (Tue, 02 Dec 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>monarch: add mode line and retab, white space only.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetmonarchPortfile">trunk/dports/net/monarch/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetmonarchPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/monarch/Portfile (129004 => 129005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/monarch/Portfile        2014-12-03 01:32:28 UTC (rev 129004)
+++ trunk/dports/net/monarch/Portfile        2014-12-03 01:38:42 UTC (rev 129005)
</span><span class="lines">@@ -1,31 +1,32 @@
</span><ins>+# -*- 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
</ins><span class="cx"> # $Id$
</span><del>-PortSystem      1.0
-
-name                    monarch
-version                 2.5.0
-revision                1
-categories              net
-maintainers             nomaintainer
-description             A GUI configuration tool for Nagios written in perl
-long_description        ${description}
-homepage                http://sourceforge.net/projects/monarch
-platforms               darwin
-master_sites            sourceforge
-checksums               md5 68658989ff485ac58a42035c3a927362
-patchfiles              patch-nmap_scan-nmap_scan.c
-depends_build                port:nagios
-depends_lib             path:bin/mysql_config5:mysql5 \
-                        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
-use_configure                no
</del><ins>+PortSystem          1.0
+                    
+name                monarch
+version             2.5.0
+revision            1
+categories          net
+maintainers         nomaintainer
+description         A GUI configuration tool for Nagios written in perl
+long_description    ${description}
+homepage            http://sourceforge.net/projects/monarch
+platforms           darwin
+master_sites        sourceforge
+checksums           md5 68658989ff485ac58a42035c3a927362
+patchfiles          patch-nmap_scan-nmap_scan.c
+depends_build       port:nagios
+depends_lib         path:bin/mysql_config5:mysql5 \
+                    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
+use_configure       no
</ins><span class="cx"> build {}
</span><span class="cx"> 
</span><span class="cx"> variant server  {
</span><span class="lines">@@ -38,55 +39,55 @@
</span><span class="cx"> set monarchdir ${prefix}/groundwork/monarch
</span><span class="cx"> 
</span><span class="cx"> destroot {
</span><del>-        xinstall -m 755 -d ${destroot}${monarchdir}
-        system &quot;cp -R ${worksrcpath}/* ${destroot}${monarchdir}&quot;
</del><ins>+    xinstall -m 755 -d ${destroot}${monarchdir}
+    system &quot;cp -R ${worksrcpath}/* ${destroot}${monarchdir}&quot;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><del>-        eval reinplace &quot;s|/usr/bin/perl|${prefix}/bin/perl5.12|g&quot; \
-                [glob ${destroot}${monarchdir}/*.pl]
</del><ins>+    eval reinplace &quot;s|/usr/bin/perl|${prefix}/bin/perl5.12|g&quot; \
+        [glob ${destroot}${monarchdir}/*.pl]
</ins><span class="cx"> 
</span><del>-        eval reinplace &quot;s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g&quot; \
-                [glob ${destroot}${monarchdir}/*.cgi]
</del><ins>+    eval reinplace &quot;s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g&quot; \
+        [glob ${destroot}${monarchdir}/*.cgi]
</ins><span class="cx"> 
</span><del>-        eval reinplace &quot;s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g&quot; \
-                [glob ${destroot}${monarchdir}/*.p*]  
</del><ins>+    eval reinplace &quot;s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g&quot; \
+        [glob ${destroot}${monarchdir}/*.p*]  
</ins><span class="cx"> 
</span><del>-        eval reinplace &quot;s|/usr/local/groundwork/monarch|${monarchdir}|g&quot; \
-                [glob ${destroot}${monarchdir}/*.*]
</del><ins>+    eval reinplace &quot;s|/usr/local/groundwork/monarch|${monarchdir}|g&quot; \
+        [glob ${destroot}${monarchdir}/*.*]
</ins><span class="cx"> 
</span><span class="cx"> # Fix mysqldump location
</span><del>-        reinplace &quot;s|/usr/bin/mysqldump|${prefix}/bin/mysqldump5|g&quot; \
</del><ins>+    reinplace &quot;s|/usr/bin/mysqldump|${prefix}/bin/mysqldump5|g&quot; \
</ins><span class="cx">                 ${destroot}${monarchdir}/MonarchStorProc.pm
</span><span class="cx"> 
</span><span class="cx"> # Enable Nmap Scanner
</span><del>-        xinstall -m 755 -d ${destroot}${monarchdir}/bin
</del><ins>+    xinstall -m 755 -d ${destroot}${monarchdir}/bin
</ins><span class="cx"> 
</span><del>-        reinplace &quot;s|/usr/local/groundwork|${monarchdir}|g&quot; \
-                ${destroot}${monarchdir}/nmap_scan_one.pl
</del><ins>+    reinplace &quot;s|/usr/local/groundwork|${monarchdir}|g&quot; \
+        ${destroot}${monarchdir}/nmap_scan_one.pl
</ins><span class="cx"> 
</span><del>-        xinstall -m 755 ${destroot}${monarchdir}/nmap_scan_one.pl \
-                ${destroot}${monarchdir}/bin
</del><ins>+    xinstall -m 755 ${destroot}${monarchdir}/nmap_scan_one.pl \
+        ${destroot}${monarchdir}/bin
</ins><span class="cx"> 
</span><del>-        reinplace &quot;s|__PREFIX__|${prefix}|g&quot; \
-                ${worksrcpath}/nmap_scan/nmap_scan.c
</del><ins>+    reinplace &quot;s|__PREFIX__|${prefix}|g&quot; \
+        ${worksrcpath}/nmap_scan/nmap_scan.c
</ins><span class="cx"> 
</span><del>-        system &quot;cd ${worksrcpath}/nmap_scan &amp;&amp; gcc -g -O2 -Wall -o nmap_scan_one nmap_scan.c&quot;
</del><ins>+    system &quot;cd ${worksrcpath}/nmap_scan &amp;&amp; gcc -g -O2 -Wall -o nmap_scan_one nmap_scan.c&quot;
</ins><span class="cx"> 
</span><span class="cx"> # Install nmap_scan_one with mode 4750 and chown it to root (below) to allow normal user to run nmap with root privs
</span><del>-        xinstall -m 4750 ${worksrcpath}/nmap_scan/nmap_scan_one \
-                ${destroot}${monarchdir}/bin
</del><ins>+    xinstall -m 4750 ${worksrcpath}/nmap_scan/nmap_scan_one \
+        ${destroot}${monarchdir}/bin
</ins><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>+    file delete ${destroot}${monarchdir}/nmap_scan_one
+    file 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="cx"> # Set permissions &amp; modes
</span><del>-        system &quot;chown -R nagios:nagios ${destroot}${monarchdir}/*&quot;
-        system &quot;chmod +x ${destroot}${monarchdir}/*.cgi&quot;
-        system &quot;chown root ${destroot}${monarchdir}/bin/nmap_scan_one&quot;
</del><ins>+    system &quot;chown -R nagios:nagios ${destroot}${monarchdir}/*&quot;
+    system &quot;chmod +x ${destroot}${monarchdir}/*.cgi&quot;
+    system &quot;chown root ${destroot}${monarchdir}/bin/nmap_scan_one&quot;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> post-activate {
</span><span class="lines">@@ -112,36 +113,36 @@
</span><span class="cx">         Follow the instructions that were given after you executed 'mysql_install_db' above.
</span><span class="cx"> 
</span><span class="cx">    Create the Monarch MySQL user and password and set the account's permissions
</span><del>-        mysql5 -u root -p (login with new root password when prompted)
</del><ins>+    mysql5 -u root -p (login with new root password when prompted)
</ins><span class="cx">         mysql&gt; grant CREATE,INSERT,SELECT,DELETE,UPDATE on monarch.* to monarch@localhost;
</span><span class="cx">         mysql&gt; grant CREATE,INSERT,SELECT,DELETE,UPDATE on monarch.* to monarch;
</span><del>-        mysql&gt; SET PASSWORD FOR monarch@localhost = PASSWORD('my-password');
</del><ins>+    mysql&gt; SET PASSWORD FOR monarch@localhost = PASSWORD('my-password');
</ins><span class="cx">         mysql&gt; exit
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 3) Create the Monarch MySQL database and initialize it using monarch_setup.pl.
</span><span class="cx">    Login to MySQL and the create Monarch database
</span><del>-        mysql5 -u root -p (login with new root password when prompted)
</del><ins>+    mysql5 -u root -p (login with new root password when prompted)
</ins><span class="cx">         mysql&gt; create database monarch;
</span><span class="cx"> 
</span><span class="cx">    Run monarch_setup.pl
</span><del>-        cd ${monarchdir}
-        sudo ./monarch_setup.pl
</del><ins>+    cd ${monarchdir}
+    sudo ./monarch_setup.pl
</ins><span class="cx"> 
</span><span class="cx">    Responses for the monarch_setup.pl program
</span><del>-        What is the host name of your MySQL database server? - localhost
-        What is the name of the user that will have access to the database? - monarch
-        What is the password for user monarch to access the database monarch - &lt;my-password&gt;
-        What is the name of the database you will use for your Monarch installation? - monarch
-        Enter web server's user account - nagios
-        Enter web server's user group - nagios
-        Please enter your web server's relative path to cgi-bin - /cgi-bin
-        What is your web server's document root - /Library/WebServer/Documents
-        Enter the full path of your cgi-bin directory - /Library/WebServer/CGI-Executables/
-        Enter the full installation path for Monarch - ${monarchdir}
-        Enter the full path to your nagios.cfg file - ${prefix}/etc/nagios
-        Enter the full path to your nagios binary file - ${prefix}/bin
-        
</del><ins>+    What is the host name of your MySQL database server? - localhost
+    What is the name of the user that will have access to the database? - monarch
+    What is the password for user monarch to access the database monarch - &lt;my-password&gt;
+    What is the name of the database you will use for your Monarch installation? - monarch
+    Enter web server's user account - nagios
+    Enter web server's user group - nagios
+    Please enter your web server's relative path to cgi-bin - /cgi-bin
+    What is your web server's document root - /Library/WebServer/Documents
+    Enter the full path of your cgi-bin directory - /Library/WebServer/CGI-Executables/
+    Enter the full installation path for Monarch - ${monarchdir}
+    Enter the full path to your nagios.cfg file - ${prefix}/etc/nagios
+    Enter the full path to your nagios binary file - ${prefix}/bin
+    
</ins><span class="cx">    Verify Monarch DB:
</span><span class="cx">         mysql5 -u root -p
</span><span class="cx">         mysql&gt; use monarch;
</span><span class="lines">@@ -157,8 +158,8 @@
</span><span class="cx"> 4) Set your Apache user and group to the Nagios user
</span><span class="cx">         sudo pico /etc/httpd/httpd.conf
</span><span class="cx">         
</span><del>-        user nagios
-        group nagios
</del><ins>+    user nagios
+    group nagios
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 5) Initial Monarch setup at http://localhost/cgi-bin/monarch.cgi
</span><span class="lines">@@ -195,4 +196,4 @@
</span><span class="cx"> \n&quot;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-livecheck.regex         &quot;${name}-(\\d+(?:\\.\\d+)*)\\.tar&quot;
</del><ins>+livecheck.regex     &quot;${name}-(\\d+(?:\\.\\d+)*)\\.tar&quot;
</ins></span></pre>
</div>
</div>

</body>
</html>