dns/dnsperf: update 2.1.0 -> 2.2.1

PR:		235237
Approved by:	hrs (maintainer timeout)
Relnotes:	https://github.com/DNS-OARC/dnsperf/blob/master/CHANGES

11 files changed, 12 insertions, 184 deletions

diff --git a/dns/dnsperf/Makefile b/dns/dnsperf/Makefile
index 6831fa1eab8d..cb710b0808f3 100644
--- a/dns/dnsperf/Makefile
+++ b/dns/dnsperf/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	dnsperf
-PORTVERSION=	2.1.0.0
-PORTREVISION=	2
+PORTVERSION=	2.2.1
+DISTVERSIONPREFIX=v
 CATEGORIES=	dns benchmarks net
-MASTER_SITES=	ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Performance measurement of Domain Name System (DNS) servers
@@ -15,10 +13,13 @@ LICENSE=	ISCL
 
 BUILD_DEPENDS=	isc-config.sh:dns/bind912
 LIB_DEPENDS=	liblmdb.so:databases/lmdb \
-		libjson-c.so:devel/json-c
+		libjson-c.so:devel/json-c \
+		libxml2.so:textproc/libxml2
 
-USES=		iconv ssl
-USE_GNOME=	libxml2
+USES=		autoreconf gnome iconv libtool ssl
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	DNS-OARC
 GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -29,14 +30,5 @@ PLIST_FILES=	bin/dnsperf \
 		bin/resperf-report \
 		man/man1/dnsperf.1.gz \
 		man/man1/resperf.1.gz
