diff options
| author | ahoka <ahoka@pkgsrc.org> | 2008-09-25 20:33:53 +0000 |
|---|---|---|
| committer | ahoka <ahoka@pkgsrc.org> | 2008-09-25 20:33:53 +0000 |
| commit | 77d7f0073066928b007d057515bad04a01e177d5 (patch) | |
| tree | c216a470295387982df7336a27fa370b66e997bd /net/dnsmasq/patches | |
| parent | 3787c75e04330ee8a31fbbc8d2aea91d79be5331 (diff) | |
| download | pkgsrc-77d7f0073066928b007d057515bad04a01e177d5.tar.gz | |
Make it look for it's config file at the right place.
Diffstat (limited to 'net/dnsmasq/patches')
| -rw-r--r-- | net/dnsmasq/patches/patch-ab | 27 | ||||
| -rw-r--r-- | net/dnsmasq/patches/patch-ac | 10 |
2 files changed, 37 insertions, 0 deletions
diff --git a/net/dnsmasq/patches/patch-ab b/net/dnsmasq/patches/patch-ab new file mode 100644 index 00000000000..ecd4987394c --- /dev/null +++ b/net/dnsmasq/patches/patch-ab @@ -0,0 +1,27 @@ +$NetBSD: patch-ab,v 1.1 2008/09/25 20:33:53 ahoka Exp $ + +--- src/config.h.orig 2008-07-20 20:26:32.000000000 +0200 ++++ src/config.h +@@ -38,17 +38,19 @@ + # define RESOLVFILE "/etc/resolv.conf" + #endif + #define RUNFILE "/var/run/dnsmasq.pid" +-#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__) ++#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 +-#if defined(__FreeBSD__) ++#ifndef CONFFILE ++# if defined(__FreeBSD__) + # define CONFFILE "/usr/local/etc/dnsmasq.conf" +-#else ++# else + # define CONFFILE "/etc/dnsmasq.conf" ++# endif + #endif + #define DEFLEASE 3600 /* default lease time, 1 hour */ + #define CHUSER "nobody" diff --git a/net/dnsmasq/patches/patch-ac b/net/dnsmasq/patches/patch-ac new file mode 100644 index 00000000000..69f4833cc52 --- /dev/null +++ b/net/dnsmasq/patches/patch-ac @@ -0,0 +1,10 @@ +$NetBSD: patch-ac,v 1.1 2008/09/25 20:33:53 ahoka Exp $ + +--- bld/Makefile.orig 2008-07-20 20:26:07.000000000 +0200 ++++ bld/Makefile +@@ -1,4 +1,4 @@ +-CFLAGS = -Wall -W -O2 ++CFLAGS += -Wall -W -O2 + + OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \ + dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \ |