dns/dnsmasq-devel: Update to 2.81rc3 (from rc2).

Git changelog:
* 46bdfe6 2020-03-08 | Fix error in IPv6 prefix calculation. (HEAD -> master, tag: v2.81rc3, origin/master, origin/HEAD) [Petr Menšík]
* dded78b 2020-03-08 | Add DHCPv6 ntp-server (56) option handling. [Vladislav Grishenko]
* b594e8d 2020-03-06 | rfc3315: fix incorrect logical '&&' warning [Kevin Darbyshire-Bryant]
* 70c50ef 2020-03-06 | suppress non linux network unused var warnings [Kevin Darbyshire-Bryant]
* ea3c60a 2020-03-08 | Diverge error handling between *BSD and Linux. [Brad Smith]

Replace patch-Makefile by a $REINPLACE_CMD that support
nondefault lua versions 5.1 and 5.3, too.

Remove patch-src_rfc3315.c, same as b594e8d but written independently.

4 files changed, 7 insertions, 28 deletions

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 4cb173c20648..be114c422757 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.81rc2
+DISTVERSION=	2.81rc3
 PORTEPOCH=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
@@ -107,6 +107,9 @@ pre-configure: pretty-print-config
 .endif
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e '/^lua_/s/lua5\.2/lua-${LUA_VER}/' ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index 43b024be498d..ed56597b2e6d 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583457946
-SHA256 (dnsmasq-2.81rc2.tar.xz) = 218a5414836c0a553b57f5506d001f48b5eadc869d0fa21499ab1cdca75c1912
-SIZE (dnsmasq-2.81rc2.tar.xz) = 527860
+TIMESTAMP = 1583787383
+SHA256 (dnsmasq-2.81rc3.tar.xz) = c516904cec0ecb45b02ae7c192a4f08a59f734c7a332c15b26b44ffa3ae2925e
+SIZE (dnsmasq-2.81rc3.tar.xz) = 528068
diff --git a/dns/dnsmasq-devel/files/patch-Makefile b/dns/dnsmasq-devel/files/patch-Makefile
deleted file mode 100644
index ecbfbaa41d47..000000000000
--- a/dns/dnsmasq-devel/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2020-03-05 22:13:45 UTC
-+++ Makefile
-@@ -60,8 +60,8 @@ idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrappe
- idn2_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
- ct_cflags =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
- ct_libs =       `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
--lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` 
--lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` 
-+lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua-5.2` 
-+lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua-5.2` 
- nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`
- nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
- gmp_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
diff --git a/dns/dnsmasq-devel/files/patch-src_rfc3315.c b/dns/dnsmasq-devel/files/patch-src_rfc3315.c
deleted file mode 100644
index 654fee8278ae..000000000000
--- a/dns/dnsmasq-devel/files/patch-src_rfc3315.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rfc3315.c.orig	2020-03-05 22:13:45 UTC
-+++ src/rfc3315.c
-@@ -1708,7 +1708,7 @@ static int config_valid(struct dhcp_config *config, st
-     return 0;
- 
-   for (addr_list = config->addr6; addr_list; addr_list = addr_list->next)
--    if (!(addr_list->flags && ADDRLIST_DECLINED) ||
-+    if (!(addr_list->flags & ADDRLIST_DECLINED) ||
- 	difftime(now, addr_list->decline_time) >= (float)DECLINE_BACKOFF)
-       {
- 	addrpart = addr6part(&addr_list->addr.addr6);