-PORTDOCS=	caching-dns-performance.pdf \
-		dnsperf.pdf \
-		resperf.pdf
-
-OPTIONS_DEFINE=	DOCS
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/dns/dnsperf/distinfo b/dns/dnsperf/distinfo
index e9566e9851fe..4696fa1363f2 100644
--- a/dns/dnsperf/distinfo
+++ b/dns/dnsperf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524326968
-SHA256 (dnsperf-src-2.1.0.0-1.tar.gz) = 64b5f0a680e1ad60bca5fd709f1a9a8404ac2fd85af6138bd22ca9a28b616e0e
-SIZE (dnsperf-src-2.1.0.0-1.tar.gz) = 561502
+TIMESTAMP = 1548663213
+SHA256 (DNS-OARC-dnsperf-v2.2.1_GH0.tar.gz) = 3e6d75330b44ddbf62415113014a437bfa0fab206db535c7a527785669e85e24
+SIZE (DNS-OARC-dnsperf-v2.2.1_GH0.tar.gz) = 66955
diff --git a/dns/dnsperf/files/patch-Makefile.in b/dns/dnsperf/files/patch-Makefile.in
deleted file mode 100644
index 8a2db0ea87d7..000000000000
--- a/dns/dnsperf/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	2015-12-16 00:46:49 UTC
-+++ Makefile.in
-@@ -7,8 +7,6 @@ mandir = @mandir@
- datarootdir = @datarootdir@
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
--INSTALL_DATA = @INSTALL_DATA@ 
- RANLIB = @RANLIB@
- 
- CC = @PTHREAD_CC@
-@@ -41,9 +39,9 @@ installdirs:
- install: all installdirs
- 	${INSTALL_PROGRAM} dnsperf ${DESTDIR}${bindir}
- 	${INSTALL_PROGRAM} resperf ${DESTDIR}${bindir}
--	${INSTALL_PROGRAM} resperf-report ${DESTDIR}${bindir}
--	${INSTALL_DATA} dnsperf.1 ${DESTDIR}${mandir}/man1
--	${INSTALL_DATA} resperf.1 ${DESTDIR}${mandir}/man1
-+	${INSTALL_SCRIPT} resperf-report ${DESTDIR}${bindir}
-+	${INSTALL_MAN} dnsperf.1 ${DESTDIR}${mandir}/man1
-+	${INSTALL_MAN} resperf.1 ${DESTDIR}${mandir}/man1
- 
- clean:
- 	rm -f *.o dnsperf resperf libperf.a
diff --git a/dns/dnsperf/files/patch-datafile.c b/dns/dnsperf/files/patch-datafile.c
deleted file mode 100644
index 03fd4fd76274..000000000000
--- a/dns/dnsperf/files/patch-datafile.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- datafile.c.orig	2015-12-16 00:46:49 UTC
-+++ datafile.c
-@@ -23,7 +23,9 @@
- 
- #define ISC_BUFFER_USEINLINE
- 
-+#include <isc/boolean.h>
- #include <isc/buffer.h>
-+#include <isc/int.h>
- #include <isc/mem.h>
- 
- #include "datafile.h"
diff --git a/dns/dnsperf/files/patch-dns.c b/dns/dnsperf/files/patch-dns.c
deleted file mode 100644
index d88c2b324884..000000000000
--- a/dns/dnsperf/files/patch-dns.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- dns.c.orig	2015-12-16 00:46:50 UTC
-+++ dns.c
-@@ -41,9 +41,11 @@
- #define ISC_BUFFER_USEINLINE
- 
- #include <isc/base64.h>
-+#include <isc/boolean.h>
- #include <isc/buffer.h>
- #include <isc/hmacmd5.h>
- #include <isc/hmacsha.h>
-+#include <isc/int.h>
- #include <isc/lex.h>
- #include <isc/mem.h>
- #include <isc/region.h>
diff --git a/dns/dnsperf/files/patch-dnsperf.c b/dns/dnsperf/files/patch-dnsperf.c
deleted file mode 100644
index 19a9ea902aab..000000000000
--- a/dns/dnsperf/files/patch-dnsperf.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- dnsperf.c.orig	2015-12-16 00:46:49 UTC
-+++ dnsperf.c
-@@ -52,8 +52,10 @@
- 
- #define ISC_BUFFER_USEINLINE
- 
-+#include <isc/boolean.h>
- #include <isc/buffer.h>
- #include <isc/file.h>
-+#include <isc/int.h>
- #include <isc/list.h>
- #include <isc/mem.h>
- #include <isc/netaddr.h>
-@@ -280,16 +282,16 @@ print_statistics(const config_t *config, const times_t
- 
- 	printf("Statistics:\n\n");
- 
--	printf("  %s sent:         %" ISC_PRINT_QUADFORMAT "u\n",
-+	printf("  %s sent:         %" PRIu64 "\n",
-                units, stats->num_sent);
--	printf("  %s completed:    %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
-+	printf("  %s completed:    %" PRIu64 " (%.2lf%%)\n",
- 	       units, stats->num_completed,
- 	       SAFE_DIV(100.0 * stats->num_completed, stats->num_sent));
--	printf("  %s lost:         %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
-+	printf("  %s lost:         %" PRIu64 " (%.2lf%%)\n",
- 	       units, stats->num_timedout,
- 	       SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent));
- 	if (stats->num_interrupted > 0)
--		printf("  %s interrupted:  %" ISC_PRINT_QUADFORMAT "u "
-+		printf("  %s interrupted:  %" PRIu64 " "
-                        "(%.2lf%%)\n",
- 		       units, stats->num_interrupted,
- 		       SAFE_DIV(100.0 * stats->num_interrupted,
-@@ -305,7 +307,7 @@ print_statistics(const config_t *config, const times_t
- 			first_rcode = ISC_FALSE;
- 		else
- 			printf(", ");
--		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
-+		printf("%s %" PRIu64 " (%.2lf%%)",
- 		       perf_dns_rcode_strings[i], stats->rcodecounts[i],
- 		       (stats->rcodecounts[i] * 100.0) / stats->num_completed);
- 	}
diff --git a/dns/dnsperf/files/patch-log.c b/dns/dnsperf/files/patch-log.c
deleted file mode 100644
index 0b5ca4df894d..000000000000
--- a/dns/dnsperf/files/patch-log.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- log.c.orig	2015-12-16 00:46:50 UTC
-+++ log.c
-@@ -20,6 +20,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#include <isc/int.h>
-+
- #include "log.h"
- #include "util.h"
- 
diff --git a/dns/dnsperf/files/patch-opt.c b/dns/dnsperf/files/patch-opt.c
deleted file mode 100644
index bd2b01b4a0fa..000000000000
--- a/dns/dnsperf/files/patch-opt.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- opt.c.orig	2015-12-16 00:46:50 UTC
-+++ opt.c
-@@ -22,7 +22,9 @@
- 
- #include <netinet/in.h>
- 
-+#include <isc/boolean.h>
- #include <isc/file.h>
-+#include <isc/int.h>
- #include <isc/parseint.h>
- #include <isc/result.h>
- 
diff --git a/dns/dnsperf/files/patch-os.c b/dns/dnsperf/files/patch-os.c
deleted file mode 100644
index 17ea753671c3..000000000000
--- a/dns/dnsperf/files/patch-os.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- os.c.orig	2015-12-16 00:46:49 UTC
-+++ os.c
-@@ -22,6 +22,8 @@
- 
- #include <sys/select.h>
- 
-+#include <isc/boolean.h>
-+#include <isc/int.h>
- #include <isc/result.h>
- #include <isc/types.h>
- 
diff --git a/dns/dnsperf/files/patch-resperf.c b/dns/dnsperf/files/patch-resperf.c
deleted file mode 100644
index 1e78729175df..000000000000
--- a/dns/dnsperf/files/patch-resperf.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- resperf.c.orig	2015-12-16 00:46:50 UTC
-+++ resperf.c
-@@ -46,8 +46,10 @@
- 
- #include <sys/time.h>
- 
-+#include <isc/boolean.h>
- #include <isc/buffer.h>
- #include <isc/file.h>
-+#include <isc/int.h>
- #include <isc/list.h>
- #include <isc/mem.h>
- #include <isc/print.h>
-@@ -389,11 +391,11 @@ print_statistics(void) {
- 
- 	printf("\nStatistics:\n\n");
- 
--	printf("  Queries sent:         %" ISC_PRINT_QUADFORMAT "u\n",
-+	printf("  Queries sent:         %" PRIu64 "\n",
-                num_queries_sent);
--	printf("  Queries completed:    %" ISC_PRINT_QUADFORMAT "u\n",
-+	printf("  Queries completed:    %" PRIu64 "\n",
-                num_responses_received);
--	printf("  Queries lost:         %" ISC_PRINT_QUADFORMAT "u\n",
-+	printf("  Queries lost:         %" PRIu64 "\n",
- 	       num_queries_sent - num_responses_received);
- 	printf("  Response codes:       ");
- 	first_rcode = ISC_TRUE;
-@@ -404,7 +406,7 @@ print_statistics(void) {
- 			first_rcode = ISC_FALSE;
- 		else
- 			printf(", ");
--		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
-+		printf("%s %" PRIu64 " (%.2lf%%)",
- 		       perf_dns_rcode_strings[i], rcodecounts[i],
- 		       (rcodecounts[i] * 100.0) / num_responses_received);
- 	}
diff --git a/dns/dnsperf/pkg-descr b/dns/dnsperf/pkg-descr
index 9ce7ff4871a4..cdd0971f9cd2 100644
--- a/dns/dnsperf/pkg-descr
+++ b/dns/dnsperf/pkg-descr
@@ -15,4 +15,4 @@ network operators to take advantage of the data.
 ResPerf systematically increases the query rate and monitors the
 response rate to simulate caching DNS services.
 
-WWW: https://www.akamai.com/us/en/products/network-operator/measurement-tools.jsp
+WWW: https://www.dns-oarc.net/tools/dnsperf