head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.10
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.8
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.6
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.4
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.2
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.2.0.2
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.1.0.2
	pkgsrc-2008Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2009.02.19.11.17.19;	author roy;	state dead;
branches;
next	1.2;

1.2
date	2008.12.19.07.53.43;	author roy;	state Exp;
branches;
next	1.1;

1.1
date	2008.09.25.20.33.53;	author ahoka;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to dnsmasq-2.47

Fixes from 2.46 include:
 * NetBSD-5 support
 * Better duplicate IPv6 address detection
 * DBus introspection
 * work with blank lines in /etc/ethers
@
text
@$NetBSD: patch-ab,v 1.2 2008/12/19 07:53:43 roy Exp $

--- src/config.h	2008-11-10 21:47:46.000000000 +0000
+++ src/config.h	2008-11-18 20:51:27.000000000 +0000
@@@@ -38,18 +38,25 @@@@
 #  define RESOLVFILE "/etc/resolv.conf"
 #endif
 #define RUNFILE "/var/run/dnsmasq.pid"
-#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
-#   define LEASEFILE "/var/db/dnsmasq.leases"
-#elif defined(__sun__) || defined (__sun)
-#   define LEASEFILE "/var/cache/dnsmasq.leases"
-#else
-#   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
-#endif
-#if defined(__FreeBSD__)
-#   define CONFFILE "/usr/local/etc/dnsmasq.conf"
-#else
-#   define CONFFILE "/etc/dnsmasq.conf"
+
+#ifndef LEASEFILE
+#   if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+#      define LEASEFILE "/var/db/dnsmasq.leases"
+#   elif defined (__sun)
+#      define LEASEFILE "/var/cache/dnsmasq.leases"
+#   else
+#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+#   endif
+#endif
+
+#ifndef CONFFILE
+#   if defined(__FreeBSD__)
+#      define CONFFILE "/usr/local/etc/dnsmasq.conf"
+#   else
+#      define CONFFILE "/etc/dnsmasq.conf"
+#   endif
 #endif
+
 #define DEFLEASE 3600 /* default lease time, 1 hour */
 #define CHUSER "nobody"
 #define CHGRP "dip"
@


1.2
log
@Update to dnsmasq-2.46
Noteable changes include:
   NetBSD-5 support
   Optional DBus and IPv6 support
   ISC leasefile support removed
   Support DHCP clients in multiple DNS domains
   Re-read /etc/resolv.conf when an "interface up" event occurs
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Make it look for it's config file at the right place.
@
text
@d3 3
a5 3
--- src/config.h.orig	2008-07-20 20:26:32.000000000 +0200
+++ src/config.h
@@@@ -38,17 +38,19 @@@@
d10 6
a15 7
+#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
 #   define LEASEFILE "/var/db/dnsmasq.leases"
 #elif defined(__sun__) || defined (__sun)
 #   define LEASEFILE "/var/cache/dnsmasq.leases"
 #else
 #   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
 #endif
d17 14
d32 5
a36 6
+# if defined(__FreeBSD__)
 #   define CONFFILE "/usr/local/etc/dnsmasq.conf"
-#else
+# else
 #   define CONFFILE "/etc/dnsmasq.conf"
+# endif
d38 1
d41 1
@