5 files changed, 74 insertions, 46 deletions

diff --git a/www/webstone/Makefile b/www/webstone/Makefile
index 8fb8426a880f..12b82938418c 100644
--- a/www/webstone/Makefile
+++ b/www/webstone/Makefile
@@ -6,35 +6,39 @@
 #
 
 PORTNAME=	webstone
-PORTVERSION= 	2.0.1
+PORTVERSION= 	2.5
 CATEGORIES=	www benchmarks
-#WebStone no longer distributed by SGi
-#MASTER_SITES=	http://www.sgi.com/Products/WebFORCE/WebStone/
-DISTNAME=	WebStone-2.0
+MASTER_SITES=	ftp://ftp.mindcraft.com/webstone/ \
+		ftp://ftp.mindcraft.com/anonymous/webstone/ \
+		ftp://ftp.mindcraft.com/pub/webstone/
+DISTNAME=	ws25_src
+EXTRACT_SUFX=	.tgz 
 
 MAINTAINER=	sauber@netcom.com
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/WebStone/src
+WRKSRC=		${WRKDIR}/WebStone2.5/src
 ALL_TARGET=	install
 NO_INSTALL_MANPAGES=	yes
 
-post-extract:
-	( cd ${WRKSRC}; make clobber )
-
-# otherwise these files will be installed by do-install target below
-post-patch:
-	find ${WRKSRC}/.. -name '*.orig' | xargs rm -f
-
 do-install:
+	@${RM} ${WRKSRC}/../bin/runs/keepme
+	@${RMDIR} ${WRKSRC}/../bin/runs
 	@${MKDIR} ${PREFIX}/webstone/bin
 	@${MKDIR} ${PREFIX}/webstone/conf
