[86875] trunk/dports/net/dnsmasq

[snc at macports.org]

Revision: 86875
          http://trac.macports.org/changeset/86875
Author:   snc at macports.org
Date:     2011-11-06 09:16:34 -0800 (Sun, 06 Nov 2011)
Log Message:
-----------
dnsmasq: put PID file in a writable directory, #31931

Modified Paths:
--------------
    trunk/dports/net/dnsmasq/Portfile
    trunk/dports/net/dnsmasq/files/patch-src-config.h.diff

Modified: trunk/dports/net/dnsmasq/Portfile
===================================================================
--- trunk/dports/net/dnsmasq/Portfile	2011-11-06 16:37:57 UTC (rev 86874)
+++ trunk/dports/net/dnsmasq/Portfile	2011-11-06 17:16:34 UTC (rev 86875)
@@ -5,6 +5,7 @@
 
 name                dnsmasq
 version             2.59
+revision            1
 categories          net
 license             GPL
 maintainers         snc openmaintainer
@@ -48,7 +49,7 @@
 use_configure       no
 
 destroot.args       PREFIX=${prefix}
-destroot.keepdirs   ${destroot}${prefix}/var/run
+destroot.keepdirs   ${destroot}${prefix}/var/run/${name}
 
 livecheck.type      regex
 livecheck.url       ${master_sites}
@@ -78,7 +79,7 @@
     }
 
     # Create the directory that dnsmasq likes to store its pid in.
-    xinstall -d -m 755 ${destroot}${prefix}/var/run
+    xinstall -d -m 777 ${destroot}${prefix}/var/run/${name}
 
     #
     # Set up a launchd item.  The daemondo wrapper is not needed.

Modified: trunk/dports/net/dnsmasq/files/patch-src-config.h.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2011-11-06 16:37:57 UTC (rev 86874)
+++ trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2011-11-06 17:16:34 UTC (rev 86875)
@@ -8,7 +8,7 @@
 +#  define RESOLVFILE "@PREFIX@/etc/resolv.conf"
  #endif
 -#define RUNFILE "/var/run/dnsmasq.pid"
-+#define RUNFILE "@PREFIX@/var/run/dnsmasq.pid"
++#define RUNFILE "@PREFIX@/var/run/dnsmasq/dnsmasq.pid"
  
  #ifndef LEASEFILE
  #   if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111106/e646d07e/attachment.html>