[51349] trunk/dports/net/dnsmasq/files

[snc at macports.org]

Revision: 51349
          http://trac.macports.org/changeset/51349
Author:   snc at macports.org
Date:     2009-05-23 02:20:40 -0700 (Sat, 23 May 2009)
Log Message:
-----------
forgotten patch file changes

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

Removed Paths:
-------------
    trunk/dports/net/dnsmasq/files/patch-config.h.diff

Deleted: trunk/dports/net/dnsmasq/files/patch-config.h.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-config.h.diff	2009-05-23 08:53:46 UTC (rev 51348)
+++ trunk/dports/net/dnsmasq/files/patch-config.h.diff	2009-05-23 09:20:40 UTC (rev 51349)
@@ -1,35 +0,0 @@
---- src/config.h.old	2008-08-01 00:43:35.000000000 -0400
-+++ src/config.h	2008-08-01 00:44:07.000000000 -0400
-@@ -37,18 +37,26 @@
- #else
- #  define RESOLVFILE "/etc/resolv.conf"
- #endif
--#define RUNFILE "/var/run/dnsmasq.pid"
-+#ifdef __APPLE__
-+#  define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
-+#else
-+#define RUNFILE "__PREFIX__/var/run/dnsmasq.pid"
-+#endif
- #if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
--#   define LEASEFILE "/var/db/dnsmasq.leases"
-+#   define LEASEFILE "__PREFIX__/var/db/dnsmasq.leases"
-+#elif __APPLE__
-+#   define LEASEFILE "__PREFIX__/var/db/dnsmasq.leases"
- #elif defined(__sun__) || defined (__sun)
--#   define LEASEFILE "/var/cache/dnsmasq.leases"
-+#   define LEASEFILE "__PREFIX__/var/cache/dnsmasq.leases"
- #else
--#   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
-+#   define LEASEFILE "__PREFIX__/var/lib/misc/dnsmasq.leases"
- #endif
- #if defined(__FreeBSD__)
--#   define CONFFILE "/usr/local/etc/dnsmasq.conf"
-+#   define CONFFILE "__PREFIX__/usr/local/etc/dnsmasq.conf"
-+#elif __APPLE__
-+#   define CONFFILE "__PREFIX__/etc/dnsmasq.conf"
- #else
--#   define CONFFILE "/etc/dnsmasq.conf"
-+#   define CONFFILE "__PREFIX__/etc/dnsmasq.conf"
- #endif
- #define DEFLEASE 3600 /* default lease time, 1 hour */
- #define CHUSER "nobody"

Added: trunk/dports/net/dnsmasq/files/patch-src-config.h.diff
===================================================================
--- trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	                        (rev 0)
+++ trunk/dports/net/dnsmasq/files/patch-src-config.h.diff	2009-05-23 09:20:40 UTC (rev 51349)
@@ -0,0 +1,32 @@
+--- src/config.h.orig	2009-05-23 01:49:58.000000000 -0400
++++ src/config.h	2009-05-23 01:50:48.000000000 -0400
+@@ -35,9 +35,9 @@
+ #ifdef __uClinux__
+ #  define RESOLVFILE "/etc/config/resolv.conf"
+ #else
+-#  define RESOLVFILE "/etc/resolv.conf"
++#  define RESOLVFILE "@PREFIX@/etc/resolv.conf"
+ #endif
+-#define RUNFILE "/var/run/dnsmasq.pid"
++#define RUNFILE "@PREFIX@/var/run/dnsmasq.pid"
+ 
+ #ifndef LEASEFILE
+ #   if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+@@ -45,7 +45,7 @@
+ #   elif defined(__sun__) || defined (__sun)
+ #      define LEASEFILE "/var/cache/dnsmasq.leases"
+ #   else
+-#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
++#      define LEASEFILE "@PREFIX@/var/lib/misc/dnsmasq.leases"
+ #   endif
+ #endif
+ 
+@@ -53,7 +53,7 @@
+ #   if defined(__FreeBSD__)
+ #      define CONFFILE "/usr/local/etc/dnsmasq.conf"
+ #   else
+-#      define CONFFILE "/etc/dnsmasq.conf"
++#      define CONFFILE "@PREFIX@/etc/dnsmasq.conf"
+ #   endif
+ #endif
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090523/9c80eea2/attachment-0001.html>