[30325] trunk/dports/net/nedi

[source_changes at macosforge.org]

Revision: 30325
          http://trac.macosforge.org/projects/macports/changeset/30325
Author:   markd at macports.org
Date:     2007-10-24 14:12:34 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
Add plist and wrapper elements for syslog.pl so daemondo v1.1 can restart it if it dies.

Modified Paths:
--------------
    trunk/dports/net/nedi/Portfile
    trunk/dports/net/nedi/files/nedisyslog.wrapper
    trunk/dports/net/nedi/files/org.macports.nedisyslog.plist

Modified: trunk/dports/net/nedi/Portfile
===================================================================
--- trunk/dports/net/nedi/Portfile	2007-10-24 21:04:54 UTC (rev 30324)
+++ trunk/dports/net/nedi/Portfile	2007-10-24 21:12:34 UTC (rev 30325)
@@ -4,7 +4,7 @@
 
 name			nedi
 version			1.0.w
-revision		7
+revision		8
 categories		net
 maintainers		markd
 platforms		darwin
@@ -48,7 +48,7 @@
 
 startupitem.create	yes
 startupitem.name	nedimonitor
-startupitem.pidfile	clean "${prefix}/var/run/${name}/nedimonitor.pid"
+startupitem.pidfile	manual "${prefix}/var/run/${name}/nedimonitor.pid"
 startupitem.start	"${nedimonitorbin} & echo \$! > ${nedimonitorpid}"
 startupitem.stop	"/bin/kill \$(cat ${nedimonitorpid})"
 
@@ -101,9 +101,10 @@
 		${destroot}${prefix}/share/${name}/nedi.conf.sample
 		system "chmod 600 ${destroot}${prefix}/share/${name}/nedi.conf.sample"
 
-# Create a file to hold moni.pl's PID
+# 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}/${startupitem.name}.pid
+	touch ${destroot}${prefix}/var/run/${name}/nedimonitor.pid
+	touch ${destroot}${prefix}/var/run/${name}/nedisyslog.pid
 }
 
 pre-install {

Modified: trunk/dports/net/nedi/files/nedisyslog.wrapper
===================================================================
--- trunk/dports/net/nedi/files/nedisyslog.wrapper	2007-10-24 21:04:54 UTC (rev 30324)
+++ trunk/dports/net/nedi/files/nedisyslog.wrapper	2007-10-24 21:12:34 UTC (rev 30325)
@@ -6,14 +6,14 @@
 #
 # Init
 #
-prefix=/opt/local
+prefix=__PREFIX__
 
 #
 # Start
 #
 Start()
 {
-        __PREFIX__/share/nedi/syslog.pl
+        __PREFIX__/share/nedi/syslog.pl & echo $! > __PREFIX__/var/run/nedi/nedisyslog.pid
 }
 
 #
@@ -21,7 +21,7 @@
 #
 Stop()
 {
-        sh /opt/local/etc/startup/nedi.sh stop
+        /bin/kill $(cat __PREFIX__/var/run/nedi/nedisyslog.pid)
 }
 
 #

Modified: trunk/dports/net/nedi/files/org.macports.nedisyslog.plist
===================================================================
--- trunk/dports/net/nedi/files/org.macports.nedisyslog.plist	2007-10-24 21:04:54 UTC (rev 30324)
+++ trunk/dports/net/nedi/files/org.macports.nedisyslog.plist	2007-10-24 21:12:34 UTC (rev 30325)
@@ -24,7 +24,8 @@
                 <string>__PREFIX__/etc/LaunchDaemons/org.macports.nedisyslog/nedisyslog.wrapper</string>
                 <string>restart</string>
                 <string>;</string>
-                <string>--pid=none</string>
+                <string>__PREFIX__/var/run/nedi/nedisyslog.pid</string>
+                <string>--pid=filemanual</string>
         </array>
         <key>RunAtLoad</key>
         <false/>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071024/1cf664ae/attachment-0001.html