git: 6a7b12367490 - main - dns/dnsmasq-devel: deorbit now that there is a v2.85 release.

[Matthias Andree]

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a7b1236749008c79b325e05a0ea0a26a4c90589

commit 6a7b1236749008c79b325e05a0ea0a26a4c90589
Author:     Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-08 21:54:28 +0000
Commit:     Matthias Andree <mandree at FreeBSD.org>
CommitDate: 2021-04-08 21:55:22 +0000

    dns/dnsmasq-devel: deorbit now that there is a v2.85 release.
---
 MOVED                      | 2 +-
 dns/Makefile               | 1 -
 dns/dnsmasq-devel/Makefile | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/MOVED b/MOVED
index db1914772831..759cf366fda1 100644
--- a/MOVED
+++ b/MOVED
@@ -15574,7 +15574,6 @@ deskutils/logjam||2020-09-19|Abandonware does not work anymore
 mail/squirrelmail-tmda-plugin||2020-09-19|Removed, unmaintained and depends on expired mail/tmda
 mail/tmda||2020-09-19|Has expired: Uses EOL Python 2.7
 devel/storm||2020-09-19|Has expired: Uses deprecated version of python
-#dns/dnsmasq-devel|dns/dnsmasq|2020-09-24|Has expired: use dns/dnsmasq instead, which is newer
 shells/poshinit|shells/switchBashZsh|2020-09-24|Tracking upstream name change
 net-im/corebird||2020-09-25|Stopped working in august 2018
 devel/py-pyqi||2020-09-25|No longer developed, use devel/py-click instead
@@ -16275,3 +16274,4 @@ finance/wmstock||2021-04-07|Has expired: Unmaintained and dead upstream, does no
 ftp/frox||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 databases/couchdb2|databases/couchdb3|2021-04-07|No longer supported upstream, uses spidermonkey68 & python2; move to databases/couchdb3
 security/pidentd||2021-04-07|Removed: Unmaintained, abandoned, does not build with recent OS versions.
+dns/dnsmasq-devel|dns/dnsmasq|2021-04-08|Has expired: use dns/dnsmasq instead, which is newer.
diff --git a/dns/Makefile b/dns/Makefile
index f4db6e757f79..372b42c5d4a1 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -44,7 +44,6 @@
     SUBDIR += dnshistory
     SUBDIR += dnsjava
     SUBDIR += dnsmasq
-    SUBDIR += dnsmasq-devel
     SUBDIR += dnsmax-perl
     SUBDIR += dnsproxy
     SUBDIR += dnsrecon
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 6758636e3e32..1453a0a001fd 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
 
 LICENSE=	GPLv2
 
-DEPRECATED=	short-lived development branch, to be removed once 2.85 is released
-EXPIRATION_DATE=2021-04-10
+IGNORE=		use dns/dnsmasq instead, it's newer
 
 USES=		cpe shebangfix tar:xz
 CPE_VENDOR=	thekelleys