ports/131725: [ADOPT] benchmarks/stream and resolve conflict with graphics/ImageMagick

[Alexey Shuvaev]

>Number:         131725
>Category:       ports
>Synopsis:       [ADOPT] benchmarks/stream and resolve conflict with graphics/ImageMagick
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 15 21:40:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alexey Shuvaev
>Release:        8.0-CURRENT
>Organization:
University of Wuerzburg
>Environment:
FreeBSD wep4035 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sat Feb 14 01:29:05 CET 2009     root at wep4035:/usr/obj/usr/src/sys/NOUSB  amd64
>Description:
Take maintainership.
Resolve conflict with graphics/ImageMagick (both ports install the same
file 'stream' into ${PREFIX}/bin).
The version of the program is really 5.8 (one should look into stream.c).
Some no-op changes (committer could review and reject them).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN stream.orig/Makefile stream/Makefile
--- stream.orig/Makefile	2008-09-04 12:00:53.000000000 +0200
+++ stream/Makefile	2009-02-15 21:08:11.000000000 +0100
@@ -5,31 +5,30 @@
 # $FreeBSD: ports/benchmarks/stream/Makefile,v 1.10 2008/09/03 02:57:44 linimon Exp $
 
 PORTNAME=	stream
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	5.8
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.cs.virginia.edu/stream/FTP/Code/
 DISTFILES=	stream.c
-DIST_SUBDIR=	stream-${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}-1.0
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	shuvaev at physik.uni-wuerzburg.de
 COMMENT=	Synthetic benchmark program that measures sustainable memory bandwidth
 
-PLIST_FILES=	bin/stream
+PLIST_FILES=	bin/stream_bench
 PORTDOCS=	stream.c
 
 do-extract:
-	@${MKDIR} ${BUILD_WRKSRC}
-	@${CP} ${_DISTDIR}/stream.c ${BUILD_WRKSRC}
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${_DISTDIR}/stream.c ${WRKSRC}
 
 do-build:
-	(cd ${BUILD_WRKSRC} ; ${CC} ${CFLAGS} -o stream stream.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o stream_bench stream.c -lm)
 
 do-install:
-	(cd ${BUILD_WRKSRC}; ${INSTALL_PROGRAM} stream ${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${WRKSRC}/stream_bench ${PREFIX}/bin
 .	if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
-		(cd ${_DISTDIR}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+		${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 .	endif
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: