Index: branches/2020Q3/dns/adns/files/patch-dynamic-Makefile.in
===================================================================
--- branches/2020Q3/dns/adns/files/patch-dynamic-Makefile.in	(revision 545556)
+++ branches/2020Q3/dns/adns/files/patch-dynamic-Makefile.in	(nonexistent)
@@ -1,16 +0,0 @@
---- dynamic/Makefile.in.orig	2014-10-19 23:07:01 UTC
-+++ dynamic/Makefile.in
-@@ -30,10 +30,9 @@ include		$(srcdir)/../src/adns.make
- ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
- 
- install:
--		mkdir -p $(libdir)
--		$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
--		ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
--		ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
-+		mkdir -p $(DESTDIR)$(libdir)
-+		$(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
-+		(cd $(DESTDIR)$(libdir) && ln -sf $(SHLIBSONAME) $(SHLIBFORLINK))
- 
- uninstall:
- 		rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)

Property changes on: branches/2020Q3/dns/adns/files/patch-dynamic-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/dns/adns/files/patch-configure
===================================================================
--- branches/2020Q3/dns/adns/files/patch-configure	(revision 545556)
+++ branches/2020Q3/dns/adns/files/patch-configure	(nonexistent)
@@ -1,11 +0,0 @@
---- configure.orig	2014-10-26 13:22:06 UTC
-+++ configure
-@@ -4047,7 +4047,7 @@ $as_echo "no" >&6; }
- 
- SHLIBFORLINK='libadns.so'
- SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
--SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
-+SHLIBFILE='$(SHLIBSONAME)'
- 
- SHLIBCC='$(CC) $(CFLAGS) -fpic'
- MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'

Property changes on: branches/2020Q3/dns/adns/files/patch-configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/dns/adns/files/patch-client-Makefile.in
===================================================================
--- branches/2020Q3/dns/adns/files/patch-client-Makefile.in	(revision 545556)
+++ branches/2020Q3/dns/adns/files/patch-client-Makefile.in	(nonexistent)
@@ -1,14 +0,0 @@
---- client/Makefile.in.orig	2014-10-19 23:07:01 UTC
-+++ client/Makefile.in
-@@ -58,9 +58,9 @@ ALL_OBJS=	$(ADH_OBJS) $(TARG_OBJS)
- all:		$(TARGETS)
- 
- install:	$(TARG_INSTALL)
--		mkdir -p $(bindir)
-+		mkdir -p $(DESTDIR)$(bindir)
- 		set -xe; for f in $(TARG_INSTALL); \
--			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
-+			do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
- 
- uninstall:
- 		for f in $(TARGETS); do rm -f $(bindir)/$$f; done

Property changes on: branches/2020Q3/dns/adns/files/patch-client-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/dns/adns/files/patch-configure.in
===================================================================
--- branches/2020Q3/dns/adns/files/patch-configure.in	(revision 545556)
+++ branches/2020Q3/dns/adns/files/patch-configure.in	(nonexistent)
@@ -1,11 +0,0 @@
---- configure.in.orig	2014-10-20 00:14:40 UTC
-+++ configure.in
-@@ -140,7 +140,7 @@ AC_SUBST(SHLIBSONAME)
- 
- SHLIBFORLINK='libadns.so'
- SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
--SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
-+SHLIBFILE='$(SHLIBSONAME)'
- 
- SHLIBCC='$(CC) $(CFLAGS) -fpic'
- MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'

Property changes on: branches/2020Q3/dns/adns/files/patch-configure.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/dns/adns/files/patch-src-Makefile.in
===================================================================
--- branches/2020Q3/dns/adns/files/patch-src-Makefile.in	(revision 545556)
+++ branches/2020Q3/dns/adns/files/patch-src-Makefile.in	(nonexistent)
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	2014-10-19 23:07:03 UTC
-+++ src/Makefile.in
-@@ -30,10 +30,10 @@ include		$(srcdir)/adns.make
- DIRCFLAGS=	-I. -I$(srcdir)
- 
- install:
--		mkdir -p $(libdir) $(includedir)
-+		mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
- 		set -xe; for f in $(TARGETS); \
--			do $(INSTALL_DATA) $$f $(libdir)/$$f; done
--		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
-+			do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
-+		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h
- 
- uninstall:
- 		for f in $(TARGETS); do rm -f $(libdir)/$$f; done

