Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jul 2000 11:01:39 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/20148: Update port: benchmarks/nbench
Message-ID:  <20000724180139.3A50737BC6C@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         20148
>Category:       ports
>Synopsis:       Update port: benchmarks/nbench
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 24 11:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Support PREFIX/CC/CFLAGS properly
- Support NOPORTDOCS
- Add WWW: line into pkg/DESCR

New file:
patches/patch-ac  patches/patch-ad

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/benchmarks/nbench/Makefile benchmarks/nbench/Makefile
--- /usr/ports/benchmarks/nbench/Makefile	Sun Apr  9 15:43:03 2000
+++ benchmarks/nbench/Makefile	Tue Jul 25 02:36:11 2000
@@ -5,25 +5,27 @@
 # $FreeBSD: ports/benchmarks/nbench/Makefile,v 1.4 2000/04/08 22:04:17 mharo Exp $
 #
 
-PORTNAME=		nbench
-PORTVERSION=		2.1
-CATEGORIES=		benchmarks
-MASTER_SITES=		ftp://ftp.tux.org/pub/tux/mayer/ \
-			${MASTER_SITE_SUNSITE}
+PORTNAME=	nbench
+PORTVERSION=	2.1
+CATEGORIES=	benchmarks
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		ftp://ftp.tux.org/pub/tux/mayer/
 MASTER_SITE_SUBDIR=	system/benchmark
-DISTNAME=		nbench-byte-2.1
+DISTNAME=	${PORTNAME}-byte-${PORTVERSION}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/nbench ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/nbench
-	@ ${INSTALL_DATA} ${WRKSRC}/NNET.DAT ${PREFIX}/share/nbench
-	@ ${MKDIR} ${PREFIX}/share/doc/nbench
+	${INSTALL_PROGRAM} ${WRKSRC}/nbench ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/nbench
+	${INSTALL_DATA} ${WRKSRC}/NNET.DAT ${PREFIX}/share/nbench
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/nbench
 .for file in README README.submit RESULTS bdoc.txt
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/nbench
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/nbench
 .endfor
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/benchmarks/nbench/patches/patch-aa benchmarks/nbench/patches/patch-aa
--- /usr/ports/benchmarks/nbench/patches/patch-aa	Fri Mar 27 21:26:46 1998
+++ benchmarks/nbench/patches/patch-aa	Tue Jul 25 02:21:32 2000
@@ -1,11 +1,11 @@
---- nbench1.h	Thu Dec 11 20:54:46 1997
-+++ /home/andy/tmp/wrk/nbench1.h	Wed Dec 17 08:28:11 1997
+--- nbench1.h.orig	Thu Dec 11 20:54:46 1997
++++ nbench1.h	Wed Dec 17 08:28:11 1997
 @@ -352,7 +352,7 @@
  ** The Neural Net test requires an input data file.
  ** The name is specified here.
  */
 -char *inpath="NNET.DAT";
-+char *inpath="/usr/local/share/nbench/NNET.DAT";
++char *inpath=DATADIR "NNET.DAT";
  
  /*
  ** PROTOTYPES
diff -urN /usr/ports/benchmarks/nbench/patches/patch-ac benchmarks/nbench/patches/patch-ac
--- /usr/ports/benchmarks/nbench/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ benchmarks/nbench/patches/patch-ac	Tue Jul 25 02:40:58 2000
@@ -0,0 +1,11 @@
+--- sysspec.h.orig	Fri Dec 12 05:54:46 1997
++++ sysspec.h	Tue Jul 25 02:30:29 2000
+@@ -33,7 +33,7 @@
+ 
+ #include "nmglobal.h"
+ 
+-#ifndef MAC
++#if !defined(MAC) && !defined(__STDC__)
+ #include <malloc.h>
+ #endif
+ 
diff -urN /usr/ports/benchmarks/nbench/patches/patch-ad benchmarks/nbench/patches/patch-ad
--- /usr/ports/benchmarks/nbench/patches/patch-ad	Thu Jan  1 09:00:00 1970
+++ benchmarks/nbench/patches/patch-ad	Tue Jul 25 02:27:49 2000
@@ -0,0 +1,15 @@
+--- Makefile.orig	Fri Dec 12 05:54:46 1997
++++ Makefile	Tue Jul 25 02:27:40 2000
+@@ -22,10 +22,10 @@
+ # you should leave -static in the CFLAGS so that your sysinfo can be
+ # compiled into the executable
+ 
+-CC = gcc
++CC ?= gcc
+ 
+ # generic options for gcc
+-CFLAGS = -s -static -Wall -O3
++CFLAGS += -static -DDATADIR=\"${PREFIX}/share/nbench/\"
+ 
+ # if your gcc lets you do it, then try this one
+ #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops
diff -urN /usr/ports/benchmarks/nbench/pkg/DESCR benchmarks/nbench/pkg/DESCR
--- /usr/ports/benchmarks/nbench/pkg/DESCR	Thu Aug  6 03:13:16 1998
+++ benchmarks/nbench/pkg/DESCR	Tue Jul 25 02:18:42 2000
@@ -1,3 +1,5 @@
 BYTE Magazine's native benchmarks (also called BYTEmark), which are
 designed to expose the capabilities of a system's CPU, FPU, and memory
 system.
+
+WWW: http://www.tux.org/~mayer/linux/bmark.html


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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000724180139.3A50737BC6C>