release/4.11.0

27 files changed, 0 insertions, 1255 deletions

diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
deleted file mode 100644
index 3dc774800962..000000000000
--- a/benchmarks/iperf/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	iperf
-# Date Created:				20 May 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	iperf
-PORTVERSION= 	1.7.0
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf/
-DISTNAME=	iperf-1.7.0-source
-
-MAINTAINER=	smace@FreeBSD.org
-COMMENT=	A tool to measure maximum TCP and UDP bandwidth
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-NO_CDROM=	"can't charge a fee for the software"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iperf ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/iperf
-.for file in README doc/index.html doc/jperf.gif doc/dast.gif \
-		doc/lib.html doc/ui_license.html
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/iperf
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/benchmarks/iperf/distinfo b/benchmarks/iperf/distinfo
deleted file mode 100644
index b5db47f3a1c1..000000000000
--- a/benchmarks/iperf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (iperf-1.7.0-source.tar.gz) = 3e4aea85822bcf10ed14040f4b26bd26
-SIZE (iperf-1.7.0-source.tar.gz) = 182773
diff --git a/benchmarks/iperf/pkg-descr b/benchmarks/iperf/pkg-descr
deleted file mode 100644
index e930a3b166a8..000000000000
--- a/benchmarks/iperf/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Iperf is a tool for measuring maximum TCP and UDP bandwidth,
-reminiscent of ttcp and nettest. It has been written to overcome
-the shortcomings of those aging tools. Iperf can also test UDP
-bandwidth, loss, and jitter.
-
-WWW: http://dast.nlanr.net/Projects/Iperf/
-
-- Pete
-petef@databits.net
diff --git a/benchmarks/iperf/pkg-plist b/benchmarks/iperf/pkg-plist
deleted file mode 100644
index 307f4f448d7e..000000000000
--- a/benchmarks/iperf/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/iperf
-%%PORTDOCS%%share/doc/iperf/README
-%%PORTDOCS%%share/doc/iperf/index.html
-%%PORTDOCS%%share/doc/iperf/jperf.gif
-%%PORTDOCS%%share/doc/iperf/dast.gif
-%%PORTDOCS%%share/doc/iperf/lib.html
-%%PORTDOCS%%share/doc/iperf/ui_license.html
-%%PORTDOCS%%@dirrm share/doc/iperf
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile
deleted file mode 100644
index 5b85bf237c5b..000000000000
--- a/benchmarks/polygraph31/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	polygraph
-# Date created:         3 March 1999
-# Whom:                 Dima Sivachenko <dima@chg.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	polygraph
-PORTVERSION=	2.8.1
-CATEGORIES=	benchmarks www
-MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A benchmarking tool for Web proxies
-
-IS_INTERACTIVE=	yes
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-CONFLICTS=	ltrace-0*
-
-.include <bsd.port.mk>
diff --git a/benchmarks/polygraph31/distinfo b/benchmarks/polygraph31/distinfo
deleted file mode 100644
index bf3b8cdf1d45..000000000000
--- a/benchmarks/polygraph31/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (polygraph-2.8.1-src.tgz) = f42e70d3fa383f42bf3676c086b2d16c
-SIZE (polygraph-2.8.1-src.tgz) = 710841
diff --git a/benchmarks/polygraph31/files/patch-tools-ReportGen-Makefile.in b/benchmarks/polygraph31/files/patch-tools-ReportGen-Makefile.in
deleted file mode 100644
index 130457622a3d..000000000000
--- a/benchmarks/polygraph31/files/patch-tools-ReportGen-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- tools/ReportGen/Makefile.in.orig	Tue Jun 12 02:04:12 2001
-+++ tools/ReportGen/Makefile.in	Sat Aug  3 13:55:53 2002
-@@ -15,7 +15,7 @@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
- 
--rgen_dir	= @prefix@/ReportGen
-+rgen_dir	= @prefix@/share/polygraph/ReportGen
- 
- INSTALL		= @INSTALL@
- INSTALL_PROGRAM	= @INSTALL_PROGRAM@
-@@ -42,8 +42,8 @@
- 	fi
- 
- install_mkdirs: 
--	@for d in $(prefix) $(rgen_dir); do \
--		if test ! -d $$d; then echo mkdir $$d; mkdir $$d; fi; \
-+	@for d in $(rgen_dir); do \
-+		if test ! -d $$d; then echo mkdir -p $$d; mkdir -p $$d; fi; \
- 	done
- 
- clean: 
diff --git a/benchmarks/polygraph31/files/patch-workloads-Makefile.in b/benchmarks/polygraph31/files/patch-workloads-Makefile.in
deleted file mode 100644
index 9bc6ff415c93..000000000000
--- a/benchmarks/polygraph31/files/patch-workloads-Makefile.in
+++ /dev/null
@@ -1,84 +0,0 @@
---- workloads/Makefile.in.orig	Sun Jul 29 06:45:59 2001
-+++ workloads/Makefile.in	Sat Aug  3 13:56:45 2002
-@@ -45,55 +45,55 @@
- default: all
- 
- datacomm-1.pg_install: install_dirs datacomm-1.pg
--	$(INSTALL_DTA) datacomm-1.pg ${prefix}/workloads
-+	$(INSTALL_DTA) datacomm-1.pg ${datadir}/polygraph/workloads
- 
- downtime-2.pg_install: install_dirs downtime-2.pg
--	$(INSTALL_DTA) downtime-2.pg ${prefix}/workloads
-+	$(INSTALL_DTA) downtime-2.pg ${datadir}/polygraph/workloads
- 
- nolb-l4-4.pg_install: install_dirs nolb-l4-4.pg
--	$(INSTALL_DTA) nolb-l4-4.pg ${prefix}/workloads
-+	$(INSTALL_DTA) nolb-l4-4.pg ${datadir}/polygraph/workloads
- 
- polyfill-2.pg_install: install_dirs polyfill-2.pg
--	$(INSTALL_DTA) polyfill-2.pg ${prefix}/workloads
-+	$(INSTALL_DTA) polyfill-2.pg ${datadir}/polygraph/workloads
- 
- polymix-1.pg_install: install_dirs polymix-1.pg
--	$(INSTALL_DTA) polymix-1.pg ${prefix}/workloads
-+	$(INSTALL_DTA) polymix-1.pg ${datadir}/polygraph/workloads
- 
- polymix-2.pg_install: install_dirs polymix-2.pg
--	$(INSTALL_DTA) polymix-2.pg ${prefix}/workloads
-+	$(INSTALL_DTA) polymix-2.pg ${datadir}/polygraph/workloads
- 
- polymix-3.pg_install: install_dirs polymix-3.pg
--	$(INSTALL_DTA) polymix-3.pg ${prefix}/workloads
-+	$(INSTALL_DTA) polymix-3.pg ${datadir}/polygraph/workloads
- 
- polymix-4.pg_install: install_dirs polymix-4.pg
--	$(INSTALL_DTA) polymix-4.pg ${prefix}/workloads
-+	$(INSTALL_DTA) polymix-4.pg ${datadir}/polygraph/workloads
- 
- pxylb-4.pg_install: install_dirs pxylb-4.pg
--	$(INSTALL_DTA) pxylb-4.pg ${prefix}/workloads
-+	$(INSTALL_DTA) pxylb-4.pg ${datadir}/polygraph/workloads
- 
- simple.pg_install: install_dirs simple.pg
--	$(INSTALL_DTA) simple.pg ${prefix}/workloads
-+	$(INSTALL_DTA) simple.pg ${datadir}/polygraph/workloads
- 
- srvlb-l4-4.pg_install: install_dirs srvlb-l4-4.pg
--	$(INSTALL_DTA) srvlb-l4-4.pg ${prefix}/workloads
-+	$(INSTALL_DTA) srvlb-l4-4.pg ${datadir}/polygraph/workloads
- 
- srvlb-l7-4.pg_install: install_dirs srvlb-l7-4.pg
--	$(INSTALL_DTA) srvlb-l7-4.pg ${prefix}/workloads
-+	$(INSTALL_DTA) srvlb-l7-4.pg ${datadir}/polygraph/workloads
- 
- test_csm.pg_install: install_dirs test_csm.pg
--	$(INSTALL_DTA) test_csm.pg ${prefix}/workloads
-+	$(INSTALL_DTA) test_csm.pg ${datadir}/polygraph/workloads
- 
- test_polypxy.pg_install: install_dirs test_polypxy.pg
--	$(INSTALL_DTA) test_polypxy.pg ${prefix}/workloads
-+	$(INSTALL_DTA) test_polypxy.pg ${datadir}/polygraph/workloads
- 
- webaxe-1.pg_install: install_dirs webaxe-1.pg
--	$(INSTALL_DTA) webaxe-1.pg ${prefix}/workloads
-+	$(INSTALL_DTA) webaxe-1.pg ${datadir}/polygraph/workloads
- 
- webaxe-3.pg_install: install_dirs webaxe-3.pg
--	$(INSTALL_DTA) webaxe-3.pg ${prefix}/workloads
-+	$(INSTALL_DTA) webaxe-3.pg ${datadir}/polygraph/workloads
- 
- webaxe-4.pg_install: install_dirs webaxe-4.pg
--	$(INSTALL_DTA) webaxe-4.pg ${prefix}/workloads
-+	$(INSTALL_DTA) webaxe-4.pg ${datadir}/polygraph/workloads
- 
- all: all_subdirs datacomm-1.pg downtime-2.pg nolb-l4-4.pg polyfill-2.pg polymix-1.pg polymix-2.pg polymix-3.pg polymix-4.pg pxylb-4.pg simple.pg srvlb-l4-4.pg srvlb-l7-4.pg test_csm.pg test_polypxy.pg webaxe-1.pg webaxe-3.pg webaxe-4.pg
- 
-@@ -122,7 +122,7 @@
- 
- install: install_subdirs datacomm-1.pg downtime-2.pg nolb-l4-4.pg polyfill-2.pg polymix-1.pg polymix-2.pg polymix-3.pg polymix-4.pg pxylb-4.pg simple.pg srvlb-l4-4.pg srvlb-l7-4.pg test_csm.pg test_polypxy.pg webaxe-1.pg webaxe-3.pg webaxe-4.pg
- install_dirs: 
--	@for d in ${prefix}/workloads/; do \
-+	@for d in ${datadir}/polygraph/workloads ; do \
- 		if test ! -d $$d; then echo mkdir -p $$d; mkdir -p $$d; fi; \
- 	done
- 
diff --git a/benchmarks/polygraph31/files/patch-workloads-include-Makefile.in b/benchmarks/polygraph31/files/patch-workloads-include-Makefile.in
deleted file mode 100644
index 3852d88cc9bf..000000000000
--- a/benchmarks/polygraph31/files/patch-workloads-include-Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- workloads/include/Makefile.in.orig	Sat Aug  3 14:23:13 2002
-+++ workloads/include/Makefile.in	Sat Aug  3 14:24:50 2002
-@@ -45,25 +45,25 @@
- default: all
- 
- benches.pg_install: install_dirs benches.pg
--	$(INSTALL_DTA) benches.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) benches.pg ${datadir}/polygraph/workloads/include
- 
- contents.pg_install: install_dirs contents.pg
--	$(INSTALL_DTA) contents.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) contents.pg ${datadir}/polygraph/workloads/include
- 
- phases.pg_install: install_dirs phases.pg
--	$(INSTALL_DTA) phases.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) phases.pg ${datadir}/polygraph/workloads/include
- 
- pipes.pg_install: install_dirs pipes.pg
--	$(INSTALL_DTA) pipes.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) pipes.pg ${datadir}/polygraph/workloads/include
- 
- polymix-3-guts.pg_install: install_dirs polymix-3-guts.pg
--	$(INSTALL_DTA) polymix-3-guts.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) polymix-3-guts.pg ${datadir}/polygraph/workloads/include
- 
- polymix-4-guts.pg_install: install_dirs polymix-4-guts.pg
--	$(INSTALL_DTA) polymix-4-guts.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) polymix-4-guts.pg ${datadir}/polygraph/workloads/include
- 
- webaxe-4-guts.pg_install: install_dirs webaxe-4-guts.pg
--	$(INSTALL_DTA) webaxe-4-guts.pg ${prefix}/workloads/include
-+	$(INSTALL_DTA) webaxe-4-guts.pg ${datadir}/polygraph/workloads/include
- 
- all: all_subdirs benches.pg contents.pg phases.pg pipes.pg polymix-3-guts.pg polymix-4-guts.pg webaxe-4-guts.pg
- 
-@@ -80,7 +80,7 @@
- 
- install: install_subdirs benches.pg contents.pg phases.pg pipes.pg polymix-3-guts.pg polymix-4-guts.pg webaxe-4-guts.pg
- install_dirs: 
--	@for d in ${prefix}/workloads/include/; do \
-+	@for d in ${datadir}/polygraph/workloads/include/; do \
- 		if test ! -d $$d; then echo mkdir -p $$d; mkdir -p $$d; fi; \
- 	done
- 
diff --git a/benchmarks/polygraph31/pkg-descr b/benchmarks/polygraph31/pkg-descr
deleted file mode 100644
index 9d618be1b026..000000000000
--- a/benchmarks/polygraph31/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Web Polygraph is a benchmarking tool for Web proxies. Polygraph
-distribution includes a high-performance client and server simulators.
-The simulators create a stream of HTTP requests that can be routed through
-a Web proxy. Studying proxy performance under various [stress] conditions is
-essential for performance tuning, evaluation of new algorithms, analysis of
-hardware configurations, and comparing available proxy products.
-
-Documentation can be found at http://polygraph.ircache.net/doc/
-
-WWW: http://www.web-polygraph.org/
-
---Dima
-dima@chg.ru
diff --git a/benchmarks/polygraph31/pkg-plist b/benchmarks/polygraph31/pkg-plist
deleted file mode 100644
index 927b65a85e09..000000000000
--- a/benchmarks/polygraph31/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-bin/aka
-bin/cdb
-bin/distr_test
-bin/dns_cfg
-bin/lr
-bin/ltrace
-bin/lx
-bin/pgl2acl
-bin/pgl2eng
-bin/pgl2ldif
-bin/pgl_test
-bin/polyclt
-bin/polymon
-bin/polyprobe
-bin/polypxy
-bin/polyrrd
-bin/polysrv
-bin/pop_test
-bin/reporter
-bin/rng_test
-bin/tcp2xmld
-bin/udp2tcpd
-%%DATADIR%%/ReportGen/label_results
-%%DATADIR%%/ReportGen/make_report
-%%DATADIR%%/ReportGen/make_card
-%%DATADIR%%/ReportGen/plot_traces
-%%DATADIR%%/ReportGen/plot_table
-%%DATADIR%%/ReportGen/Globs.pm
-%%DATADIR%%/ReportGen/Line.pm
-%%DATADIR%%/ReportGen/ObjDbase.pm
-%%DATADIR%%/ReportGen/ObjManip.pm
-%%DATADIR%%/ReportGen/Opts.pm
-%%DATADIR%%/ReportGen/Plot.pm
-%%DATADIR%%/ReportGen/RepFormat.pm
-%%DATADIR%%/ReportGen/reportgen.cfg
-%%DATADIR%%/workloads/datacomm-1.pg
-%%DATADIR%%/workloads/downtime-2.pg
-%%DATADIR%%/workloads/include/benches.pg
-%%DATADIR%%/workloads/include/contents.pg
-%%DATADIR%%/workloads/include/phases.pg
-%%DATADIR%%/workloads/include/pipes.pg
-%%DATADIR%%/workloads/include/polymix-3-guts.pg
-%%DATADIR%%/workloads/include/polymix-4-guts.pg
-%%DATADIR%%/workloads/include/webaxe-4-guts.pg
-%%DATADIR%%/workloads/nolb-l4-4.pg
-%%DATADIR%%/workloads/polyfill-2.pg
-%%DATADIR%%/workloads/polymix-1.pg
-%%DATADIR%%/workloads/polymix-2.pg
-%%DATADIR%%/workloads/polymix-3.pg
-%%DATADIR%%/workloads/polymix-4.pg
-%%DATADIR%%/workloads/pxylb-4.pg
-%%DATADIR%%/workloads/simple.pg
-%%DATADIR%%/workloads/srvlb-l4-4.pg
-%%DATADIR%%/workloads/srvlb-l7-4.pg
-%%DATADIR%%/workloads/test_csm.pg
-%%DATADIR%%/workloads/test_polypxy.pg
-%%DATADIR%%/workloads/webaxe-1.pg
-%%DATADIR%%/workloads/webaxe-3.pg
-%%DATADIR%%/workloads/webaxe-4.pg
-@dirrm %%DATADIR%%/ReportGen
-@dirrm %%DATADIR%%/workloads/include
-@dirrm %%DATADIR%%/workloads
-@dirrm %%DATADIR%%
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
deleted file mode 100644
index d28966dcebc6..000000000000
--- a/benchmarks/sipp/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:    sipp
-# Date created:         15 Jun 2004
-# Whom:                 jesper@jdn.dk
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sipp
-PORTVERSION=	0.3
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	sipp
-
-MAINTAINER=	jesper@jdn.dk
-COMMENT=	SIP testing tool
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_FILES=	bin/sipp
-MAN1=		sipp.1
-
-pre-install:
-	@${CP} ${FILESDIR}/${MAN1} ${WRKSRC}/
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sipp.1 ${PREFIX}/man/man1/sipp.1
-
-.include <bsd.port.mk>
diff --git a/benchmarks/sipp/distinfo b/benchmarks/sipp/distinfo
deleted file mode 100644
index ae067212fe49..000000000000
--- a/benchmarks/sipp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (sipp-0.3.tar.gz) = e088f4aa98bda0f3300b1250bd24094a
-SIZE (sipp-0.3.tar.gz) = 57099
diff --git a/benchmarks/sipp/files/patch-Makefile b/benchmarks/sipp/files/patch-Makefile
deleted file mode 100644
index 270f90c5b2df..000000000000
--- a/benchmarks/sipp/files/patch-Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.orig	Tue Jun 15 14:25:12 2004
-+++ Makefile	Tue Jun 15 14:25:28 2004
-@@ -30,6 +30,7 @@
- 
- # Libraries directories
- LIBDIR_linux=
-+LIBDIR_FreeBSD=
- LIBDIR_hpux=
- LIBDIR_tru64=
- 
-@@ -50,6 +51,7 @@
- # SYSTEM nickname
- SYSTEM_HP-UX=hpux
- SYSTEM_Linux=linux
-+SYSTEM_FreeBSD=freebsd
- SYSTEM_OSF1=tru64
- SYSTEM=$(SYSTEM_$(OSNAME))
- 
-@@ -60,29 +62,34 @@
- CPP_hpux=aCC  
- CPP_linux=gcc  
- CPP_tru64=cxx  
-+CPP_freebsd=g++  
- CPP=$(CPP_$(SYSTEM))
- 
- #C Compiler Flags
- CFLAGS_hpux=-D__HPUX +DAportable
- CFLAGS_linux=-D__LINUX -pthread
-+CFLAGS_freebsd=-D__LINUX -pthread
- CFLAGS_tru64=-D__OSF1 -pthread
- CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__
- 
- #C++ Compiler Flags
- CPPFLAGS_hpux=-AA -mt -D__HPUX +DAportable
- CPPFLAGS_linux=-D__LINUX -pthread
-+CPPFLAGS_freebsd=-D__LINUX -pthread
- CPPFLAGS_tru64=-D__OSF1 -pthread
- CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__
- 
- #Linker mapping
- CCLINK_hpux=aCC
- CCLINK_linux=gcc
-+CCLINK_freebsd=g++
- CCLINK_tru64=cxx
- CCLINK=$(CCLINK_$(SYSTEM))
- 
- #Linker Flags
- LFLAGS_hpux=-AA -mt +DAportable
- LFLAGS_linux=
-+LFLAGS_freebsd=
- LFLAGS_tru64=
- LFLAGS=$(LFLAGS_$(SYSTEM))
- 
-@@ -90,6 +97,7 @@
- LIBS_linux= -ldl -lpthread -lcurses -lstdc++
- LIBS_hpux= -lcurses
- LIBS_tru64= -lcurses -lpthread
-+LIBS_freebsd= -lcurses -pthread
- LIBS=$(LIBS_$(SYSTEM))
- 
- # Operating system detection rule
diff --git a/benchmarks/sipp/files/patch-comp.h b/benchmarks/sipp/files/patch-comp.h
deleted file mode 100644
index d96897196d6f..000000000000
--- a/benchmarks/sipp/files/patch-comp.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- comp.h.orig	Thu Jun 17 08:32:56 2004
-+++ comp.h	Thu Jun 17 08:33:04 2004
-@@ -19,6 +19,9 @@
-  *           From Hewlett Packard Company.
-  */
- 
-+#if __FreeBSD__ < 5
-+#include <sys/types.h>
-+#endif
- #include <sys/socket.h>
- 
- #ifdef __cplusplus
diff --git a/benchmarks/sipp/files/sipp.1 b/benchmarks/sipp/files/sipp.1
deleted file mode 100644
index 58b4b19858a1..000000000000
--- a/benchmarks/sipp/files/sipp.1
+++ /dev/null
@@ -1,448 +0,0 @@
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  | will give a
-.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
-.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
-.\" expand to `' in nroff, nothing in troff, for use with C<>.
-.tr \(*W-|\(bv\*(Tr
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.\"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "sipp 1"
-.TH sipp 1 "2004-06-16" "sipp" "User Contributed Documentation"
-.SH "NAME"
-sipp \- A benchworking tool for the SIP protocol.
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Sipp is a performance test tool / traffic generator for the \s-1SIP\s0 
-protocol. It comes with a few basic SipStone user-agents
-scenarios (\s-1UAC\s0 & \s-1UAS\s0), establishing and releasing multiple 
-calls with the \s-1INVITE\s0 and \s-1BYE\s0 methods. 
-.PP
-It can also read \s-1XML\s0 scenario files describing any performance 
-testing configuration for \s-1SIP\s0.
-.SH "SYNTAX"
-.IX Header "SYNTAX"
-.Vb 1
-\&  sipp remote_host[:remote_port] [options]
-.Ve
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.Vb 1
-\&   -v               : Display version and copyright information.
-.Ve
-.PP
-.Vb 1
-\&   -bg              : Launch the tool in background mode.
-.Ve
-.PP
-.Vb 2
-\&   -p local_port    : Set the local port number. Default is a
-\&                      random free port chosen by the system.
-.Ve
-.PP
-.Vb 3
-\&   -i local_ip      : Set the local IP address for 'Contact:',
-\&                      'Via:', and 'From:' headers. Default is
-\&                      primary host IP address.
-.Ve
-.PP
-.Vb 5
-\&   -d duration      : Controls the length (in milliseconds) of
-\&                      of calls. More precisely, this controls
-\&                      the duration of 'pause' instructions in
-\&                      the scenario, if they do not have a
-\&                      'milliseconds' section. Default value is 0.
-.Ve
-.PP
-.Vb 3
-\&   -r rate (cps)    : Set the call rate (in calls per seconds).
-\&                      This value can be changed during test by
-\&                      pressing ENTER. Default is 10.
-.Ve
-.PP
-.Vb 5
-\&   -sf filename     : Loads an alternate xml scenario file.
-\&                      To learn more about XML scenario syntax,
-\&                      use the -sd option to dump embedded 
-\&                      scenarios. They contain all the necessary
-\&                      help.
-.Ve
-.PP
-.Vb 3
-\&   -sn name         : Use a default scenario (embedded in
-\&                      the sipp executable). Available values
-\&                      in this version:
-.Ve
-.PP
-.Vb 4
-\&                        'uac'      : Standard SipStone UAC (default).
-\&                        'uas'      : Simple UAS responder (UDP only).
-\&                        'regexp'   : Standard SipStone UAC - with
-\&                                     regexp and variables.
-.Ve
-.PP
-.Vb 1
-\&                      Default 3pcc scanerios (see -3pcc option):
-.Ve
-.PP
-.Vb 5
-\&                        '3pcc-C-A' : Controller A side (must be started
-\&                                     after all other 3pcc scenarios)
-\&                        '3pcc-C-B' : Controller B side.
-\&                        '3pcc-A'   : A side.
-\&                        '3pcc-B'   : B side.
-.Ve
-.PP
-.Vb 2
-\&   -sd name         : Dumps a default scenario (embeded in
-\&                      the sipp executable)
-.Ve
-.PP
-.Vb 1
-\&   -t [u1|un|t1|tn] : Set the transport mode:
-.Ve
-.PP
-.Vb 4
-\&                        u1: UDP with one socket (default),
-\&                        un: UDP with one socket per call,
-\&                        t1: TCP with one socket,
-\&                        tn: TCP with one socket per call.
-.Ve
-.PP
-.Vb 2
-\&   -trace_msg       : Displays sent and received SIP messages in
-\&                      sipp_messages.log
-.Ve
-.PP
-.Vb 3
-\&   -trace_stat      : Dumps all statistics in the <scenario_name.csv>
-\&                      file. Use the '-h stat' option for a detailed
-\&                      description of the statistics file content.
-.Ve
-.PP
-.Vb 6
-\&  The  -trace_stat option dumps all statistics in the
-\&  <scenario_name.csv> file. The dump starts with one header
-\&  line with all counters. All following lines are 'snapshots' of 
-\&  statistics counter given the statistics report frequency
-\&  (-fd option). This file can be easily imported in any
-\&  spreadsheet application, like Excel.
-.Ve
-.PP
-.Vb 3
-\&  In counter names, (P) means 'Periodic' - since last
-\&  statistic row and (C) means 'Cumulated' - since sipp was
-\&  started.
-.Ve
-.PP
-.Vb 1
-\&  Available statistics are:
-.Ve
-.PP
-.Vb 2
-\&  - StartTime: 
-\&    Date and time when the test has started.
-.Ve
-.PP
-.Vb 2
-\&  - LastResetTime:
-\&    Date and time when periodic counters where last reseted.
-.Ve
-.PP
-.Vb 2
-\&  - CurrentTime:
-\&    Date and time of the statistic row.
-.Ve
-.PP
-.Vb 2
-\&  - ElapsedTime:
-\&    Elapsed time.
-.Ve
-.PP
-.Vb 2
-\&  - CallRate:
-\&    Call rate (calls per seconds).
-.Ve
-.PP
-.Vb 2
-\&  - IncomingCall:
-\&    Number of incoming calls.
-.Ve
-.PP
-.Vb 2
-\&  - OutgoingCall:
-\&    Number of outgoing calls.
-.Ve
-.PP
-.Vb 2
-\&  - TotalCallCreated:
-\&    Number of calls created.
-.Ve
-.PP
-.Vb 2
-\&  - CurrentCall:
-\&    Number of calls currently ongoing.
-.Ve
-.PP
-.Vb 2
-\&  - SuccessfulCall:
-\&    Number of successful calls.
-.Ve
-.PP
-.Vb 2
-\&  - FailedCall:
-\&    Number of failed calls (all reasons).
-.Ve
-.PP
-.Vb 3
-\&  - FailedCannotSendMessage:
-\&    Number of failed calls because Sipp cannot send the
-\&    message (transport issue).
-.Ve
-.PP
-.Vb 3
-\&  - FailedMaxUDPRetrans:
-\&    Number of failed calls because the maximum number of
-\&    UDP retransmission attempts has been reached.
-.Ve
-.PP
-.Vb 3
-\&  - FailedUnexpectedMessage:
-\&    Number of failed calls because the SIP message received
-\&    cannot be associated to an existing call.
-.Ve
-.PP
-.Vb 4
-\&  - FailedCallRejected:
-\&    Number of failed calls because of Sipp internal error.
-\&    (a scenario sync command is not recognized or a scenario
-\&    action failed or a scenario variable assignment failed).
-.Ve
-.PP
-.Vb 4
-\&  - FailedCmdNotSent:
-\&    Number of failed calls because of inter-Sipp
-\&    communication error (a scenario sync command failed to
-\&    be sent).
-.Ve
-.PP
-.Vb 5
-\&  - FailedRegexpDoesntMatch:
-\&    Number of failed calls because of regexp that doesn't
-\&    match (there might be several regexp that don't match
-\&    during the call but the counter is increased only by
-\&    one).
-.Ve
-.PP
-.Vb 3
-\&  - FailedRegexpHdrNotFound:
-\&    Number of failed calls because of regexp with hdr    
-\&    option but no matching header found.
-.Ve
-.PP
-.Vb 1
-\&   -stf file_name   : Set the file name to use to dump statistics
-.Ve
-.PP
-.Vb 2
-\&   -trace_err       : Trace all unexpected messages in
-\&                      sipp_errors.log.
-.Ve
-.PP
-.Vb 2
-\&   -s service_name  : Set the username part of the resquest URI.
-\&                      Default is 'service'.
-.Ve
-.PP
-.Vb 2
-\&   -f frequency     : Set the statistics report frequency on screen
-\&                      (in seconds). Default is 1.
-.Ve
-.PP
-.Vb 2
-\&   -fd frequency    : Set the statistics dump log report frequency
-\&                      (in seconds). Default is 60.
-.Ve
-.PP
-.Vb 4
-\&   -l calls_limit   : Set the maximum number of simultaneous
-\&                      calls. Once this limit is reached, traffic
-\&                      is decreased until the number of open calls
-\&                      goes down. Default:
-.Ve
-.PP
-.Vb 1
-\&                        (3 * call_duration (s) * rate).
-.Ve
-.PP
-.Vb 2
-\&   -m calls         : Stop the test and exit when 'calls' calls are
-\&                      processed.
-.Ve
-.PP
-.Vb 3
-\&   -mp local_port   : Set the local RTP echo port number. Default
-\&                      is none. RTP/UDP packets received on that
-\&                      port are echoed to their sender.
-.Ve
-.PP
-.Vb 1
-\&   -mi local_rtp_ip : Set the local IP address for RTP echo.
-.Ve
-.PP
-.Vb 5
-\&   -3pcc ip:port    : Launch the tool in 3pcc mode ("Third Party
-\&                      call control"). The passed ip address
-\&                      is the address of the twin sipp 3pcc tool
-\&                      The used scenario must be a 3pcc relative
-\&                      scenario
-.Ve
-.PP
-.Vb 1
-\&   -nr              : Disable retransmission in UDP mode.
-.Ve
-.SH "EXIT CODE"
-.IX Header "EXIT CODE"
-.Vb 7
-\&   Upon exit (on fatal error or when the number of asked calls (-m
-\&   option) is reached, sipp exits with one of the following exit
-\&   code:
-\&    0: All calls were successful
-\&    1: At least one call failed
-\&   99: Normal exit without calls processed
-\&   -1: Fatal error
-.Ve
-.SH "EXAMPLES"
-.IX Header "EXAMPLES"
-.Vb 4
-\&   Run sipp with embedded server (uas) scenario:
-\&     sipp -sn uas
-\&   On the same host, run sipp with embedded client (uac) scenario
-\&     sipp -sn uac 127.0.0.1
-.Ve
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-.Vb 2
-\&        Richard Gayraud <richard_gayraud@users.sourceforge.net>
-\&        O Jacques <ojacques@users.sourceforge.net>
-.Ve
diff --git a/benchmarks/sipp/pkg-descr b/benchmarks/sipp/pkg-descr
deleted file mode 100644
index b7635f87453e..000000000000
--- a/benchmarks/sipp/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Sipp is a performance test tool / traffic generator for the SIP protocol. 
-
-It comes with a few basic SipStone user-agents scenarios (UAC & UAS), i
-establishing and releasing multiple calls with the INVITE and BYE methods. 
-
-WWW: http://sipp.sourceforge.net/
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
deleted file mode 100644
index d711f418d74d..000000000000
--- a/benchmarks/unixbench/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:    bytebench
-# Date created:         28 December 1995
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bytebench
-PORTVERSION=	3.1
-CATEGORIES=	benchmarks
-MASTER_SITES=	ftp://ftp.inria.fr/archives/system/benchmark/
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	se@FreeBSD.org
-COMMENT=	The BYTE magazine benchmark suite
-
-do-install:
-	-${MKDIR} $(PREFIX)/lib/bytebench
-	for f in Makefile README Run doc pgms results testdir; \
-		do ${CP} -R $(WRKSRC)/$$f $(PREFIX)/lib/bytebench; done
-	${ECHO_CMD} "#!/bin/sh"		   >  $(PREFIX)/bin/bytebench
-	${ECHO_CMD} "TMPDIR=\$${TMPDIR-/var/tmp}" >> $(PREFIX)/bin/bytebench
-	${ECHO_CMD} "RESULTDIR=/tmp"		   >> $(PREFIX)/bin/bytebench
-	${ECHO_CMD} "export TMPDIR RESULTDIR"	   >> $(PREFIX)/bin/bytebench
-	${ECHO_CMD} "cd $(PREFIX)/lib/bytebench"  >> $(PREFIX)/bin/bytebench
-	${ECHO_CMD} "exec ./Run \"\$$@\""	   >> $(PREFIX)/bin/bytebench
-	${CHMOD} 755 $(PREFIX)/bin/bytebench
-	${CHMOD} 644 $(PREFIX)/lib/bytebench/Makefile
-	${CHMOD} 644 $(PREFIX)/lib/bytebench/README
-	${CHMOD} 755 $(PREFIX)/lib/bytebench/Run
-	${CHMOD} 755 $(PREFIX)/lib/bytebench/doc
-	${CHMOD} 755 $(PREFIX)/lib/bytebench/pgms
-	${CHMOD} 755 $(PREFIX)/lib/bytebench/pgms/*
-	${CHMOD} 755 $(PREFIX)/lib/bytebench/results
-	${CHMOD} 755 $(PREFIX)/lib/bytebench/testdir
-	@${RM} -f ${PREFIX}/lib/bytebench/pgms/*.orig
-
-.include <bsd.port.mk>
diff --git a/benchmarks/unixbench/distinfo b/benchmarks/unixbench/distinfo
deleted file mode 100644
index aa43b7a5bcdd..000000000000
--- a/benchmarks/unixbench/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (bytebench-3.1.tar.Z) = 93c718fee38d27c050edcb3a50530b2e
-SIZE (bytebench-3.1.tar.Z) = 76377
diff --git a/benchmarks/unixbench/files/patch-aa b/benchmarks/unixbench/files/patch-aa
deleted file mode 100644
index 011f1cc85f71..000000000000
--- a/benchmarks/unixbench/files/patch-aa
+++ /dev/null
@@ -1,96 +0,0 @@
---- Makefile.orig	Wed Feb  5 02:08:43 1992
-+++ Makefile	Fri Feb  4 21:15:26 2000
-@@ -24,18 +24,19 @@
- ##############################################################################
- ID="@(#)Makefile:3.9 -- 5/15/91 19:30:15";
- SHELL = /bin/sh
--#HZ = ????  	   #(read from environment)
--CFLAGS = -DTIME
--OPTON = -O        #optimization on (give it your best shot) 
--                  #            -- check your compiler man
--OPTOFF = -Od      #optimization off -- check your compiler man
-+HZ = 128
-+CFLAGS ?= -O -finline-functions -funroll-loops -fomit-frame-pointer
-+CFLAGS+=-DTIME
-+                          #optimization on (give it your best shot) 
-+                          #            -- check your compiler man
-+OPTOFF = -O0 -static      #optimization off -- check your compiler man
- # local directories
- PROGDIR = ./pgms
- SRCDIR = ./src
- DOCDIR = ./doc
- TESTDIR = ./testdir
--RESULTDIR = ./results
--TMPDIR = ./tmp
-+# RESULTDIR = ./results
-+# TMPDIR = /var/tmp
- # other directories
- INCLDIR = /usr/include
- LIBDIR = /lib
-@@ -128,45 +129,45 @@
- 
- # Individual programs
- $(PROGDIR)/arithoh:	$(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c
- $(PROGDIR)/register: $(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum=register $(SRCDIR)/arith.c
- $(PROGDIR)/short: $(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c
- $(PROGDIR)/int: $(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c
- $(PROGDIR)/long: $(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c
- $(PROGDIR)/float: $(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c
- $(PROGDIR)/double: $(SRCDIR)/arith.c
--	cc -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c
-+	$(CC) -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c
- $(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c
--	cc -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c
-+	$(CC) -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c
- $(PROGDIR)/fstime: $(SRCDIR)/fstime.c
--	cc -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c
-+	$(CC) -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} -Dawk=1 $(SRCDIR)/fstime.c
- $(PROGDIR)/syscall: $(SRCDIR)/syscall.c
--	cc -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c
-+	$(CC) -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c
- $(PROGDIR)/context1: $(SRCDIR)/context1.c
--	cc -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c
-+	$(CC) -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c
- $(PROGDIR)/pipe: $(SRCDIR)/pipe.c
--	cc -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c
-+	$(CC) -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c
- $(PROGDIR)/spawn: $(SRCDIR)/spawn.c
--	cc -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c
-+	$(CC) -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c
- $(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c
--	cc -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c
-+	$(CC) -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c
- $(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
--	cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c  
--	cd $(SRCDIR); cc -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c  
--	cc -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o 
-+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c  
-+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c  
-+	$(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o 
- 	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o 
- $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h 
--	cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
--	cd $(SRCDIR); cc -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
--	cc -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
-+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
-+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
-+	$(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
- 	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
- $(PROGDIR)/looper: $(SRCDIR)/looper.c
--	cc -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c
-+	$(CC) -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c
- 
- # Run the benchmarks and create the reports
- run:
diff --git a/benchmarks/unixbench/files/patch-ab b/benchmarks/unixbench/files/patch-ab
deleted file mode 100644
index 062decfb4f86..000000000000
--- a/benchmarks/unixbench/files/patch-ab
+++ /dev/null
@@ -1,129 +0,0 @@
-*** Run.orig	Wed Feb  5 11:08:46 1992
---- Run	Fri Dec 18 22:48:52 1998
-***************
-*** 41,45 ****
-  #	awk cat cc chmod comm cp date dc df echo ed expr
-  #	kill ls make mkdir rm sed test time touch tty umask who
-! #       AND /bin/time
-  #  to generate result indexes, you will also need ...
-  #       join
---- 41,45 ----
-  #	awk cat cc chmod comm cp date dc df echo ed expr
-  #	kill ls make mkdir rm sed test time touch tty umask who
-! #       AND /usr/bin/time
-  #  to generate result indexes, you will also need ...
-  #       join
-***************
-*** 51,55 ****
-  then
-     # determine flavor of UNIX from number of lines generated by /bin/tim
-!    Fcount=`/bin/time date 2>&1 | wc -l | sed 's/ //g'`
-     case "$Fcount"
-     in
---- 51,55 ----
-  then
-     # determine flavor of UNIX from number of lines generated by /bin/tim
-!    Fcount=`/usr/bin/time date 2>&1 | wc -l | sed 's/ //g'`
-     case "$Fcount"
-     in
-***************
-*** 68,75 ****
-  export FLAVOR
-  # check that the required files are in the proper places
-! if make check 
-!         then :
-!         else make all
-! fi
-  #
-  #
---- 68,75 ----
-  export FLAVOR
-  # check that the required files are in the proper places
-! #if make check 
-! #        then :
-! #        else make all
-! #fi
-  #
-  #
-***************
-*** 93,97 ****
-  cd $PWD
-  
-! TMPDIR=${HOMEDIR}/tmp
-  cd $TMPDIR
-  TMPDIR=`pwd`
---- 93,97 ----
-  cd $PWD
-  
-! TMPDIR=${TMPDIR-${HOMEDIR}/tmp}
-  cd $TMPDIR
-  TMPDIR=`pwd`
-***************
-*** 304,312 ****
-    C)  
-      logmsg="C Compiler Test"
-!     prog="looper ${looper-60} cc cctest.c"
-      stdout=/dev/null
-      repeat="$shortloop"
-      cleanopt="-m $TMPTIMES"
-!     rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
-      ;;
-  
---- 304,312 ----
-    C)  
-      logmsg="C Compiler Test"
-!     prog="looper ${looper-60} cc cctest.c -o ${TMPDIR}/a.out"
-      stdout=/dev/null
-      repeat="$shortloop"
-      cleanopt="-m $TMPTIMES"
-!     rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
-      ;;
-  
-***************
-*** 324,329 ****
-    dc)  
-      logmsg="Dc: sqrt(2) to 99 decimal places"
-!     prog="looper ${looper-60} dc"
-!     stdin=dc.dat
-      stdout=/dev/null
-      cleanopt="-m $TMPTIMES"
---- 324,329 ----
-    dc)  
-      logmsg="Dc: sqrt(2) to 99 decimal places"
-!     prog="looper ${looper-60} \"dc < ${TESTDIR}/dc.dat\""
-!     stdin=
-      stdout=/dev/null
-      cleanopt="-m $TMPTIMES"
-***************
-*** 418,426 ****
-            if test "$stdin" = ""  
-            then # without redirected stdin
-!              /bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
-            else # with redirected stdin
-!              /bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
-            fi 
-- 	  /bin/time $benchcmd
-  	  ###############################################
-  	  cd $pwd                    # move back home
---- 418,425 ----
-            if test "$stdin" = ""  
-            then # without redirected stdin
-!              /usr/bin/time $prog $opt $bgstr 2>>$TMPTIMES >>$stdout
-            else # with redirected stdin
-!              /usr/bin/time $prog $opt $bgstr <$stdin 2>>$TMPTIMES >>$stdout
-            fi 
-  	  ###############################################
-  	  cd $pwd                    # move back home
-***************
-*** 451,455 ****
-      in
-        C)
-!       rm -f ${TESTDIR}/cctest.o ${TESTDIR}/a.out
-        ;;
-  
---- 451,455 ----
-      in
-        C)
-!       rm -f ${TESTDIR}/cctest.o ${TMPDIR}/a.out
-        ;;
-  
diff --git a/benchmarks/unixbench/files/patch-ac b/benchmarks/unixbench/files/patch-ac
deleted file mode 100644
index 7cab0456099b..000000000000
--- a/benchmarks/unixbench/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-*** pgms/tst.sh.orig	Wed Feb  5 11:08:39 1992
---- pgms/tst.sh	Fri Dec 18 23:10:07 1998
-***************
-*** 15,19 ****
-  ###############################################################################
-  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
-! sort >sort.$$ <sort.src
-  od sort.$$ | sort -n +1 > od.$$
-  grep the sort.$$ | tee grep.$$ | wc > wc.$$
---- 15,19 ----
-  ###############################################################################
-  ID="@(#)tst.sh:3.4 -- 5/15/91 19:30:24";
-! sort >sort.$$ < ${TESTDIR}/sort.src
-  od sort.$$ | sort -n +1 > od.$$
-  grep the sort.$$ | tee grep.$$ | wc > wc.$$
diff --git a/benchmarks/unixbench/files/patch-ad b/benchmarks/unixbench/files/patch-ad
deleted file mode 100644
index 12de4faa1333..000000000000
--- a/benchmarks/unixbench/files/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-*** pgms/cleanup.sh.orig	Wed Feb  5 11:08:37 1992
---- pgms/cleanup.sh	Wed Jan  3 19:27:21 1996
-***************
-*** 87,92 ****
-      
-      -r) : reason for failure
-! 	echo $1
-! 	echo $1 >>$LOGFILE
-  	shift
-  	;;
---- 87,92 ----
-      
-      -r) : reason for failure
-! 	echo -e $1
-! 	echo -e $1 >>$LOGFILE
-  	shift
-  	;;
diff --git a/benchmarks/unixbench/files/patch-ae b/benchmarks/unixbench/files/patch-ae
deleted file mode 100644
index 40131bbafc83..000000000000
--- a/benchmarks/unixbench/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-*** pgms/multi.sh.orig	Thu Jan  4 15:16:20 1996
---- pgms/multi.sh	Thu Jan  4 15:17:26 1996
-***************
-*** 15,18 ****
---- 15,19 ----
-  ###############################################################################
-  ID="@(#)multi.sh:3.4 -- 5/15/91 19:30:24";
-+ cd $TMPDIR
-  for i
-  do
diff --git a/benchmarks/unixbench/files/patch-af b/benchmarks/unixbench/files/patch-af
deleted file mode 100644
index 7ecc7b21e8dd..000000000000
--- a/benchmarks/unixbench/files/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/dhry_1.c.orig	Thu Jan 27 21:23:37 2000
-+++ src/dhry_1.c	Mon Mar 12 19:08:06 2001
-@@ -32,6 +32,7 @@
-  ***************************************************************************/
- char SCCSid[] = "@(#) @(#)dhry_1.c:3.4 -- 5/15/91 19:30:21";
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include "dhry.h"
- #include "timeit.c"
-@@ -78,7 +79,7 @@
-                 /* Measurements should last at least about 2 seconds */
- #endif
- #ifdef TIME
--extern long     time();
-+extern time_t   time();
-                 /* see library function "time"  */
- #define Too_Small_Time 2
-                 /* Measurements should last at least 2 seconds */
diff --git a/benchmarks/unixbench/pkg-descr b/benchmarks/unixbench/pkg-descr
deleted file mode 100644
index 8693a1581db4..000000000000
--- a/benchmarks/unixbench/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The BYTE benchmark suite tests several aspects of system performance.
-
-An article which describes the concepts and helps understand the results 
-can be found in the doc directory (/usr/local/lib/bytebench/doc usually.)
-
-This benchmark is quite prominent among Linux users, and there is a patched 
-version available from some web suite from where results are made available, 
-too.
-Since they offer some results of non-Linux systems for comparison, they might 
-be interested in FreeBSD reports, too ;-)
-
-Quoting from "README.submittal" of the Linux version of this benchmark suite:
-% Please e-mail test results along with platform info to:
-% results@silkroad.com
-% 
-% Included CPU info, speed, RAM, and host adapter and bus
-% info as well as any special compilation flags.
-% 
-% See TEMPLATE Below....
-% results will be included in the URL:
-% http://www.silkroad.com/bass/linux/bm.html
-% Thanks,
-% 
-% Tim Bass   (bass@silkroad.com)
diff --git a/benchmarks/unixbench/pkg-plist b/benchmarks/unixbench/pkg-plist
deleted file mode 100644
index 32c956709dd4..000000000000
--- a/benchmarks/unixbench/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-bin/bytebench
-lib/bytebench/Run
-lib/bytebench/pgms/looper
-lib/bytebench/pgms/cleanup.sh
-lib/bytebench/pgms/fs.awk
-lib/bytebench/pgms/index.awk
-lib/bytebench/pgms/index.base
-lib/bytebench/pgms/index.sh
-lib/bytebench/pgms/loopm.awk
-lib/bytebench/pgms/loops.awk
-lib/bytebench/pgms/multi.sh
-lib/bytebench/pgms/report.awk
-lib/bytebench/pgms/report.sh
-lib/bytebench/pgms/tst.sh
-lib/bytebench/pgms/arithoh
-lib/bytebench/pgms/register
-lib/bytebench/pgms/short
-lib/bytebench/pgms/int
-lib/bytebench/pgms/long
-lib/bytebench/pgms/float
-lib/bytebench/pgms/double
-lib/bytebench/pgms/hanoi
-lib/bytebench/pgms/fstime
-lib/bytebench/pgms/syscall
-lib/bytebench/pgms/context1
-lib/bytebench/pgms/pipe
-lib/bytebench/pgms/spawn
-lib/bytebench/pgms/execl
-lib/bytebench/pgms/dhry2
-lib/bytebench/pgms/dhry2reg
-lib/bytebench/pgms/byte.logo
-lib/bytebench/Makefile
-lib/bytebench/README
-lib/bytebench/doc/bench3.doc
-lib/bytebench/doc/bench.doc
-lib/bytebench/results/reports.shar
-lib/bytebench/testdir/dc.dat
-lib/bytebench/testdir/cctest.c
-lib/bytebench/testdir/sort.src
-@dirrm lib/bytebench/doc
-@dirrm lib/bytebench/results
-@dirrm lib/bytebench/pgms
-@dirrm lib/bytebench/testdir
-@dirrm lib/bytebench