diff --git a/benchmarks/dnsperf/Makefile b/benchmarks/dnsperf/Makefile index 44b146d9f8ab..f58ae6c42a3c 100644 --- a/benchmarks/dnsperf/Makefile +++ b/benchmarks/dnsperf/Makefile @@ -1,18 +1,16 @@ -# $NetBSD: Makefile,v 1.10 2019/10/16 09:37:27 maya Exp $ +# $NetBSD: Makefile,v 1.11 2019/10/16 10:05:28 maya Exp $ -DISTNAME= dnsperf-src-2.1.0.0-1 -PKGNAME= dnsperf-2.1.0.0 -PKGREVISION= 2 +DISTNAME= dnsperf-2.3.2 CATEGORIES= benchmarks net -MASTER_SITES= ftp://ftp.nominum.com/pub/nominum/${PKGBASE}/${PKGVERSION_NOREV}/ +MASTER_SITES= https://www.dns-oarc.net/files/dnsperf/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.nominum.com/support/measurement-tools/ +HOMEPAGE= https://www.dns-oarc.net/tools/dnsperf COMMENT= DNS server performance measurement tools LICENSE= mit GNU_CONFIGURE= yes -USE_TOOLS+= sh:run +USE_TOOLS+= sh:run pkg-config # This package needs "isc" include files and "isc-config.sh" to build. # The built-in check only considers "libbind". diff --git a/benchmarks/dnsperf/PLIST b/benchmarks/dnsperf/PLIST index e7d5027e621c..57aaff4bb327 100644 --- a/benchmarks/dnsperf/PLIST +++ b/benchmarks/dnsperf/PLIST @@ -1,6 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2013/11/30 20:31:18 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2019/10/16 10:05:28 maya Exp $ bin/dnsperf bin/resperf bin/resperf-report man/man1/dnsperf.1 man/man1/resperf.1 +share/doc/dnsperf/CHANGES +share/doc/dnsperf/LICENSE +share/doc/dnsperf/README.md diff --git a/benchmarks/dnsperf/distinfo b/benchmarks/dnsperf/distinfo index 16493a1512a6..f5ce5fb2c246 100644 --- a/benchmarks/dnsperf/distinfo +++ b/benchmarks/dnsperf/distinfo @@ -1,11 +1,6 @@ -$NetBSD: distinfo,v 1.4 2018/10/27 12:04:33 tron Exp $ +$NetBSD: distinfo,v 1.5 2019/10/16 10:05:28 maya Exp $ -SHA1 (dnsperf-src-2.1.0.0-1.tar.gz) = 1a5d32feb41dd174f82f57ba62389d3480619c91 -RMD160 (dnsperf-src-2.1.0.0-1.tar.gz) = 0392903f300750ca53785f342a547eee5eb9db6d -SHA512 (dnsperf-src-2.1.0.0-1.tar.gz) = 5571bd0855aba4affcdf81724919e60ab6762d646f8d9a6abf177a2a588675c636842f2fb708bf648004b9c411e9c9b68789f7c6bbbd87afc24c8299a21aa6c9 -Size (dnsperf-src-2.1.0.0-1.tar.gz) = 561502 bytes -SHA1 (patch-Makefile.in) = 9f5377a75d9674a3aeb12f933f0a552564534d91 -SHA1 (patch-datafile.h) = d05f41b5d02048ffe5ca7261cd0164202fb9821a -SHA1 (patch-dns.h) = 1c78fc5dd05c4eb32563c2cfacdabadfa9937c1b -SHA1 (patch-os.h) = 53b573fddee3495a8b8e73088b1a4742a6b1b9ae -SHA1 (patch-util.h) = 94893a9d867aabd43650e66ffbbb0995ceb9becd +SHA1 (dnsperf-2.3.2.tar.gz) = e533ac288de7e52d7b09b4e2fc059b380b1a9164 +RMD160 (dnsperf-2.3.2.tar.gz) = 3b7ebde9379fcdb268765ff934879c913c90ac5b +SHA512 (dnsperf-2.3.2.tar.gz) = b4fbfa40811174a0613ba333a57278262af2c424118c55ad3f0fe7bf4df07ae4ca4c5fb528ff659d98db61393399308b652bc9887c48ed24427c70343307f06d +Size (dnsperf-2.3.2.tar.gz) = 402223 bytes diff --git a/benchmarks/dnsperf/patches/patch-Makefile.in b/benchmarks/dnsperf/patches/patch-Makefile.in deleted file mode 100644 index 67dabbd473c7..000000000000 --- a/benchmarks/dnsperf/patches/patch-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/11/30 20:31:18 tron Exp $ - -Don't attempt to strip shell scripts which breaks the installation. - ---- Makefile.in.orig 2012-03-02 02:25:22.000000000 +0000 -+++ Makefile.in 2013-11-30 19:48:44.000000000 +0000 -@@ -41,7 +41,7 @@ - install: all installdirs - ${INSTALL_PROGRAM} dnsperf ${DESTDIR}${bindir} - ${INSTALL_PROGRAM} resperf ${DESTDIR}${bindir} -- ${INSTALL_PROGRAM} resperf-report ${DESTDIR}${bindir} -+ ${BSD_INSTALL_SCRIPT} resperf-report ${DESTDIR}${bindir} - ${INSTALL_DATA} dnsperf.1 ${DESTDIR}${mandir}/man1 - ${INSTALL_DATA} resperf.1 ${DESTDIR}${mandir}/man1 - diff --git a/benchmarks/dnsperf/patches/patch-datafile.h b/benchmarks/dnsperf/patches/patch-datafile.h deleted file mode 100644 index 96709fd3137b..000000000000 --- a/benchmarks/dnsperf/patches/patch-datafile.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-datafile.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- datafile.h.orig 2015-12-16 00:46:49.000000000 +0000 -+++ datafile.h 2018-10-27 12:57:12.538706870 +0100 -@@ -19,6 +19,10 @@ - #define PERF_DATAFILE_H 1 - - #include -+#include -+#include -+ -+#define ISC_PRINT_QUADFORMAT PRIu64 - - typedef struct perf_datafile perf_datafile_t; - diff --git a/benchmarks/dnsperf/patches/patch-dns.h b/benchmarks/dnsperf/patches/patch-dns.h deleted file mode 100644 index 4985c1e7556a..000000000000 --- a/benchmarks/dnsperf/patches/patch-dns.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dns.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- dns.h.orig 2015-12-16 00:46:50.000000000 +0000 -+++ dns.h 2018-10-27 12:58:23.298408393 +0100 -@@ -33,6 +33,8 @@ - */ - - #include -+#include -+#include - - #ifndef PERF_DNS_H - #define PERF_DNS_H 1 diff --git a/benchmarks/dnsperf/patches/patch-os.h b/benchmarks/dnsperf/patches/patch-os.h deleted file mode 100644 index 941aab3b0611..000000000000 --- a/benchmarks/dnsperf/patches/patch-os.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-os.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- os.h.orig 2015-12-16 00:46:50.000000000 +0000 -+++ os.h 2018-10-27 12:59:42.370351276 +0100 -@@ -18,6 +18,9 @@ - #ifndef PERF_OS_H - #define PERF_OS_H 1 - -+#include -+#include -+ - void - perf_os_blocksignal(int sig, isc_boolean_t block); - diff --git a/benchmarks/dnsperf/patches/patch-util.h b/benchmarks/dnsperf/patches/patch-util.h deleted file mode 100644 index 69089fe9283a..000000000000 --- a/benchmarks/dnsperf/patches/patch-util.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-util.h,v 1.1 2018/10/27 12:04:33 tron Exp $ - -Fix build with BIND 9.12.3 and newer - ---- util.h.orig 2015-12-16 00:46:49.000000000 +0000 -+++ util.h 2018-10-27 12:59:01.184426825 +0100 -@@ -21,6 +21,8 @@ - #include - - #include -+#include -+#include - - #include "log.h" -