+	@${MKDIR} ${PREFIX}/webstone/lgm
 	${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${PREFIX}/webstone/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${PREFIX}/webstone/lgm
 	${INSTALL_DATA} ${WRKSRC}/../conf/* ${PREFIX}/webstone/conf
 	${INSTALL_SCRIPT} ${WRKSRC}/../webstone  ${PREFIX}/webstone
+	@${MKDIR} ${WRKSRC}/../bin/runs
+	@${TOUCH} ${WRKSRC}/../bin/runs/keepme
 .for file in webclient webmaster genrand
 	strip ${PREFIX}/webstone/bin/${file}
 .endfor
+.for file in ws20_cgi ws25_cgi
+	strip ${PREFIX}/webstone/lgm/${file}
+.endfor
 
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
diff --git a/www/webstone/distinfo b/www/webstone/distinfo
index fd1ac1ad82ee..e3c9b1c1bb79 100644
--- a/www/webstone/distinfo
+++ b/www/webstone/distinfo
@@ -1 +1 @@
-MD5 (WebStone-2.0.tar.gz) = d607b43a55de9a5b40b3ff2b5ec7dc5f
+MD5 (ws25_src.tgz) = 07477db19663d4397ce9d6fe5e1be9e6
diff --git a/www/webstone/files/patch-ab b/www/webstone/files/patch-ab
new file mode 100644
index 000000000000..d2f98058f3b5
--- /dev/null
+++ b/www/webstone/files/patch-ab
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Mon Sep  4 18:52:21 2000
++++ Makefile.in	Mon Sep  4 18:52:45 2000
+@@ -64,9 +64,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
+-all:	$(TARGETS) cgi api
++all:	$(TARGETS) cgi
+ 
+-install: all install-api install-cgi
++install: all install-cgi
+ 	$(CP) $(TARGETS) $(BINDIR)
+ 
+ pure: all
diff --git a/www/webstone/pkg-descr b/www/webstone/pkg-descr
index c9c4045281ef..9412eb89cf9e 100644
--- a/www/webstone/pkg-descr
+++ b/www/webstone/pkg-descr
@@ -1,21 +1,19 @@
-WebStone is an open benchmark proposal to the server industry. It is
-designed to measure the performance of HTTP servers under multiple
-scenarios which reflect different Web site profiles. 
+The WebStone benchmark tests were originally developed by Silicon Graphics
+to measure the performance of Web server software and hardware products.
+WebStone 2.0.1 is a more portable version of the original WebStone
+benchmark which added support to use Windows NT systems as client test
+systems.
 
-The original WebStone benchmark was released in March, 1995. The original
-white paper describing this benchmark is available from
-http://www.sgi.com/Products/WebFORCE/WebStone/.
-
-WebStone is not a proprietary benchmark - it is an open benchmark. The
-source code is freely available, and anyone can examine it. By design,
-WebStone does not unfairly favor SGI, Netscape, or any other company - it
-is simply a performance measurement tool.
+Mindcraft, Inc. has acquired the rights to WebStone from Silicon Graphics.
+WebStone 2.5 is Mindcraft's enhancement to WebStone 2.0.1 to improve
+reliability and portability as well as to make tests more reproducible.
+WebStone 2.5 also offers new workloads for CGI and API tests (see below
+for more details). WebStone 2.5 provides performance-identical test
+results with WebStone 2.0.1 when using the same workloads
 
 This FreeBSD port rely on rsh and rcp being allowed for the user proces
 running webstone between the web server and web clients. This is not
 enable per default in FreeBSD, and root is never allowed to do it without
-entering password for each operation. 
+entering password for each operation.
 
-- Soren Dossing
-sauber@netcom.com
-WWW: http://www.sgi.com/Products/WebFORCE/WebStone/
+WWW: http://www.mindcraft.com/webstone/
diff --git a/www/webstone/pkg-plist b/www/webstone/pkg-plist
index b65b0cb019a4..59ebd3ec9da3 100644
--- a/www/webstone/pkg-plist
+++ b/www/webstone/pkg-plist
@@ -1,41 +1,53 @@
 webstone/bin/WebStone-common.pl
-webstone/bin/WebStone-manage.pl
-webstone/bin/WebStone-run.pl
-webstone/bin/WebStone-setup.pl
+webstone/bin/WebStone-filelist.wpl
+webstone/bin/WebStone-help.wpl
+webstone/bin/WebStone-manage.wpl
+webstone/bin/WebStone-run.wpl
+webstone/bin/WebStone-testbed.wpl
 webstone/bin/checkfilelist
 webstone/bin/genfiles
 webstone/bin/genfiles-from-filelist.sh
+webstone/bin/genfiles.pl
 webstone/bin/genrand
 webstone/bin/gui-configure
 webstone/bin/killbench
-webstone/bin/killbench.pl
-webstone/bin/mine-logs.pl
-webstone/bin/move-filelist.pl
-webstone/bin/move-runs.pl
-webstone/bin/rebootall
+webstone/bin/killbench.wpl
+webstone/bin/mine-logs.wpl
+webstone/bin/move-filelist.wpl
+webstone/bin/move-runs.wpl
 webstone/bin/runbench
 webstone/bin/runbench.pl
-webstone/bin/runbench~
+webstone/bin/runbench.wpl
 webstone/bin/tabs2html
-webstone/bin/view-results.pl
+webstone/bin/view-results.wpl
 webstone/bin/webclient
 webstone/bin/webmaster
 webstone/bin/webstone-gui.pl
-webstone/bin/write-testbed.pl
+webstone/bin/write-testbed.wpl
+webstone/bin/ws-utils.pl
+webstone/bin/wscollect
 webstone/bin/wscollect.pl
-webstone/conf/filelist
-webstone/conf/filelist.cgi-heavy
-webstone/conf/filelist.dynamic-heavy
-webstone/conf/filelist.dynamic-light
-webstone/conf/filelist.dynamic-medium
+webstone/conf/README
+webstone/conf/filelist-dyn-cgi-ws20
+webstone/conf/filelist-dyn-cgi-ws20-win
+webstone/conf/filelist-dyn-cgi-ws25
+webstone/conf/filelist-dyn-cgi-ws25-win
+webstone/conf/filelist-dyn-ws20-iis
+webstone/conf/filelist-dyn-ws20-ns
+webstone/conf/filelist-dyn-ws25-iis
+webstone/conf/filelist-dyn-ws25-ns
 webstone/conf/filelist.homepage
-webstone/conf/filelist.sample
+webstone/conf/filelist.manyfiles
 webstone/conf/filelist.standard
 webstone/conf/fileset
 webstone/conf/paths.pl
-webstone/conf/paths.sh
 webstone/conf/testbed
+webstone/conf/testbed.nt
+webstone/lgm/keepme
+webstone/lgm/ws20_cgi
+webstone/lgm/ws25_cgi
 webstone/webstone
 @dirrm webstone/bin
 @dirrm webstone/conf
+@dirrm webstone/lgm
 @dirrm webstone