From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 15 21:40:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 485691065672 for ; Sun, 15 Feb 2009 21:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2337B8FC22 for ; Sun, 15 Feb 2009 21:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n1FLe2JG037975 for ; Sun, 15 Feb 2009 21:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n1FLe28v037974; Sun, 15 Feb 2009 21:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 15 Feb 2009 21:40:02 GMT Resent-Message-Id: <200902152140.n1FLe28v037974@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexey Shuvaev Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D6C3106564A for ; Sun, 15 Feb 2009 21:39:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 30C248FC12 for ; Sun, 15 Feb 2009 21:39:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n1FLd9VN008565 for ; Sun, 15 Feb 2009 21:39:09 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n1FLd98h008563; Sun, 15 Feb 2009 21:39:09 GMT (envelope-from nobody) Message-Id: <200902152139.n1FLd98h008563@www.freebsd.org> Date: Sun, 15 Feb 2009 21:39:09 GMT From: Alexey Shuvaev To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/131725: [ADOPT] benchmarks/stream and resolve conflict with graphics/ImageMagick X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Feb 2009 21:40:03 -0000 >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@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@FreeBSD.org +MAINTAINER= shuvaev@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 >Release-Note: >Audit-Trail: >Unformatted: