Update to dnsmasq-2.59

When building DBus support, install the config file for DBus

Notable Changes from 2.55:
IPv6 interface fixes
Fixed an invalid server id of 0.0.0.0 being sent in some situations
Correctly return NODATA for an AAAA query to a CNAME with only an A
Fixed a bug with some truncated TFTP files
Support IPv6 scope ids in resolv.conf

4 files changed, 29 insertions, 25 deletions

diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index db3e78fc016..48b7072d8aa 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/11/27 13:24:47 roy Exp $
+# $NetBSD: Makefile,v 1.16 2012/01/31 12:39:22 roy Exp $
 #
 
-DISTNAME=		dnsmasq-2.55
+DISTNAME=		dnsmasq-2.59
 CATEGORIES=		net
 MASTER_SITES=		http://www.thekelleys.org.uk/dnsmasq/
 
@@ -14,8 +14,24 @@ CONF_FILES=		${PREFIX}/share/examples/dnsmasq/dnsmasq.conf.example \
 			${PKG_SYSCONFDIR}/dnsmasq.conf
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dnsmasq
+PKG_SUPPORTED_OPTIONS=	dbus inet6
+PLIST_VARS+=	dbus
 
-.include "options.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdbus)
+USE_TOOLS+=	pkg-config
+CFLAGS+=	-DHAVE_DBUS
+.include "../../sysutils/dbus/buildlink3.mk"
+CONF_FILES+=	${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf \
+		${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf
+PLIST.dbus=	yes
+.endif
+
+.if empty(PKG_OPTIONS:Minet6)
+CFLAGS+=	-DNO_IPV6
+.endif
 
 # Override the defaults
 AUTO_MKDIRS=yes
@@ -32,5 +48,9 @@ INSTALL_MAKE_FLAGS+=	AWK="${AWK}"
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example \
 		${DESTDIR}${PREFIX}/share/examples/dnsmasq/
+.if !empty(PKG_OPTIONS:Mdbus)
+	${INSTALL_DATA} ${WRKSRC}/dbus/dnsmasq.conf \
+		${DESTDIR}${PREFIX}/share/examples/dnsmasq/dnsmasq-dbus.conf
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dnsmasq/PLIST b/net/dnsmasq/PLIST
index d881ec46d61..e4124b07a95 100644
--- a/net/dnsmasq/PLIST
+++ b/net/dnsmasq/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/01/31 12:39:22 roy Exp $
 man/man8/dnsmasq.8
 sbin/dnsmasq
 share/examples/dnsmasq/dnsmasq.conf.example
 share/examples/rc.d/dnsmasq
+${PLIST.dbus}share/examples/dnsmasq/dnsmasq-dbus.conf
diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo
index 126a5de1521..a3c222c3db0 100644
--- a/net/dnsmasq/distinfo
+++ b/net/dnsmasq/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2010/11/27 13:24:47 roy Exp $
+$NetBSD: distinfo,v 1.15 2012/01/31 12:39:22 roy Exp $
 
-SHA1 (dnsmasq-2.55.tar.gz) = 6a9fb6b43847e47d07cbe304e99a04b960942068
-RMD160 (dnsmasq-2.55.tar.gz) = 0618521572a819c8ee20348cebb56b5841a6d911
-Size (dnsmasq-2.55.tar.gz) = 438852 bytes
+SHA1 (dnsmasq-2.59.tar.gz) = 9302f38d12d00823d20cc9127090508b4876c5ae
+RMD160 (dnsmasq-2.59.tar.gz) = d2ed855f4fc1707df323ddac027ab8fd0770b827
+Size (dnsmasq-2.59.tar.gz) = 474036 bytes
diff --git a/net/dnsmasq/options.mk b/net/dnsmasq/options.mk
deleted file mode 100644
index 383476a1e42..00000000000
--- a/net/dnsmasq/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2009/03/18 21:58:26 roy Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.dnsmasq
-
-PKG_SUPPORTED_OPTIONS=	dbus inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdbus)
-USE_TOOLS+=	pkg-config
-CFLAGS+=	-DHAVE_DBUS
-.include "../../sysutils/dbus/buildlink3.mk"
-.endif
-
-.if empty(PKG_OPTIONS:Minet6)
-CFLAGS+=	-DNO_IPV6
-.endif