<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[30362] trunk/dports/net/nedi</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/30362">30362</a></dd>
<dt>Author</dt> <dd>markd@macports.org</dd>
<dt>Date</dt> <dd>2007-10-25 12:05:34 -0700 (Thu, 25 Oct 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use startupitem.pidfile option "clean".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetnediPortfile">trunk/dports/net/nedi/Portfile</a></li>
<li><a href="#trunkdportsnetnedifilesorgmacportsnedisyslogplist">trunk/dports/net/nedi/files/org.macports.nedisyslog.plist</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetnediPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nedi/Portfile (30361 => 30362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nedi/Portfile 2007-10-25 18:31:51 UTC (rev 30361)
+++ trunk/dports/net/nedi/Portfile 2007-10-25 19:05:34 UTC (rev 30362)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name nedi
</span><span class="cx"> version 1.0.w
</span><del>-revision 8
</del><ins>+revision 9
</ins><span class="cx"> categories net
</span><span class="cx"> maintainers markd
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> startupitem.create yes
</span><span class="cx"> startupitem.name nedimonitor
</span><del>-startupitem.pidfile manual "${prefix}/var/run/${name}/nedimonitor.pid"
</del><ins>+startupitem.pidfile clean "${prefix}/var/run/${name}/nedimonitor.pid"
</ins><span class="cx"> startupitem.start "${nedimonitorbin} & echo \$! > ${nedimonitorpid}"
</span><span class="cx"> startupitem.stop "/bin/kill \$(cat ${nedimonitorpid})"
</span><span class="cx">
</span><span class="lines">@@ -89,22 +89,21 @@
</span><span class="cx"> # Create directory for rrd files
</span><span class="cx"> xinstall -m 755 -d ${destroot}${prefix}/share/${name}/rrd
</span><span class="cx">
</span><ins>+# Create directory for the startupitem pid files
+ xinstall -m 755 -d ${destroot}${prefix}/var/run/${name}
+
</ins><span class="cx"> # Keep these empty directories
</span><span class="cx"> destroot.keepdirs \
</span><span class="cx"> ${destroot}${prefix}/share/${name}/db/cfg \
</span><span class="cx"> ${destroot}${prefix}/share/${name}/html/log \
</span><del>- ${destroot}${prefix}/share/${name}/rrd
</del><ins>+ ${destroot}${prefix}/share/${name}/rrd \
+ ${destroot}${prefix}/var/run/${name}
</ins><span class="cx">
</span><span class="cx"> # Rename nedi.conf to nedi.conf.sample so port upgrades don't overwrite an installed nedi.conf
</span><span class="cx"> # Also set permissions on nedi.conf because it has passwords.
</span><span class="cx"> file rename ${destroot}${prefix}/share/${name}/nedi.conf \
</span><span class="cx"> ${destroot}${prefix}/share/${name}/nedi.conf.sample
</span><span class="cx"> system "chmod 600 ${destroot}${prefix}/share/${name}/nedi.conf.sample"
</span><del>-
-# Create files to track PIDs for moni.pl and syslog.pl daemons
- file mkdir ${destroot}${prefix}/var/run/${name}
- touch ${destroot}${prefix}/var/run/${name}/nedimonitor.pid
- touch ${destroot}${prefix}/var/run/${name}/nedisyslog.pid
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-install {
</span></span></pre></div>
<a id="trunkdportsnetnedifilesorgmacportsnedisyslogplist"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nedi/files/org.macports.nedisyslog.plist (30361 => 30362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nedi/files/org.macports.nedisyslog.plist 2007-10-25 18:31:51 UTC (rev 30361)
+++ trunk/dports/net/nedi/files/org.macports.nedisyslog.plist 2007-10-25 19:05:34 UTC (rev 30362)
</span><span class="lines">@@ -19,7 +19,8 @@
</span><span class="cx"> <string>__PREFIX__/etc/LaunchDaemons/org.macports.nedisyslog/nedisyslog.wrapper</string>
</span><span class="cx"> <string>restart</string>
</span><span class="cx"> <string>;</string>
</span><del>- <string>--pid=exec</string>
</del><ins>+ <string>--verbosity=1</string>
+ <string>--pid=fileclean</string>
</ins><span class="cx"> <string>--pidfile</string>
</span><span class="cx"> <string>__PREFIX__/var/run/nedi/nedisyslog.pid</string>
</span><span class="cx"> </array>
</span></span></pre>
</div>
</div>
</body>
</html>