4 files changed, 13 insertions, 30 deletions

diff --git a/benchmarks/webbench/Makefile b/benchmarks/webbench/Makefile
index 3cb3f63270ae..d0b9245256e7 100644
--- a/benchmarks/webbench/Makefile
+++ b/benchmarks/webbench/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webbench
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	benchmarks www
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/www/servers
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	apps/www/servers
 MAINTAINER=	hsn@netmag.cz
 COMMENT=	Simple forking web benchmark
 
+USE_GETOPT_LONG=yes
 MAN1=		webbench.1
 
 .include <bsd.port.mk>
diff --git a/benchmarks/webbench/distinfo b/benchmarks/webbench/distinfo
index ea691dfdf9a5..9bc90366779a 100644
--- a/benchmarks/webbench/distinfo
+++ b/benchmarks/webbench/distinfo
@@ -1 +1 @@
-MD5 (webbench-1.3.tar.gz) = 05e3125dd060571bcfc76f1e17d69b99
+MD5 (webbench-1.4.tar.gz) = 912e5359a6917dd618c0a2821f615b89
diff --git a/benchmarks/webbench/files/patch-Makefile b/benchmarks/webbench/files/patch-Makefile
deleted file mode 100644
index 3ae9a744cf32..000000000000
--- a/benchmarks/webbench/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Mon Jan 12 16:36:48 2004
-+++ Makefile	Tue Jan 13 23:08:29 2004
-@@ -1,17 +1,17 @@
--CFLAGS= -Wall -ggdb -W -O
--CC=gcc
- LIBS=
- LDFLAGS=
--PREFIX=/usr/local
- VERSION=1.3
- TMPDIR=/tmp/webbench-$(VERSION)
- all:   webbench
- 
- install: webbench
- 	install -s webbench $(DESTDIR)$(PREFIX)/bin	
-+	install webbench.1 $(DESTDIR)$(PREFIX)/man/man1	
-+.if !defined(NOPORTDOCS)
- 	install -d $(DESTDIR)$(PREFIX)/share/doc/webbench
- 	install debian/copyright $(DESTDIR)$(PREFIX)/share/doc/webbench
- 	install debian/changelog $(DESTDIR)$(PREFIX)/share/doc/webbench
-+.endif
- 
- webbench: webbench.o Makefile
- 	-ctags *.c
diff --git a/benchmarks/webbench/pkg-descr b/benchmarks/webbench/pkg-descr
index dfe95e6ae5ce..7a0b39788cd7 100644
--- a/benchmarks/webbench/pkg-descr
+++ b/benchmarks/webbench/pkg-descr
@@ -1,7 +1,12 @@
-webbench is very simple tool for benchmarking WWW or proxy servers. Uses fork()
-for simulating multiple clients and can use HTTP/0.9-HTTP/1.1 requests. This
-benchmark is not very realistic, but can test if your HTTPD can realy handle
-many clients at once (try to run some CGIs) without taking your machine down.
-Displays pages/min and bytes/sec.
+webbench is very simple HTTP benchmarking tool, which can benchmark
+both WWW and proxy servers. webbench uses fork() for simulating
+multiple clients and supports benchmarking by HTTP/0.9-HTTP/1.1
+requests (without Keep-Alive). This benchmark is not very realistic,
+but can test if your HTTPD can really handle many clients at once (try
+to run some CGIs) without taking your machine down. I am using this
+program for setting maximum number of Apaches. Webbench displays
+results in pages/min and bytes/sec.
 
 Radim Kolar
+
+WWW: http://home.tiscali.cz/~cz210552/webbench.html
\ No newline at end of file