Property changes on: branches/2020Q3/dns/adns/files/patch-src-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/dns/adns/files/patch-regress-Makefile.in
===================================================================
--- branches/2020Q3/dns/adns/files/patch-regress-Makefile.in	(revision 545556)
+++ branches/2020Q3/dns/adns/files/patch-regress-Makefile.in	(nonexistent)
@@ -1,11 +0,0 @@
---- regress/Makefile.in.orig	2014-10-26 12:03:41 UTC
-+++ regress/Makefile.in
-@@ -25,7 +25,7 @@ VPATH=		@srcdir@
- 
- PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
- 
--CLIENTS=	adnstest adnshost adnslogres $(PROGS_SYSDEP)
-+CLIENTS=	adnstest adnslogres $(PROGS_SYSDEP)
- AUTOCHDRS=	harness.h hsyscalls.h hredirect.h
- AUTOCSRCS=	hrecord.c hplayback.c hcommon.c
- include		../settings.make

Property changes on: branches/2020Q3/dns/adns/files/patch-regress-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q3/dns/adns/Makefile
===================================================================
--- branches/2020Q3/dns/adns/Makefile	(revision 545556)
+++ branches/2020Q3/dns/adns/Makefile	(revision 545557)
@@ -1,45 +1,48 @@
 # Created by: Kostya Lukin <lukin@okbmei.msk.su>
 # $FreeBSD$
 
 PORTNAME=	adns
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6.0
 CATEGORIES=	dns
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~ian/adns/ftp/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Easy to use asynchronous-capable DNS client library and utilities
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	m4>=1.4.11:devel/m4
+
 USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PORTSCOUT=	skipv:1.5.0~rc0,1.5.0~rc1
 
+BINARY_ALIAS=	m4=${LOCALBASE}/bin/gm4
 LIBVERSION=	1
 PLIST_SUB+=	LIBVERSION="${LIBVERSION}"
 
 CFLAGS+=		-Ds6_addr16=__u6_addr.__u6_addr16
 CFLAGS+=		-Ds6_addr32=__u6_addr.__u6_addr32
 
 DOCS=		COPYING GPL-vs-LGPL INSTALL README \
 		README.html TODO changelog
 
 TOSTRIP=	bin/adnsheloex \
 		bin/adnsresfilter \
 		bin/adnslogres \
 		bin/adnshost \
-		lib/libadns.so.1
+		lib/libadns.so.1.6
 
 OPTIONS_DEFINE=		DOCS
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 post-install:
 .for f in ${TOSTRIP}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2020Q3/dns/adns/distinfo
===================================================================
--- branches/2020Q3/dns/adns/distinfo	(revision 545556)
+++ branches/2020Q3/dns/adns/distinfo	(revision 545557)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471808918
-SHA256 (adns-1.5.1.tar.gz) = 5b1026f18b8274be869245ed63427bf8ddac0739c67be12c4a769ac948824eeb
-SIZE (adns-1.5.1.tar.gz) = 319774
+TIMESTAMP = 1597925576
+SHA256 (adns-1.6.0.tar.gz) = fb427265a981e033d1548f2b117cc021073dc8be2eaf2c45fd64ab7b00ed20de
+SIZE (adns-1.6.0.tar.gz) = 323474
Index: branches/2020Q3/dns/adns/pkg-plist
===================================================================
--- branches/2020Q3/dns/adns/pkg-plist	(revision 545556)
+++ branches/2020Q3/dns/adns/pkg-plist	(revision 545557)
@@ -1,15 +1,16 @@
 bin/adnsheloex
 bin/adnshost
 bin/adnslogres
 bin/adnsresfilter
 include/adns.h
 lib/libadns.a
 lib/libadns.so
 lib/libadns.so.%%LIBVERSION%%
+lib/libadns.so.%%LIBVERSION%%.6
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/GPL-vs-LGPL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/changelog
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 545556)
+++ branches/2020Q3	(revision 545557)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r545535