Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Jan 2015 12:41:02 +0000 (UTC)
From:      Rodrigo Osorio <rodrigo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377171 - in head/benchmarks/dhrystone: . files
Message-ID:  <201501161241.t0GCf2vJ043164@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rodrigo
Date: Fri Jan 16 12:41:01 2015
New Revision: 377171
URL: https://svnweb.freebsd.org/changeset/ports/377171
QAT: https://qat.redports.org/buildarchive/r377171/

Log:
  - Fix Makefile style
  - Fix MASTER site
  - Fix EXTRACT cmd
  - Add generic Makefile for compilation
  - Install DOC by default
  - Bump PORTREVISION
  
  PR:		193153
  Reviewed by:	bapt

Added:
  head/benchmarks/dhrystone/files/patch-Makefile   (contents, props changed)
Modified:
  head/benchmarks/dhrystone/Makefile
  head/benchmarks/dhrystone/pkg-descr

Modified: head/benchmarks/dhrystone/Makefile
==============================================================================
--- head/benchmarks/dhrystone/Makefile	Fri Jan 16 12:03:37 2015	(r377170)
+++ head/benchmarks/dhrystone/Makefile	Fri Jan 16 12:41:01 2015	(r377171)
@@ -3,9 +3,9 @@
 
 PORTNAME=	dhrystone
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
-MASTER_SITES=	${MASTER_SITE_NETLIB}
-MASTER_SITE_SUBDIR=benchmark
+MASTER_SITES=	NETLIB/benchmark
 DISTNAME=	dhry-c
 EXTRACT_SUFX=
 
@@ -14,30 +14,18 @@ COMMENT=	Computing benchmark for integer
 
 LICENSE=	BSD2CLAUSE
 
-EXTRACT_CMD=	${MKDIR} ${WRKSRC};cd ${WRKSRC} && ${SH}
+EXTRACT_CMD=	${SH}
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/dhry
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	RATIONALE submit.frm README_C VARIATIONS
-.endif
-
-do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -c dhry_1.c && \
-		${CC} ${CFLAGS} -c dhry_2.c && \
-		${CC} -o dhry *.o
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dhry ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/benchmarks/dhrystone/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/dhrystone/files/patch-Makefile	Fri Jan 16 12:41:01 2015	(r377171)
@@ -0,0 +1,12 @@
+--- Makefile.orig	2015-01-16 10:40:03.233485586 +0000
++++ Makefile	2015-01-16 10:50:21.034404184 +0000
+@@ -0,0 +1,9 @@
++OBJ= dhry_1.o dhry_2.o
++
++all: dhry
++	
++dhry: $(OBJ)
++	$(CC) $(LDFLAGS) $(OBJ) -o $@
++
++%.o: %.c
++	$(CC) -o $@  $< $(CFLAGS)

Modified: head/benchmarks/dhrystone/pkg-descr
==============================================================================
--- head/benchmarks/dhrystone/pkg-descr	Fri Jan 16 12:03:37 2015	(r377170)
+++ head/benchmarks/dhrystone/pkg-descr	Fri Jan 16 12:41:01 2015	(r377171)
@@ -1,12 +1,10 @@
-Dhrystone benchmark
-
 Dhrystone is a synthetic computing benchmark program developed in 1984
 by Reinhold P. Weicker intended to be representative of system (integer)
 programming. The Dhrystone grew to become representative of general
 processor (CPU) performance.
 
 DMIPS value is result of dhrystone test divided by 1757, results are often
-reported in DMIPS/Mhz. For more information, see 
-http://en.wikipedia.org/wiki/Dhrystone
+reported in DMIPS/MHz. For more information, see 
+http://en.wikipedia.org/wiki/Dhrystone.
 
 WWW: http://www.netlib.org/benchmark/



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