Upgrade to 0.8.

New in version 0.8:
    httperf is now released under the GNU General Public License (GPL).
    Preliminary support for SSL (Secure Socket Layer).  See README for details.
    New options (see man-page for details):
	--print-reply (replaced --print-replies)
	--print-request
	--ssl
	--ssl-ciphers
	--ssl-no-reuse
New in version 0.7:
    New options (see man-page for details):
	--add-header
	--method
	--retry-on-failure
    Bug fixes
	- fixed some segfaults in the session workload generator
	- specifying option --session-cookie when not using a session
	  workload generator now prints an error message instead of
	  core dumping

5 files changed, 50 insertions, 28 deletions

diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index ec95e791ceb..d9d249b7c9a 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 20:46:42 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2006/12/07 06:27:30 cjs Exp $
 
-DISTNAME=	httperf-0.6
-PKGREVISION=	1
+DISTNAME=	httperf-0.8
 CATEGORIES=	benchmarks www
 MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
@@ -10,11 +8,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.hpl.hp.com/research/linux/httperf/
 COMMENT=	Popular web server benchmarking program
 
-LICENSE=	no-commercial-use
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=	gmake
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -22,10 +19,11 @@ USE_TOOLS+=	gmake
 LDFLAGS+=	-lsocket -lnsl -lresolv
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/httperf ${PREFIX}/bin/httperf
-	${INSTALL_MAN} ${WRKSRC}/httperf.man ${PREFIX}/man/man1/httperf.1
+	${INSTALL_MAN} ${WRKSRC}/httperf.man \
+	    ${PREFIX}/${PKGMANDIR}/man1/httperf.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/httperf/distinfo b/benchmarks/httperf/distinfo
index 6ff87338f64..4087e8bb565 100644
--- a/benchmarks/httperf/distinfo
+++ b/benchmarks/httperf/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:16:36 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/12/07 06:27:30 cjs Exp $
 
-SHA1 (httperf-0.6.tar.gz) = 6e0bcc21e2a94061b231c50182528a17ba22f14f
-RMD160 (httperf-0.6.tar.gz) = 9221dbede16dffa339b29da326ac0f293ed16ecd
-Size (httperf-0.6.tar.gz) = 85351 bytes
-SHA1 (patch-aa) = eb5e6431c62f1ec631a0d6b598de0e4029dc97fc
+SHA1 (httperf-0.8.tar.gz) = ce52f699bcdaf4bf62b928ad7b4a762cc0c0c958
+RMD160 (httperf-0.8.tar.gz) = c3b728c2afbaef2bcd4e93c2d5b01df4d4e336ce
+Size (httperf-0.8.tar.gz) = 146107 bytes
+SHA1 (patch-aa) = a2f9163e125910d6d1a41266a548315a263e9c25
+SHA1 (patch-ab) = 2c42b97501ded52ee23742f50f87c04709975db1
+SHA1 (patch-ac) = 7c1c85b4c952d7ef7784be3f42c7f2da1665a293
diff --git a/benchmarks/httperf/patches/patch-aa b/benchmarks/httperf/patches/patch-aa
index c6dde82f3f6..ea1b21d4199 100644
--- a/benchmarks/httperf/patches/patch-aa
+++ b/benchmarks/httperf/patches/patch-aa
@@ -1,17 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2003/09/19 18:06:36 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/12/07 06:27:30 cjs Exp $
 
---- Makefile.orig	Tue Jun  2 04:06:52 1998
-+++ Makefile	Fri Sep 19 15:34:28 2003
-@@ -38,9 +38,9 @@
- CPPDEBUG := -DDEBUG $(CPPDEBUG)
- CPPOPTIM := -DNDEBUG $(CPPOPTIM)
+--- configure.in.orig	2000-10-19 16:35:15.000000000 +0900
++++ configure.in	2006-12-07 15:08:35.000000000 +0900
+@@ -10,7 +10,7 @@
+   CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+ fi
  
--CPPFLAGS = -I. -Ilib $(CPP$(HOW))
--CFLAGS = $(CONFIG) $(CFLAGS$(HOW))
--LDFLAGS = $(LDFLAGS$(HOW))
-+CPPFLAGS += -I. -Ilib $(CPP$(HOW))
-+#CFLAGS = $(CONFIG) $(CFLAGS$(HOW))
-+#LDFLAGS = $(LDFLAGS$(HOW))
- 
- HTTPERF = httperf object call conn sess core event http timer $(EXTRA)
+-CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -D_XOPEN_SOURCE"
++CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+ LDFLAGS="${LDFLAGS}"
  
+ dnl Checks for programs.
diff --git a/benchmarks/httperf/patches/patch-ab b/benchmarks/httperf/patches/patch-ab
new file mode 100644
index 00000000000..43231c17d83
--- /dev/null
+++ b/benchmarks/httperf/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/12/07 06:27:30 cjs Exp $
+
+--- configure.orig	2000-10-19 16:35:18.000000000 +0900
++++ configure	2006-12-07 15:08:35.000000000 +0900
+@@ -538,7 +538,7 @@
+   CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+ fi
+ 
+-CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -D_XOPEN_SOURCE"
++CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+ LDFLAGS="${LDFLAGS}"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
diff --git a/benchmarks/httperf/patches/patch-ac b/benchmarks/httperf/patches/patch-ac
new file mode 100644
index 00000000000..2564b4d1dce
--- /dev/null
+++ b/benchmarks/httperf/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/12/07 06:27:30 cjs Exp $
+
+--- lib/ssl_writev.c.orig	2000-10-12 09:09:47.000000000 +0900
++++ lib/ssl_writev.c	2006-12-07 15:14:21.000000000 +0900
+@@ -31,7 +31,7 @@
+ 
+ #ifdef HAVE_OPENSSL_SSL_H
+ 
+-#include <alloca.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <sys/types.h>