Fix unfetchable distribution problem Upgrade Fix: Delete benchmarks/stream/files/Makefile Delete benchmarks/stream/files/patch-stream_d.c Delete benchmarks/stream/files Add benchmarks/stream/pkg-plist --------------030202090300090102060408----IIXgiRDafktFdj5E4wDbTrZcVppPMlCUHp4kwJ9YAGlMSOJj Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -ruN stream.orig/Makefile stream/Makefile --- stream.orig/Makefile Wed Jun 9 13:00:12 2004 +++ stream/Makefile Tue Feb 15 18:27:40 2005 @@ -6,23 +6,29 @@ 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 - do-extract: - @${MKDIR} ${WRKDIR} - @${CP} -r ${_DISTDIR} ${WRKDIR} + @${MKDIR} ${BUILD_WRKSRC} + @${CP} ${_DISTDIR}/stream.c ${BUILD_WRKSRC} + +do-build: + (cd ${BUILD_WRKSRC} ; ${CC} ${CFLAGS} -o stream stream.c -lm) + +do-install: + (cd ${BUILD_WRKSRC}; ${INSTALL} -c -m 0555 stream ${PREFIX}/bin) + ${MKDIR} ${DOCSDIR} + (cd ${_DISTDIR}; ${INSTALL} -c -m 0444 stream.c ${DOCSDIR}) + (cd ${_DISTDIR}; ${INSTALL} -c -m 0444 README ${DOCSDIR}) post-install: - ${STRIP_CMD} ${PREFIX}/bin/stream + @${STRIP_CMD} ${PREFIX}/bin/stream .include <bsd.port.mk> diff -ruN stream.orig/distinfo stream/distinfo --- stream.orig/distinfo Wed Jun 9 13:00:12 2004 +++ stream/distinfo Tue Feb 15 18:27:40 2005 @@ -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 -ruN stream.orig/files/Makefile stream/files/Makefile --- stream.orig/files/Makefile Tue Nov 6 12:17:17 2001 +++ stream/files/Makefile Wed Dec 31 16:00:00 1969 @@ -1,24 +0,0 @@ -# $FreeBSD: ports/benchmarks/stream/files/Makefile,v 1.1 2001/11/06 20:17:17 petef Exp $ -# 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 -ruN stream.orig/files/patch-stream_d.c stream/files/patch-stream_d.c --- stream.orig/files/patch-stream_d.c Wed May 22 01:04:38 2002 +++ stream/files/patch-stream_d.c Wed Dec 31 16:00:00 1969 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/benchmarks/stream/files/patch-stream_d.c,v 1.2 2002/05/22 08:04:38 sobomax Exp $ - ---- 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 - diff -ruN stream.orig/pkg-descr stream/pkg-descr --- stream.orig/pkg-descr Tue Apr 22 01:32:21 2003 +++ stream/pkg-descr Wed Dec 31 16:00:00 1969 @@ -1,7 +0,0 @@ -The STREAM benchmark is a simple synthetic benchmark program that -measures sustainable memory bandwidth (in MB/s) and the corresponding -computation rate for simple vector kernels. - -WWW: http://www.cs.virginia.edu/stream/ - -- Scott Flatman <sf@slappy.org> diff -ruN stream.orig/pkg-plist stream/pkg-plist --- stream.orig/pkg-plist Wed Dec 31 16:00:00 1969 +++ stream/pkg-plist Tue Feb 15 18:27:40 2005 @@ -0,0 +1,4 @@ +bin/stream +share/doc/stream/README +share/doc/stream/stream.c +@dirrm share/doc/stream
State Changed From-To: open->feedback How about the following instead: Index: Makefile =================================================================== RCS file: /usr/freebsdcvs/cvs-ports/ports/benchmarks/stream/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 9 Jun 2004 20:00:12 -0000 1.7 +++ Makefile 16 Feb 2005 09:41:03 -0000 @@ -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>
Responsible Changed From-To: freebsd-ports-bugs->vs Handle
State Changed From-To: feedback->closed Committed with modifications as discussed, thanks! (I also kept pkg-descr, the URL's still valid)