summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--benchmarks/httperf/Makefile10
-rw-r--r--benchmarks/httperf/distinfo12
-rw-r--r--benchmarks/httperf/patches/patch-aa13
-rw-r--r--benchmarks/httperf/patches/patch-ab13
-rw-r--r--benchmarks/httperf/patches/patch-ac13
-rw-r--r--benchmarks/httperf/patches/patch-ad12
6 files changed, 9 insertions, 64 deletions
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 11de2a940db..37f58760464 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.20 2014/10/09 14:05:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2014/11/26 02:11:16 mef Exp $
-DISTNAME= httperf-0.8
+DISTNAME= httperf-0.9.0
CATEGORIES= benchmarks www
MASTER_SITES= ftp://ftp.hpl.hp.com/pub/httperf/
-PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.hpl.hp.com/research/linux/httperf/
COMMENT= Popular web server benchmarking program
+LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake
CFLAGS+= -DFD_SETSIZE=16424
-INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
- bindir=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} \
+ bindir=${PREFIX}/bin
.include "../../mk/bsd.prefs.mk"
diff --git a/benchmarks/httperf/distinfo b/benchmarks/httperf/distinfo
index cdbd3f39a6c..ca5bba7e7e5 100644
--- a/benchmarks/httperf/distinfo
+++ b/benchmarks/httperf/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/01/03 05:50:15 cjs Exp $
+$NetBSD: distinfo,v 1.7 2014/11/26 02:11:16 mef Exp $
-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
-SHA1 (patch-ad) = c6edbebb159f2ad642eed80e7d9a2b572b67b425
+SHA1 (httperf-0.9.0.tar.gz) = 2aa885c0c143d809c0e50a6eca5063090bddee35
+RMD160 (httperf-0.9.0.tar.gz) = 59580cf5e876b18e69ffb69214c97fbc524be749
+Size (httperf-0.9.0.tar.gz) = 425297 bytes
diff --git a/benchmarks/httperf/patches/patch-aa b/benchmarks/httperf/patches/patch-aa
deleted file mode 100644
index ea1b21d4199..00000000000
--- a/benchmarks/httperf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/12/07 06:27:30 cjs Exp $
-
---- 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="${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
deleted file mode 100644
index 43231c17d83..00000000000
--- a/benchmarks/httperf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 2564b4d1dce..00000000000
--- a/benchmarks/httperf/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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>
diff --git a/benchmarks/httperf/patches/patch-ad b/benchmarks/httperf/patches/patch-ad
deleted file mode 100644
index fb041d7beaf..00000000000
--- a/benchmarks/httperf/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/03 05:50:15 cjs Exp $
-
---- Makefile.in.orig 2000-10-19 16:38:59.000000000 +0900
-+++ Makefile.in 2007-01-03 14:37:19.000000000 +0900
-@@ -6,6 +6,7 @@
- top_builddir = .
-
- prefix = @prefix@
-+exec_prefix = @exec_prefix@
- bindir = @bindir@
- mandir = @mandir@
-