diff options
-rw-r--r-- | net/dnsmasq/Makefile | 39 | ||||
-rw-r--r-- | net/dnsmasq/PLIST | 4 | ||||
-rw-r--r-- | net/dnsmasq/distinfo | 11 | ||||
-rw-r--r-- | net/dnsmasq/options.mk | 22 | ||||
-rw-r--r-- | net/dnsmasq/patches/patch-dnsmasq.conf.example | 16 |
5 files changed, 40 insertions, 52 deletions
diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index ed702c8643e..43bd7e61765 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.33 2016/11/08 11:59:05 mef Exp $ +# $NetBSD: Makefile,v 1.34 2017/06/02 08:37:49 adam Exp $ -DISTNAME= dnsmasq-2.76 -CATEGORIES= net -MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ +DISTNAME= dnsmasq-2.77 +CATEGORIES= net +MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ +EXTRACT_SUFX= .tar.xz -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html -COMMENT= Lightweight, easy to configure DNS forwarder -LICENSE= gnu-gpl-v3 +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.thekelleys.org.uk/dnsmasq/doc.html +COMMENT= Lightweight, easy to configure DNS forwarder +LICENSE= gnu-gpl-v3 RCD_SCRIPTS= dnsmasq EGDIR= ${PREFIX}/share/examples/dnsmasq @@ -24,27 +25,9 @@ DNSMASQ_GROUP?= dnsmasq PKG_GROUPS= ${DNSMASQ_GROUP} PKG_USERS= ${DNSMASQ_USER}:${DNSMASQ_GROUP} -PKG_GECOS.${DNSMASQ_USER}= DNS\ forwarder\ user +PKG_GECOS.${DNSMASQ_USER}=DNS\ forwarder\ user -PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq -PKG_SUPPORTED_OPTIONS= dbus inet6 -PKG_SUGGESTED_OPTIONS= inet6 -PLIST_VARS+= dbus - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mdbus) -USE_TOOLS+= pkg-config -CFLAGS+= -DHAVE_DBUS -.include "../../sysutils/dbus/buildlink3.mk" -CONF_FILES+= ${EGDIR}/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 +.include "options.mk" CFLAGS.SunOS+= -DNO_IPSET diff --git a/net/dnsmasq/PLIST b/net/dnsmasq/PLIST index 26fde885ff5..0c9317877fa 100644 --- a/net/dnsmasq/PLIST +++ b/net/dnsmasq/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:07 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.5 2017/06/02 08:37:49 adam Exp $ man/man8/dnsmasq.8 sbin/dnsmasq -share/examples/dnsmasq/dnsmasq.conf.example ${PLIST.dbus}share/examples/dnsmasq/dnsmasq-dbus.conf +share/examples/dnsmasq/dnsmasq.conf.example diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo index 739f8a1fb49..43fa036196d 100644 --- a/net/dnsmasq/distinfo +++ b/net/dnsmasq/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.32 2017/03/21 09:18:15 fhajny Exp $ +$NetBSD: distinfo,v 1.33 2017/06/02 08:37:49 adam Exp $ -SHA1 (dnsmasq-2.76.tar.gz) = 3cb264e2505a06705203d616883db5ee6ac00026 -RMD160 (dnsmasq-2.76.tar.gz) = ad7c271b90c8aaeb6f642eb63539cc5c52d7f9a7 -SHA512 (dnsmasq-2.76.tar.gz) = c22627a8d864671096d3b3428ec4f879b513e1f1e7f79be3ab89444c56234e748fbfa6b6b4f9e521984fea95d363f4aa2ca6243f0dfc12ffb74bed0648ae21c5 -Size (dnsmasq-2.76.tar.gz) = 697191 bytes -SHA1 (patch-dnsmasq.conf.example) = 2974c722a26400915037259c79899e8a3e95bf8f +SHA1 (dnsmasq-2.77.tar.xz) = 7afdb6bb017d67576cd3603c69070235a9dce57c +RMD160 (dnsmasq-2.77.tar.xz) = eb47de3dca460f972d6641285db11707fcde3cd8 +SHA512 (dnsmasq-2.77.tar.xz) = 6ca98a71a8fdfd606e29c58b34dadfa63148c39f931570cca67a287e044d52c6ec2f8acbf5620ada3312e9db3a2fd63877188d829c070beaa730607e3309e768 +Size (dnsmasq-2.77.tar.xz) = 487244 bytes SHA1 (patch-src_bpf.c) = 05dc64c016c608e6b963ce9ee80c28e872a88f9e diff --git a/net/dnsmasq/options.mk b/net/dnsmasq/options.mk new file mode 100644 index 00000000000..02fad09dcc6 --- /dev/null +++ b/net/dnsmasq/options.mk @@ -0,0 +1,22 @@ +# $NetBSD: options.mk,v 1.4 2017/06/02 08:37:49 adam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.dnsmasq +PKG_SUPPORTED_OPTIONS= dbus inet6 +PKG_SUGGESTED_OPTIONS= inet6 + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= dbus + +.if !empty(PKG_OPTIONS:Mdbus) +USE_TOOLS+= pkg-config +CFLAGS+= -DHAVE_DBUS +CONF_FILES+= ${EGDIR}/dnsmasq-dbus.conf \ + ${PKG_SYSCONFDIR}/dbus-1/system.d/dnsmasq-dbus.conf +PLIST.dbus= yes +.include "../../sysutils/dbus/buildlink3.mk" +.endif + +.if empty(PKG_OPTIONS:Minet6) +CFLAGS+= -DNO_IPV6 +.endif diff --git a/net/dnsmasq/patches/patch-dnsmasq.conf.example b/net/dnsmasq/patches/patch-dnsmasq.conf.example deleted file mode 100644 index 37858f8f080..00000000000 --- a/net/dnsmasq/patches/patch-dnsmasq.conf.example +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dnsmasq.conf.example,v 1.2 2014/11/23 13:16:23 cheusov Exp $ - -# We provide user:group "dnsmasq:dnsmasq" ---- dnsmasq.conf.example.orig 2013-10-25 09:37:30.000000000 +0000 -+++ dnsmasq.conf.example -@@ -84,8 +84,8 @@ - - # If you want dnsmasq to change uid and gid to something other - # than the default, edit the following lines. --#user= --#group= -+#user=dnsmasq -+#group=dnsmasq - - # If you want dnsmasq to listen for DHCP and DNS requests only on - # specified interfaces (and the loopback) give the name of the |