update to dnsmasq-2.84, from Brad

net/dnsmasq/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.56 2021/01/20 11:32:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2021/02/04 12:32:12 sthen Exp $
 
 COMMENT=	lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=	dnsmasq-2.83
+DISTNAME=	dnsmasq-2.84
 CATEGORIES=	net
 MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/
 EXTRACT_SUFX=	.tar.xz

net/dnsmasq/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.83.tar.xz) = /8H36LBeItkQuacdCfESgZcpJ2bcfFTLcBihssOvSuo=
-SIZE (dnsmasq-2.83.tar.xz) = 513880
+SHA256 (dnsmasq-2.84.tar.xz) = YDGVxktzE3YJsH4QJK4LN/ZSsvX+Rn3OZphbPRhQBQw=
+SIZE (dnsmasq-2.84.tar.xz) = 514216

net/dnsmasq/patches/patch-bld_get-version

@@ -0,0 +1,28 @@
+$OpenBSD: patch-bld_get-version,v 1.1 2021/02/04 12:32:13 sthen Exp $
+
+- Tweak sort order of tags in get-version
+- Tweak f1204a875e0f16fd645df965db346fc56d2ab1dd
+
+Index: bld/get-version
+--- bld/get-version.orig
++++ bld/get-version
+@@ -9,7 +9,9 @@
+ # If we can find one which matches $v[0-9].* then we assume it's
+ # a version-number tag, else we just use the whole string.
+ # If there is more than one v[0-9].* tag, sort them and use the
+-# first. This favours, eg v2.63 over 2.63rc6.
++# first. The insane arguments to the sort command are to ensure
++# that, eg v2.64 comes before v2.63, but v2.63 comes before v2.63rc1
++# and v2.63rc1 comes before v2.63test1
+ 
+ # Change directory to the toplevel source directory.
+ if test -z "$1" || ! test -d "$1" || ! cd "$1"; then
+@@ -28,7 +30,7 @@ else
+      vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
+ 
+      if [ $? -eq 0 ]; then
+-         echo "${vers}" | sort -r | head -n 1 | sed 's/^v//'
++         echo "${vers}" | sort -k1.2,1.5Vr -k1.6,1.6 -k1.8,1.9Vr -k1.10,1.11Vr | head -n 1 | sed 's/^v//'
+      else
+          cat $1/VERSION
+      fi