diff options
| -rw-r--r-- | net/dnsmasq/Makefile | 5 | ||||
| -rw-r--r-- | net/dnsmasq/distinfo | 4 | ||||
| -rw-r--r-- | net/dnsmasq/patches/patch-ab | 27 | ||||
| -rw-r--r-- | net/dnsmasq/patches/patch-ac | 10 |
4 files changed, 44 insertions, 2 deletions
diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index 99489e279b1..80a475e95f4 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2008/07/23 23:46:08 tonnerre Exp $ +# $NetBSD: Makefile,v 1.6 2008/09/25 20:33:53 ahoka Exp $ # DISTNAME= dnsmasq-2.45 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ @@ -14,6 +15,8 @@ USE_TOOLS+= gmake RCD_SCRIPTS= dnsmasq CONF_FILES= ${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \ ${PKG_SYSCONFDIR}/dnsmasq.conf + +CFLAGS+= -DCONFFILE=\"${PKG_SYSCONFDIR}/dnsmasq.conf\" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq ${INSTALL} ${WRKSRC}/dnsmasq.conf.example \ diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo index 674994b1ded..fb5c438fd75 100644 --- a/net/dnsmasq/distinfo +++ b/net/dnsmasq/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.4 2008/07/23 23:46:08 tonnerre Exp $ +$NetBSD: distinfo,v 1.5 2008/09/25 20:33:53 ahoka Exp $ SHA1 (dnsmasq-2.45.tar.gz) = 12f8cffd657f674fbf4bf4f670a0dcb65ea4a5ae RMD160 (dnsmasq-2.45.tar.gz) = b8ebf9dfeff26c18664a917cd32cb9b6a53852cb Size (dnsmasq-2.45.tar.gz) = 380877 bytes SHA1 (patch-aa) = f6d1d9d80a283d4270950031ec67c0b4e37920d7 +SHA1 (patch-ab) = 7bb6cb585f813a5fe9eddfdedda71a14740d8c4d +SHA1 (patch-ac) = a07c71502399a7835cbb8b8e5136553305113e6e 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 \ |