update to 1.47.

PR:		24056,24618
Submitted by:	George Reid <greid@ukug.uk.freebsd.org>,
		Joseph Scott <joseph@randomnetworks.com>
non-response from: maintainer

honor CC.

5 files changed, 17 insertions, 206 deletions

diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 55eba90eabbd..11caf18dda60 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	nttcp
-PORTVERSION=	1.45
+PORTVERSION=	1.47
 CATEGORIES=	net benchmarks
-MASTER_SITES=	http://users.leo.org/~bartel/nttcp/ \
+MASTER_SITES=	http://www.leo.org/~bartel/nttcp/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	billf
 
diff --git a/benchmarks/nttcp/distinfo b/benchmarks/nttcp/distinfo
index f567ec229e25..2996a471a29e 100644
--- a/benchmarks/nttcp/distinfo
+++ b/benchmarks/nttcp/distinfo
@@ -1 +1 @@
-MD5 (nttcp-1.45.tar.gz) = d172737dbfda224cd42d09cf7cbb3b15
+MD5 (nttcp-1.47.tar.gz) = 05cc30409e6f2cb8cfdf40334d1dcd77
diff --git a/benchmarks/nttcp/files/Makefile b/benchmarks/nttcp/files/Makefile
deleted file mode 100644
index 4b727c8ac528..000000000000
--- a/benchmarks/nttcp/files/Makefile
+++ /dev/null
@@ -1,184 +0,0 @@
-# This code was written and is copyrighted 1996,1998 by
-#
-#       Elmar Bartel
-#       Institut fuer Informatik
-#       Technische Universitaet Muenchen
-#       bartel@informatik.tu-muenchen.de
-#
-# Permission to use, copy, modify and distribute this software
-# and its documentation for any purpose, except making money, is
-# herby granted, provided that the above copyright notice and
-# this permission appears in all places, where this code is
-# referenced or used literally.
-
-# uncomment the settings for your system and type make.
-# if there is no setting available, simply try to use
-# the most closest settings. 
-# Finally let me know what you used, to get it running.
-
-
-## For System V4.1 (AT&T) either cc or gcc
-## And for SINIX V4.1 (either mips or intel).
-#ARCH=
-#LIB=	-lsocket -lnsl
-#CC=	cc
-#OPT=	-O
-#DBG=	-g
-#INC=	
-
-## For DEC (Mips)ULTRIX 4.1
-#ARCH=	-Dultrix
-#LIB=
-#CC=	gcc
-#OPT=	-O2
-#DBG=	
-#INC=	
-
-## For HPUX 9.* with gcc
-#ARCH=	-Dhpux9
-#LIB=
-#CC=	gcc
-#OPT=	-O2
-#DBG=	-g
-#INC=	
-
-## For HPUX 9.* with cc
-#ARCH=	-Ae -Dhpux9
-#LIB=
-#CC=	cc
-#OPT=	-O
-#DBG=	-g
-#INC=	
-
-
-## For HPUX 10.* with gcc
-#ARCH=	-Dhpux
-#LIB=
-#CC=	gcc
-#OPT=	-O2
-#DBG=	-g
-#INC=	
-
-## For HPUX 10.* with cc
-#ARCH=	-Ae -Dhpux
-#LIB=
-#CC=	cc
-#OPT=	-O
-#DBG=	-g
-#INC=	
-
-## For SunOS 4.1 with clcc
-#ARCH=-DSunOS4
-#LIB=	
-#OPT=	-O2
-#CC=	clcc
-#DBG=	
-#INC=	
-
-## For SunOS 4.1 with gcc
-#ARCH=-DSunOS4
-#LIB=	
-#OPT=	-O2
-#CC=	gcc
-#DBG=	
-#INC=	
-
-## For SunOS 5.3 with gcc
-#ARCH=-DSunOS53
-#LIB=	-lsocket -lnsl -lucb
-#OPT=	-O2
-#CC=	gcc
-#DBG=	
-#INC=	
-
-## For SunOS 5.[456] with cc from SunSoft
-#ARCH=-DSunOS54
-#LIB=	-lsocket -lnsl
-#OPT=	-O
-#CC=	/usr/ccs/bin/cc
-#CC=	/opt/SUNWspro/bin/cc
-#DBG=	-g
-#INC=	
-
-## For SunOS 5.[456] with gcc
-#ARCH=-DSunOS54
-#LIB=	-lsocket -lnsl
-#OPT=	-O2
-#CC=	gcc
-#DBG=	-Wall -g
-#INC=	
-
-## For FreeBSD
-ARCH=	-DFreeBSD
-LIB=
-OPT=	-O2
-CC=	cc
-DBG=	
-INC=	
-
-## For SGI IRIX 5.3, 6.2 (cc or gcc)
-#ARCH=
-#LIB=
-#OPT=	-O
-#CC=	cc
-#DBG=	
-#INC=	
-
-## For IBM AIX 2.3
-#ARCH=	-Daix
-#LIB=
-#OPT=	-O
-#CC=	cc
-#DBG=	
-#INC=	
-
-## For OSF/1 10.41
-#ARCH=	
-#LIB=
-#OPT=	-O -Olimit 700
-#CC=	cc
-#DBG=	
-#INC=	
-
-## For Linux with gcc
-#ARCH=
-#LIB=	
-#OPT=	-O2
-#CC=	gcc
-#DBG=	
-#INC=	
-
-VERSION=	1.4
-prefix=		/usr/local/dist/DIR/nttcp-$(VERSION)
-#prefix=		/usr/local
-#CFLAGS =	$(ARCH) $(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
-CFLAGS =	$(ARCH) $(CFLG) -DVERSION=\"$(VERSION)\"
-LFLAGS = 	$(DBG) 
-
-nttcp:		nttcp.o support.o
-		$(CC) $(LFLAGS) nttcp.o -o nttcp support.o $(LIB)
-
-support.o:	support.c support.h
-
-dist:
-		if [ -d nttcp-$(VERSION) ]; then \
-		    rm -f nttcp-$(VERSION)/*; \
-		else \
-		    mkdir nttcp-$(VERSION); \
-		fi
-		ln nttcp.c nttcp.1 support.c support.h \
-		   README Makefile nttcp-$(VERSION)
-		tar cvf - nttcp-$(VERSION) | gzip > /tmp/nttcp-$(VERSION).tar.gz; \
-		zip -lgr /tmp/nttcp`echo $(VERSION)|tr -d .`.zip nttcp-$(VERSION)
-
-install:	nttcp
-		-mkdir -p $(prefix)/bin
-		-mkdir -p $(prefix)/man/man1
-		cp nttcp $(prefix)/bin
-		cp nttcp.1 $(prefix)/man/man1
-
-clean:
-		rm -f *.o
-
-clobber:	clean
-		rm -rf core nttcp nttcp-$(VERSION)
diff --git a/benchmarks/nttcp/files/patch-aa b/benchmarks/nttcp/files/patch-aa
index f91b484f465f..2692f87414dd 100644
--- a/benchmarks/nttcp/files/patch-aa
+++ b/benchmarks/nttcp/files/patch-aa
@@ -1,20 +1,13 @@
---- Makefile.orig	Tue Sep 28 12:02:26 1999
-+++ Makefile	Fri Dec 24 22:29:00 1999
-@@ -109,12 +109,12 @@
- #INC=	
+--- Makefile.orig	Mon Dec 18 19:17:20 2000
++++ Makefile	Mon Jan 29 12:26:51 2001
+@@ -111,8 +111,8 @@
+ # For FreeBSD
+ ARCH=	-DFreeBSD
+ LIB=
+-OPT=	-O2
+-CC=	cc
++#OPT=	-O2
++#CC=	cc
+ DBG=	
+ INC=	
  
- ## For FreeBSD
--#ARCH=	-DFreeBSD
--#LIB=
-+ARCH=	-DFreeBSD
-+LIB=
- #OPT=	-O2
--#CC=	cc
--#DBG=	
--#INC=	
-+CC=	cc
-+DBG=	
-+INC=	
- 
- ## For SGI IRIX 5.3, 6.2 (cc or gcc)
- #ARCH=
diff --git a/benchmarks/nttcp/pkg-descr b/benchmarks/nttcp/pkg-descr
index 8f018711ffa3..a9fce2550164 100644
--- a/benchmarks/nttcp/pkg-descr
+++ b/benchmarks/nttcp/pkg-descr
@@ -4,4 +4,6 @@ side program which will send/receive data. Both sides measure the time
 and number of bytes transfered. The local side will print the measures.
 The format of the output can be specified on the commandline.
 
+WWW: http://www.leo.org/~bartel/nttcp/
+
 Bill Fumerola <billf@chc-chimes.com>