Upgrade to 2.1.

svn path=/head/; revision=262833

benchmarks/scimark2c/Makefile

@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	scimark2c
-PORTVERSION=	2.0
+DISTVERSION=	2_1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://math.nist.gov/scimark2/
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME:S/2/${DISTVERSION}/}
 
 MAINTAINER=	thierry@pompo.net
 COMMENT=	An ANSI C version of the SciMark2 benchmark
@@ -18,15 +18,8 @@ PLIST_FILES=	bin/scimark2
 WRKSRC=		${WRKDIR}
 USE_ZIP=	yes
 
-MALLOC2STD=	kernel.c Stopwatch.c Random.c array.c
-
-post-patch:
-.for file in ${MALLOC2STD}
-	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|" ${WRKSRC}/${file}
-.endfor
-
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/scimark2 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/scimark2 ${PREFIX}/bin
 
 post-install:
 	@${ECHO} "*****************************************************************************"

benchmarks/scimark2c/distinfo

@@ -1,3 +1,3 @@
-MD5 (scimark2c.zip) = 3fe0d6b3c8068bf7481ce45fe51d96d0
-SHA256 (scimark2c.zip) = 53d6bffc6468f20a55bc3184ec293bb73bcb2b01cce4965869845ed2210b81ff
-SIZE (scimark2c.zip) = 14336
+MD5 (scimark2_1c.zip) = 6cc8d6d5312a07e32316c03580e0206b
+SHA256 (scimark2_1c.zip) = 223464cd7e90b4c22e2af08dbae6f6faa33e65b01e1c58e5a176837bc67958be
+SIZE (scimark2_1c.zip) = 13792

benchmarks/scimark2c/files/patch-Makefile

@@ -1,13 +1,11 @@
---- Makefile.orig	Thu Jul  6 00:07:45 2000
-+++ Makefile	Sat Apr  5 22:53:49 2003
-@@ -5,8 +5,8 @@
+--- Makefile.orig	2006-07-26 21:30:46.000000000 +0200
++++ Makefile	2010-10-11 21:48:39.000000000 +0200
+@@ -5,7 +5,7 @@
  
  all: scimark2 
  
 -CC = cc
--CFLAGS = -O
 +#CC = cc
-+#CFLAGS = -O
  LDFLAGS = 
  
  OBJS = FFT.o kernel.o Stopwatch.o Random.o SOR.o SparseCompRow.o \