Get rid of all compile warnings, remove explicit version from package descr.

benchmarks/lmbench/Makefile

@@ -3,7 +3,7 @@
 # Date created:		Nov 27 1997
 # Whom:			ejovi
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1997/11/27 17:42:23 joey Exp $
+# $OpenBSD: Makefile,v 1.2 1998/03/01 08:28:33 marc Exp $
 #
 
 DISTNAME=	lmbench
@@ -29,6 +29,12 @@ test: build
 retest: build
 	@(cd ${WRKSRC}; make rerun)
 
+# This package comes with its own RCS directory which confuses patch.
+# Move it so patch doesn't get confused.
+#
+pre-patch:
+	@${MV} ${WRKSRC}/src/RCS ${WRKSRC}/src/RCS-
+
 pre-install:
 	[ -d ${PREFIX}/lib/lmbench ] || ${MKDIR} ${PREFIX}/lib/lmbench
 

benchmarks/lmbench/patches/patch-ab

@@ -0,0 +1,14 @@
+--- src/bw_tcp.c.orig	Sat Feb 28 23:45:38 1998
++++ src/bw_tcp.c	Sat Feb 28 23:49:30 1998
+@@ -111,8 +111,10 @@
+ 	return (s[-2]);
+ }
+ 
+-child()
++void
++child( int ignored )
+ {
++	(void) ignored;
+ 	wait(0);
+ 	signal(SIGCHLD, child);
+ }

benchmarks/lmbench/patches/patch-ac

@@ -0,0 +1,20 @@
+--- src/lat_rpc.c.orig	Sat Feb 28 23:53:01 1998
++++ src/lat_rpc.c	Sat Feb 28 23:53:27 1998
+@@ -195,7 +195,7 @@
+ 		return;
+ 	}
+ 	bzero((char *)&argument, sizeof(argument));
+-	if (!svc_getargs(transp, xdr_argument, &argument)) {
++	if (!svc_getargs(transp, xdr_argument, (char*) &argument)) {
+ 		svcerr_decode(transp);
+ 		return;
+ 	}
+@@ -203,7 +203,7 @@
+ 	if (result != NULL && !svc_sendreply(transp, xdr_result, result)) {
+ 		svcerr_systemerr(transp);
+ 	}
+-	if (!svc_freeargs(transp, xdr_argument, &argument)) {
++	if (!svc_freeargs(transp, xdr_argument, (char*) &argument)) {
+ 		fprintf(stderr, "unable to free arguments");
+ 		exit(1);
+ 	}

benchmarks/lmbench/patches/patch-ad

@@ -0,0 +1,14 @@
+--- src/lat_tcp.c.orig	Sat Feb 28 23:53:39 1998
++++ src/lat_tcp.c	Sat Feb 28 23:54:15 1998
+@@ -81,8 +81,10 @@
+ 	micro(buf, N);
+ }
+ 
+-child()
++void
++child( int ignored )
+ {
++	(void) ignored;
+ 	wait(0);
+ 	signal(SIGCHLD, child);
+ }

benchmarks/lmbench/patches/patch-ae

@@ -0,0 +1,22 @@
+--- src/lat_udp.c.orig	Sat Feb 28 23:55:33 1998
++++ src/lat_udp.c	Sat Feb 28 23:56:06 1998
+@@ -96,7 +96,8 @@
+ 
+ 	while (1) {
+ 		namelen = sizeof(it);
+-		if (recvfrom(sock, &sent, sizeof(sent), 0, &it, &namelen) < 0) {
++		if (recvfrom(sock, &sent, sizeof(sent), 0,
++			     (struct sockaddr*) &it, &namelen) < 0) {
+ 			fprintf(stderr, "lat_udp server: recvfrom: got wrong size\n");
+ 			exit(9);
+ 		}
+@@ -108,7 +109,8 @@
+ printf("lat_udp server: wanted %d, got %d, resyncing\n", seq, sent);	/**/
+ 			seq = sent;
+ 		}
+-		if (sendto(sock, &seq, sizeof(seq), 0, &it, sizeof(it)) < 0) {
++		if (sendto(sock, &seq, sizeof(seq), 0,
++			   (struct sockaddr*) &it, sizeof(it)) < 0) {
+ 			perror("lat_udp sendto");
+ 			exit(9);
+ 		}

benchmarks/lmbench/patches/patch-af

@@ -0,0 +1,10 @@
+--- src/memsize.c.~1~	Sat Nov 11 10:42:42 1995
++++ src/memsize.c	Sun Mar  1 00:24:59 1998
+@@ -10,6 +10,7 @@
+  */
+ char	*id = "$Id: patch-af,v 1.1 1998/03/01 08:28:36 marc Exp $\n";
+ 
++#include <stdlib.h>
+ #include "timing.c"
+ 
+ #define	CHK(x)	if ((x) == -1) { perror("x"); exit(1); }

benchmarks/lmbench/pkg/DESCR

@@ -1,4 +1,4 @@
-This is lmbench-1.0, a system performance measurement tool.  You can
+This is lmbench, a system performance measurement tool.  You can
 go to /usr/local/lib/lmbench and do one of the followings:
 
 make results (to run the benchmarks)