- Use MAKE_ARGS

- Use PORTDOCS

4 files changed, 8 insertions, 28 deletions

diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 4d5ecc18b8dd..36c8e38b03e0 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -16,13 +16,20 @@ COMMENT=	A tool for measuring webserver performance
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+MAKE_ARGS=	LIBUTIL_OBJS=ssl_writev.o \
+		exec_prefix=${PREFIX}
 
+PLIST_FILES=	bin/httperf
+.if !defined(NOPORTDOCS)
+PORTDOCS=	ChangeLog NEWS README TODO
+.endif
 MAN1=		httperf.1
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ChangeLog NEWS README TODO
+.for file in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/benchmarks/httperf/files/patch-Makefile.in b/benchmarks/httperf/files/patch-Makefile.in
deleted file mode 100644
index 59491595c46d..000000000000
--- a/benchmarks/httperf/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Thu Oct 19 16:38:59 2000
-+++ Makefile.in	Wed Nov 13 06:30:08 2002
-@@ -6,6 +6,7 @@
- top_builddir = .
- 
- prefix = @prefix@
-+exec_prefix = @exec_prefix@
- bindir = @bindir@
- mandir = @mandir@
- 
diff --git a/benchmarks/httperf/files/patch-lib::Makefile.in b/benchmarks/httperf/files/patch-lib::Makefile.in
deleted file mode 100644
index 1b6cfa626b87..000000000000
--- a/benchmarks/httperf/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	Thu Oct 12 10:04:32 2000
-+++ lib/Makefile.in	Fri Jan 24 05:57:18 2003
-@@ -27,7 +27,7 @@
- .c.o:
- 	$(COMPILE) $<
- 
--LIBUTIL_OBJS = getopt.o getopt1.o ssl_writev.o
-+LIBUTIL_OBJS = ssl_writev.o
- 
- all: libutil.a
- 
diff --git a/benchmarks/httperf/pkg-plist b/benchmarks/httperf/pkg-plist
deleted file mode 100644
index 0fec88272ceb..000000000000
--- a/benchmarks/httperf/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/httperf
-%%PORTDOCS%%share/doc/httperf/ChangeLog
-%%PORTDOCS%%share/doc/httperf/NEWS
-%%PORTDOCS%%share/doc/httperf/README
-%%PORTDOCS%%share/doc/httperf/TODO
-%%PORTDOCS%%@dirrm share/doc/httperf