Index: head/dns/dnsperf/files/patch-dnsperf.c =================================================================== --- head/dns/dnsperf/files/patch-dnsperf.c (revision 492617) +++ head/dns/dnsperf/files/patch-dnsperf.c (nonexistent) @@ -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 - #include - #include -+#include - #include - #include - #include -@@ -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); - } Property changes on: head/dns/dnsperf/files/patch-dnsperf.c ___________________________________________________________________ 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: head/dns/dnsperf/files/patch-log.c =================================================================== --- head/dns/dnsperf/files/patch-log.c (revision 492617) +++ head/dns/dnsperf/files/patch-log.c (nonexistent) @@ -1,11 +0,0 @@ ---- log.c.orig 2015-12-16 00:46:50 UTC -+++ log.c -@@ -20,6 +20,8 @@ - #include - #include - -+#include -+ - #include "log.h" - #include "util.h" - Property changes on: head/dns/dnsperf/files/patch-log.c ___________________________________________________________________ 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: head/dns/dnsperf/files/patch-Makefile.in =================================================================== --- head/dns/dnsperf/files/patch-Makefile.in (revision 492617) +++ head/dns/dnsperf/files/patch-Makefile.in (nonexistent) @@ -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 Property changes on: head/dns/dnsperf/files/patch-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: head/dns/dnsperf/files/patch-resperf.c =================================================================== --- head/dns/dnsperf/files/patch-resperf.c (revision 492617) +++ head/dns/dnsperf/files/patch-resperf.c (nonexistent) @@ -1,37 +0,0 @@ ---- resperf.c.orig 2015-12-16 00:46:50 UTC -+++ resperf.c -@@ -46,8 +46,10 @@ - - #include - -+#include - #include - #include -+#include - #include - #include - #include -@@ -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); - } Property changes on: head/dns/dnsperf/files/patch-resperf.c ___________________________________________________________________ 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: head/dns/dnsperf/files/patch-dns.c =================================================================== --- head/dns/dnsperf/files/patch-dns.c (revision 492617) +++ head/dns/dnsperf/files/patch-dns.c (nonexistent) @@ -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 -+#include - #include - #include - #include -+#include - #include - #include - #include Property changes on: head/dns/dnsperf/files/patch-dns.c ___________________________________________________________________ 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: head/dns/dnsperf/files/patch-os.c =================================================================== --- head/dns/dnsperf/files/patch-os.c (revision 492617) +++ head/dns/dnsperf/files/patch-os.c (nonexistent) @@ -1,11 +0,0 @@ ---- os.c.orig 2015-12-16 00:46:49 UTC -+++ os.c -@@ -22,6 +22,8 @@ - - #include - -+#include -+#include - #include - #include - Property changes on: head/dns/dnsperf/files/patch-os.c ___________________________________________________________________ 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: head/dns/dnsperf/files/patch-datafile.c =================================================================== --- head/dns/dnsperf/files/patch-datafile.c (revision 492617) +++ head/dns/dnsperf/files/patch-datafile.c (nonexistent) @@ -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 - #include -+#include - #include - - #include "datafile.h" Property changes on: head/dns/dnsperf/files/patch-datafile.c ___________________________________________________________________ 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: head/dns/dnsperf/files/patch-opt.c =================================================================== --- head/dns/dnsperf/files/patch-opt.c (revision 492617) +++ head/dns/dnsperf/files/patch-opt.c (nonexistent) @@ -1,12 +0,0 @@ ---- opt.c.orig 2015-12-16 00:46:50 UTC -+++ opt.c -@@ -22,7 +22,9 @@ - - #include - -+#include - #include -+#include - #include - #include - Property changes on: head/dns/dnsperf/files/patch-opt.c ___________________________________________________________________ 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: head/dns/dnsperf/Makefile =================================================================== --- head/dns/dnsperf/Makefile (revision 492617) +++ head/dns/dnsperf/Makefile (revision 492618) @@ -1,42 +1,34 @@ # Created by: Edwin Groothuis (edwin@mavetju.org) # $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 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}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_MAN="${INSTALL_MAN}" PLIST_FILES= bin/dnsperf \ bin/resperf \ 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 Index: head/dns/dnsperf/distinfo =================================================================== --- head/dns/dnsperf/distinfo (revision 492617) +++ head/dns/dnsperf/distinfo (revision 492618) @@ -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 Index: head/dns/dnsperf/pkg-descr =================================================================== --- head/dns/dnsperf/pkg-descr (revision 492617) +++ head/dns/dnsperf/pkg-descr (revision 492618) @@ -1,18 +1,18 @@ DNSPerf and ResPerf are free tools developed by Nominum that make it simple to gather accurate latency and throughput metrics for Domain Name System (DNS) servers. The latest version of the DNSPerf and ResPerf can be used with test files that include IPv6 queries. DNSPerf "self-paces" the DNS query load to simulate network conditions. New features in DNSPerf improve the precision of latency measurements and allow for per packet per-query latency reporting is possible. DNSPerf is now multithreaded, multiple DNSPerf clients can be supported in multicore systems (each client requires two cores). The output of DNSPerf has also been improved so it is more concise and useful. Latency data can be used to make detailed graphs so it is simple for 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