aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--benchmarks/stream/Makefile21
-rw-r--r--benchmarks/stream/distinfo8
-rw-r--r--benchmarks/stream/files/Makefile24
-rw-r--r--benchmarks/stream/files/patch-stream_d.c14
4 files changed, 18 insertions, 49 deletions
diff --git a/benchmarks/stream/Makefile b/benchmarks/stream/Makefile
index df86d758609b..8df09fda4da7 100644
--- a/benchmarks/stream/Makefile
+++ b/benchmarks/stream/Makefile
@@ -6,23 +6,30 @@
PORTNAME= stream
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.cs.virginia.edu/pub/stream/Code/
-DISTFILES= second_cpu.c stream_d.c
+DISTFILES= stream.c README
DIST_SUBDIR= stream-${PORTVERSION}
MAINTAINER= sf@slappy.org
COMMENT= Synthetic benchmark program that measures sustainable memory bandwidth
-MAKEFILE= ${FILESDIR}/Makefile
PLIST_FILES= bin/stream
+PORTDOCS= stream.c README
do-extract:
- @${MKDIR} ${WRKDIR}
- @${CP} -r ${_DISTDIR} ${WRKDIR}
+ @${MKDIR} ${BUILD_WRKSRC}
+ @${CP} ${_DISTDIR}/stream.c ${BUILD_WRKSRC}
-post-install:
- ${STRIP_CMD} ${PREFIX}/bin/stream
+do-build:
+ (cd ${BUILD_WRKSRC} ; ${CC} ${CFLAGS} -o stream stream.c -lm)
+
+do-install:
+ (cd ${BUILD_WRKSRC}; ${INSTALL_PROGRAM} stream ${PREFIX}/bin)
+. if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ (cd ${_DISTDIR}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+. endif
.include <bsd.port.mk>
diff --git a/benchmarks/stream/distinfo b/benchmarks/stream/distinfo
index 34cdb1ebc651..dac09fa52ea4 100644
--- a/benchmarks/stream/distinfo
+++ b/benchmarks/stream/distinfo
@@ -1,4 +1,4 @@
-MD5 (stream-1.0/second_cpu.c) = 65f4111f06a5f5a677925fa0ede61416
-SIZE (stream-1.0/second_cpu.c) = 287
-MD5 (stream-1.0/stream_d.c) = 76ef0d3b0c8884a130e8a723da96697b
-SIZE (stream-1.0/stream_d.c) = 5555
+MD5 (stream-1.0/stream.c) = 883cad1b230151cfe54d9a833380fd1f
+SIZE (stream-1.0/stream.c) = 11437
+MD5 (stream-1.0/README) = 6578ee6cc75e4ee08a6a1439f1436680
+SIZE (stream-1.0/README) = 1141
diff --git a/benchmarks/stream/files/Makefile b/benchmarks/stream/files/Makefile
deleted file mode 100644
index c0516fcee132..000000000000
--- a/benchmarks/stream/files/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-# stream didn't come with a makefile
-
-CFLAGS+= -Wall -pedantic -ansi -pipe
-BINOWN= root
-BINGRP= wheel
-BINMODE= 0555
-INSTALLDIR= ${PREFIX}/bin
-
-# season to flavor, see the stream docs
-NSIZE= 1000000
-
-#
-all: stream_d.o second_cpu.o
- ${CC} -o stream stream_d.o second_cpu.o -lm
-
-stream_d.o: stream_d.c
- ${CC} ${CFLAGS} -DNSIZE=${NSIZE} -c stream_d.c
-
-second_cpu.o: second_cpu.c
- ${CC} ${CFLAGS} -c second_cpu.c
-
-install:
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} stream ${INSTALLDIR}
diff --git a/benchmarks/stream/files/patch-stream_d.c b/benchmarks/stream/files/patch-stream_d.c
deleted file mode 100644
index a32b90c29415..000000000000
--- a/benchmarks/stream/files/patch-stream_d.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- stream_d.c.orig Wed May 22 11:02:08 2002
-+++ stream_d.c Wed May 22 11:02:37 2002
-@@ -23,7 +23,7 @@
- * that should be good to about 5% precision.
- */
-
--# define N 2000000
-+# define N NSIZE
- # define NTIMES 10
- # define OFFSET 0
-