Cleanup:

- Use PLIST_FILES
- Avoid excessive Makefile-patching

3 files changed, 3 insertions, 38 deletions

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index d335d3eeec44..dcc56e9e4669 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -15,13 +15,10 @@ COMMENT=	A simulation of the Ziff-Davis netbench benchmark
 
 WRKSRC=		${WRKDIR}/dbench
 USE_REINPLACE=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/^CFLAGS.+//g' ${WRKSRC}/Makefile
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+PLIST_FILES=	dbench tbench tbench_srv
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dbench ${PREFIX}/bin/dbench
-	${INSTALL_PROGRAM} ${WRKSRC}/tbench ${PREFIX}/bin/tbench
-	${INSTALL_PROGRAM} ${WRKSRC}/tbench_srv ${PREFIX}/bin/tbench_srv
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES} ${PREFIX}/bih
 
 .include <bsd.port.mk>
diff --git a/benchmarks/dbench/files/patch-ac b/benchmarks/dbench/files/patch-ac
deleted file mode 100644
index cd235a139c9c..000000000000
--- a/benchmarks/dbench/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	Sun Sep  9 21:21:01 2001
-+++ Makefile	Thu Aug 22 20:21:37 2002
-@@ -1,7 +1,7 @@
- VERSION = 1.2.01
- 
--CC = gcc
--CFLAGS = -O2 -Wall 
-+CC ?= gcc
-+
- CPPFLAGS = "-DVERSION=\"$(VERSION)\""
- 
- DB_OBJS = fileio.o util.o dbench.o child.o
-@@ -11,13 +11,13 @@
- all: dbench tbench tbench_srv
- 
- dbench: $(DB_OBJS)
--	$(CC) -o $@ $(DB_OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(DB_OBJS)
- 
- tbench: $(TB_OBJS)
--	$(CC) -o $@ $(TB_OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(TB_OBJS)
- 
- tbench_srv: $(SRV_OBJS)
--	$(CC) -o $@ $(SRV_OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(SRV_OBJS)
- 
- clean:
- 	rm -f *.o *~ dbench tbench tbench_srv
diff --git a/benchmarks/dbench/pkg-plist b/benchmarks/dbench/pkg-plist
deleted file mode 100644
index f8db3ffe1665..000000000000
--- a/benchmarks/dbench/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/dbench
-bin/tbench
-bin/tbench_srv