From cf4add4987f241767a4fb7595911279ebca8c695 Mon Sep 17 00:00:00 2001
From: Bill Fumerola <billf@FreeBSD.org>
Date: Sat, 25 Dec 1999 03:30:40 +0000
Subject: Upgrade to version 1.45, use better building logic.

---
 net/nttcp/Makefile       | 12 +++---------
 net/nttcp/distinfo       |  2 +-
 net/nttcp/files/patch-aa | 21 +++++----------------
 3 files changed, 9 insertions(+), 26 deletions(-)

(limited to 'net/nttcp')

diff --git a/net/nttcp/Makefile b/net/nttcp/Makefile
index 9c91104ef509..2e7ec17593cd 100644
--- a/net/nttcp/Makefile
+++ b/net/nttcp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   nttcp
-# Version required:    1.3
+# Version required:    1.45
 # Date created:        11 Nov 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nttcp-1.4
+DISTNAME=	nttcp-1.45
 CATEGORIES=	net benchmarks
 MASTER_SITES=	http://users.leo.org/~bartel/nttcp/ \
 		http://www.FreeBSD.org/~billf/
@@ -16,13 +16,7 @@ MAINTAINER=	billf@FreeBSD.org
 ALL_TARGET=	nttcp
 MAN1=		nttcp.1
 USE_GMAKE=	yes
-MAKE_ENV+=	CFLG="${CFLAGS}"
-
-post-patch:
-
-	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre_sed
-	@${SED} -e 's#-O2#${CFLAGS}#' \
-	${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
+MAKE_ENV+=	OPT="${CFLAGS}"
 
 do-install:
 
diff --git a/net/nttcp/distinfo b/net/nttcp/distinfo
index e311ea60bc7c..f567ec229e25 100644
--- a/net/nttcp/distinfo
+++ b/net/nttcp/distinfo
@@ -1 +1 @@
-MD5 (nttcp-1.4.tar.gz) = b97cadd2560c7e06faf890ebe7ceefc2
+MD5 (nttcp-1.45.tar.gz) = d172737dbfda224cd42d09cf7cbb3b15
diff --git a/net/nttcp/files/patch-aa b/net/nttcp/files/patch-aa
index 0f908806e9b6..f91b484f465f 100644
--- a/net/nttcp/files/patch-aa
+++ b/net/nttcp/files/patch-aa
@@ -1,31 +1,20 @@
---- Makefile.old	Wed Oct  7 15:12:25 1998
-+++ Makefile	Mon Dec  7 23:03:15 1998
+--- Makefile.orig	Tue Sep 28 12:02:26 1999
++++ Makefile	Fri Dec 24 22:29:00 1999
 @@ -109,12 +109,12 @@
  #INC=	
  
  ## For FreeBSD
 -#ARCH=	-DFreeBSD
 -#LIB=
--#OPT=	-O2
++ARCH=	-DFreeBSD
++LIB=
+ #OPT=	-O2
 -#CC=	cc
 -#DBG=	
 -#INC=	
-+ARCH=	-DFreeBSD
-+LIB=
-+OPT=	-O2
 +CC=	cc
 +DBG=	
 +INC=	
  
  ## For SGI IRIX 5.3, 6.2 (cc or gcc)
  #ARCH=
-@@ -151,7 +151,8 @@
- VERSION=	1.4
- prefix=		/usr/local/dist/DIR/nttcp-$(VERSION)
- #prefix=		/usr/local
--CFLAGS =	$(ARCH) $(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
-+#CFLAGS =	$(ARCH) $(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
-+CFLAGS =	$(ARCH) $(CFLG) -DVERSION=\"$(VERSION)\"
- LFLAGS = 	$(DBG) 
- 
- nttcp:		nttcp.o support.o
-- 
cgit v1.2.3