cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- move install target into netpipe's own Makefile

Browse Source 
- make netpipe respect CC and CFLAGS
- improve patch-aa a bit
This commit is contained in:
brad 2000-01-23 03:29:56 +00:00
parent a76766862b
commit 33092bd54a
3 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
benchmarks/netpipe/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 1999/11/30 02:12:48 kevlo Exp $ # $OpenBSD: Makefile,v 1.4 2000/01/23 03:29:56 brad Exp $
# $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $ # $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
DISTNAME= netpipe-2.3 DISTNAME= netpipe-2.3
@ -8,11 +8,4 @@ MASTER_SITES= ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
MAINTAINER= brad@openbsd.org MAINTAINER= brad@openbsd.org
ALL_TARGET= NPtcp
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/NPtcp ${PREFIX}/bin/NPtcp
@${LN} -fs ${PREFIX}/bin/NPtcp ${PREFIX}/bin/netpipe
${INSTALL_DATA} ${WRKSRC}/netpipe.1 ${PREFIX}/man/man1/netpipe.1
.include <bsd.port.mk> .include <bsd.port.mk>

18
benchmarks/netpipe/patches/patch-aa
View File

@ -1,11 +1,21 @@
--- netpipe.h.orig Thu Mar 18 23:15:21 1999 --- netpipe.h.orig Wed Oct 28 09:42:43 1998
+++ netpipe.h Thu Mar 18 23:16:33 1999 +++ netpipe.h Sat Jan 22 22:20:35 2000
@@ -37,8 +37,10 @@ @@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/time.h> /* struct timeval */
#include <stdlib.h> /* malloc(3) */
@@ -37,8 +38,12 @@
#define MAXINT 2147483647 #define MAXINT 2147483647
#define ABS(x) (((x) < 0)?(-(x)):(x)) #define ABS(x) (((x) < 0)?(-(x)):(x))
+#ifndef __OpenBSD__ +#ifndef MIN
#define MIN(x,y) (((x) < (y))?(x):(y)) #define MIN(x,y) (((x) < (y))?(x):(y))
+#endif
+#ifndef MAX
#define MAX(x,y) (((x) > (y))?(x):(y)) #define MAX(x,y) (((x) > (y))?(x):(y))
+#endif +#endif

34
benchmarks/netpipe/patches/patch-ab Normal file
View File

@ -0,0 +1,34 @@
--- Makefile.orig Wed Oct 28 09:42:43 1998
+++ Makefile Sat Jan 22 22:25:43 2000
@@ -3,8 +3,6 @@
# $Id: patch-ab,v 1.1 2000/01/23 03:29:56 brad Exp $
#
-# Default C compiler: must be an ANSI C compiler
-CC = cc
# File names for the main source files
DRIV_SRC = netpipe.c
DRIV_OBJ = netpipe.o
@@ -13,7 +11,6 @@
TARGETS = NPtcp
# If you have TCP, MPI and PVM
#TARGETS = NPtcp NPmpi NPpvm
-CFLAGS = -O
# Adjust these for MPI (only used if you have MPI)
MPI_HOME = /home/mpich
MPI_ARCH = IRIX
@@ -31,7 +28,14 @@
# This section of the Makefile is for compiling the binaries
#
+all: NPtcp
+
TCP: NPtcp
+
+install:
+ $(BSD_INSTALL_PROGRAM) NPtcp ${PREFIX}/bin
+ $(BSD_INSTALL_MAN) netpipe.1 ${PREFIX}/man/man1
+ @ln -sf ${PREFIX}/bin/NPtcp ${PREFIX}/bin/netpipe
NPtcp: NPtcp.o TCP.o
$(CC) $(CFLAGS) NPtcp.o TCP.o -o NPtcp $(EXTRA_LIBS)