6 files changed, 92 insertions, 1 deletions

diff --git a/MOVED b/MOVED
index 0f7b2f4c3cf4..7f1650b47206 100644
--- a/MOVED
+++ b/MOVED
@@ -4198,7 +4198,6 @@ devel/goffice1||2013-04-16|Removed: Only one port user which has no user itself.
 devel/present||2013-04-16|Removed: No users, blocking libgsf update
 audio/icecast|audio/icecast2|2013-04-18|Has expired: Unmaintained upstream since 2004. Use audio/icecast2 instead
 net-im/gajim-devel|net-im/gajim|2013-04-18|Has expired: This port is outdated for two years, no distfile available. Please use net-im/gajim instead
-dns/dnsperf||2013-04-20|Removed
 dns/bind97||2013-04-20|Has expired: No longer supported by ISC, use Bind 9.8 or 9.9
 dns/bind97-sdb||2013-04-20|Has expired: No longer supported by ISC, use Bind 9.8 or 9.9
 sysutils/grub||2013-04-22|Unmaintained and broken
diff --git a/dns/Makefile b/dns/Makefile
index df25e5231b0e..f791555e2462 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -38,6 +38,7 @@
     SUBDIR += dnsmasq
     SUBDIR += dnsmasq-devel
     SUBDIR += dnsmax-perl
+    SUBDIR += dnsperf
     SUBDIR += dnsproxy
     SUBDIR += dnsreflector
     SUBDIR += dnstop
diff --git a/dns/dnsperf/Makefile b/dns/dnsperf/Makefile
new file mode 100644
index 000000000000..ff03fd7ce5af
--- /dev/null
+++ b/dns/dnsperf/Makefile
@@ -0,0 +1,45 @@
+# Created by: Edwin Groothuis (edwin@mavetju.org)
+# $FreeBSD$
+
+PORTNAME=	dnsperf
+PORTVERSION=	2.0.0.0
+CATEGORIES=	dns benchmarks net
+MASTER_SITES=	ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Accurate performance metrics of Domain Name Services
+
+BUILD_DEPENDS=	isc-config.sh:${PORTSDIR}/dns/bind98
+
+USES=		iconv
+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
+MAN1=		dnsperf.1 resperf.1
+PORTDOCS=	caching-dns-performance.pdf \
+		dnsperf.pdf \
+		resperf.pdf
+CFLAGS+=	-I.
+
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
+
+.include <bsd.port.options.mk>
+
+# This is a workaround for broken isc/stat.h.
+pre-build:
+	${MKDIR} ${WRKSRC}/isc
+	${ECHO_CMD} "#include <sys/types.h>" > ${WRKSRC}/isc/stat.h
+	${ECHO_CMD} "#include <sys/stat.h>" >> ${WRKSRC}/isc/stat.h
+
+.if ${PORT_OPTIONS:MDOCS}
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/dns/dnsperf/distinfo b/dns/dnsperf/distinfo
new file mode 100644
index 000000000000..513723d8e443
--- /dev/null
+++ b/dns/dnsperf/distinfo
@@ -0,0 +1,2 @@
+SHA256 (dnsperf-src-2.0.0.0-1.tar.gz) = 23d486493f04554d11fca97552e860028f18c5ed6e35348e480a7448fa8cfaad
+SIZE (dnsperf-src-2.0.0.0-1.tar.gz) = 565871
diff --git a/dns/dnsperf/files/patch-Makefile.in b/dns/dnsperf/files/patch-Makefile.in
new file mode 100644
index 000000000000..b202bcf51c5a
--- /dev/null
+++ b/dns/dnsperf/files/patch-Makefile.in
@@ -0,0 +1,26 @@
+--- Makefile.in.orig	2012-03-02 11:25:22.000000000 +0900
++++ Makefile.in	2013-07-19 11:50:57.000000000 +0900
+@@ -7,8 +7,8 @@
+ datarootdir = @datarootdir@
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
+-INSTALL_DATA = @INSTALL_DATA@ 
++#INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
++#INSTALL_DATA = @INSTALL_DATA@ 
+ RANLIB = @RANLIB@
+ 
+ CC = @PTHREAD_CC@
+@@ -41,9 +41,9 @@
+ 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/pkg-descr b/dns/dnsperf/pkg-descr
new file mode 100644
index 000000000000..2e371826b326
--- /dev/null
+++ b/dns/dnsperf/pkg-descr
@@ -0,0 +1,18 @@
+DNSPerf and ResPerf Provide Communication Providers with Predictive
+Planning Tools to Scale Networks.
+
+Two tools, DNSPerf and ResPerf deliver accurate performance metrics
+of Domain Name Services (DNS).  These tools are easy-to-use and
+simulate real Internet workloads to provide the necessary insight
+that carriers need to plan and deploy network services.
+
+DNSPerf measures Authoritative Domain Name services and is designed
+to simulate network conditions by self-pacing the query load.
+
+Caching services performance and workload profile differ significantly
+from Authoritative Domain services; therefore a different tool is
+needed. ResPerf is designed specifically to simulate Caching Domain
+Name services. To test a caching server, ResPerf systematically
+increases the query rate and monitors the response rate.
+
+WWW: http://www.nominum.com/support/measurement-tools/