- Update to 2.2.1

- Prune MASTER_SITEs
- Assign maintainership to submitter

PR:		ports/72809
Submitted by:	Frank J. Laszlo

5 files changed, 20 insertions, 26 deletions

diff --git a/benchmarks/nbench/Makefile b/benchmarks/nbench/Makefile
index fa5fc47e6df3..cf192a006758 100644
--- a/benchmarks/nbench/Makefile
+++ b/benchmarks/nbench/Makefile
@@ -6,26 +6,24 @@
 #
 
 PORTNAME=	nbench
-PORTVERSION=	2.1
+PORTVERSION=	2.2.1
 CATEGORIES=	benchmarks
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		ftp://ftp.tux.org/pub/tux/mayer/
-MASTER_SITE_SUBDIR=	system/benchmark
+MASTER_SITES=	ftp://ftp.tux.org/pub/tux/mayer/
 DISTNAME=	${PORTNAME}-byte-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	laszlof@vonostingroup.com
 COMMENT=	BYTE Magazine's native benchmarks
 
 ALL_TARGET=	# empty
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nbench ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/nbench
-	${INSTALL_DATA} ${WRKSRC}/NNET.DAT ${PREFIX}/share/nbench
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/NNET.DAT ${DATADIR}
 .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
+	@${MKDIR} ${DOCSDIR}
+.for f in README README.submit RESULTS bdoc.txt
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/benchmarks/nbench/distinfo b/benchmarks/nbench/distinfo
index 1b2480b1fc87..35f083894391 100644
--- a/benchmarks/nbench/distinfo
+++ b/benchmarks/nbench/distinfo
@@ -1,2 +1,2 @@
-MD5 (nbench-byte-2.1.tar.gz) = 18741c3f7d01bf216a57c0132896b196
-SIZE (nbench-byte-2.1.tar.gz) = 195315
+MD5 (nbench-byte-2.2.1.tar.gz) = 92694db00b9698f4f7525e0580ed876b
+SIZE (nbench-byte-2.2.1.tar.gz) = 110099
diff --git a/benchmarks/nbench/files/patch-ab b/benchmarks/nbench/files/patch-ab
index 41cd28c1b01c..75c9f0a11b4d 100644
--- a/benchmarks/nbench/files/patch-ab
+++ b/benchmarks/nbench/files/patch-ab
@@ -1,5 +1,5 @@
---- sysinfo.sh	Thu Dec 11 20:54:46 1997
-+++ /home/andy/tmp/wrk/sysinfo.sh	Wed Dec 17 08:30:28 1997
+--- sysinfo.sh.orig	Mon Oct 18 00:03:53 2004
++++ sysinfo.sh	Mon Oct 18 00:04:35 2004
 @@ -50,8 +50,8 @@
  
  # this bombs out on Ultrix which expect "cut -d"
@@ -11,7 +11,3 @@
  
  # let's hope that ctrl-c is not part of any string here
  # this also will barf later if " is in any of the strings
-@@ -60,4 +60,4 @@
-  sed -e "s%CCVERSION%$gccversion" -e "s%LIBCVERSION%$libcversion"\
-      -e "s%SYSTEM%$compsystem" -e "s%DATE%$compdate"\
-    ${i}.template > $i
diff --git a/benchmarks/nbench/files/patch-ac b/benchmarks/nbench/files/patch-ac
index c31eeaa16564..d6e628453236 100644
--- a/benchmarks/nbench/files/patch-ac
+++ b/benchmarks/nbench/files/patch-ac
@@ -1,10 +1,10 @@
---- sysspec.h.orig	Fri Dec 12 05:54:46 1997
-+++ sysspec.h	Tue Jul 25 02:30:29 2000
+--- sysspec.h.orig	Mon Oct 18 00:05:17 2004
++++ sysspec.h	Mon Oct 18 00:05:50 2004
 @@ -33,7 +33,7 @@
  
  #include "nmglobal.h"
  
--#ifndef MAC
+-#if !defined(MAC) && !defined(OSX)
 +#if !defined(MAC) && !defined(__STDC__)
  #include <malloc.h>
  #endif
diff --git a/benchmarks/nbench/files/patch-ad b/benchmarks/nbench/files/patch-ad
index 01a8c8dcd411..e8f921ed49de 100644
--- a/benchmarks/nbench/files/patch-ad
+++ b/benchmarks/nbench/files/patch-ad
@@ -1,8 +1,8 @@
---- 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
+--- Makefile.orig	Mon Oct 18 00:07:05 2004
++++ Makefile	Mon Oct 18 00:07:51 2004
+@@ -19,10 +19,10 @@
+ # You should leave -static in the CFLAGS so that your sysinfo can be
+ # compiled into the executable.
  
 -CC = gcc
 +CC ?= gcc