original distribution updated (-> 4.0)

PR:		6302

5 files changed, 36 insertions, 27 deletions

diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index 2ca4abe3cc6..2834e9d48e4 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -1,18 +1,19 @@
-# New ports collection makefile for:	netpipes3.2
-# Version required:			3.2
+# New ports collection makefile for:	netpipes4.0
+# Version required:			4.0
 # Date created:				12th April 1997
 # Whom:					doconnor@gsoft.com.au
 #
-# $Id: Makefile,v 1.2 1998/01/21 19:14:51 fenner Exp $
+# $Id: Makefile,v 1.3 1998/01/22 00:20:33 msmith Exp $
 #
 
-DISTNAME=	netpipes3.2
-PKGNAME=        netpipes-3.2
+DISTNAME=	netpipes4.0
+PKGNAME=	netpipes-4.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.cis.ufl.edu/pub/staff/thoth/
+MASTER_SITES=	ftp://ftp.purplefrog.com/pub/netpipes/
 
 MAINTAINER=	doconnor@gsoft.com.au
 
-MAN1=		faucet.1 hose.1 sockdown.1 getpeername.1
+MAN1=		faucet.1 hose.1 sockdown.1 getpeername.1 encapsulate.1 \
+		timelimit.1
 
 .include <bsd.port.mk>
diff --git a/net/netpipes/distinfo b/net/netpipes/distinfo
index b21d385811b..e94f5837421 100644
--- a/net/netpipes/distinfo
+++ b/net/netpipes/distinfo
@@ -1 +1 @@
-MD5 (netpipes3.2.tar.gz) = 52402e636772c32a37228e5349042d09
+MD5 (netpipes4.0.tar.gz) = 522bcf3653c63c19d6a9ec53b98fe2cd
diff --git a/net/netpipes/files/patch-aa b/net/netpipes/files/patch-aa
index 43e8410bc4f..89e5070d9e2 100644
--- a/net/netpipes/files/patch-aa
+++ b/net/netpipes/files/patch-aa
@@ -1,30 +1,34 @@
---- Makefile.orig	Fri Jun 28 00:03:45 1996
-+++ Makefile	Tue Jul  8 15:15:40 1997
+--- Makefile.orig	Wed Apr 15 11:49:24 1998
++++ Makefile	Wed Apr 15 11:50:42 1998
 @@ -17,7 +17,7 @@
  
  # You probably want to change this:
  #INSTROOT = ${HOME}
--INSTROOT = /depot/collections0/netpipes3.2
+-INSTROOT = /depot/collections0/netpipes4.0
 +INSTROOT = ${PREFIX}
  INSTBIN = ${INSTROOT}/bin
  INSTMAN = ${INSTROOT}/man
  
-@@ -46,8 +46,12 @@
- # (that system call is used by the -daemon argument to detach faucet from
- # the controlling terminal)
- 
-+# FreeBSD 2.1.0
-+CFLAGS += -DUSE_IOCTL $(CDEBUGFLAGS)
-+CC = gcc
-+
- # SunOS 4.1.4
--CFLAGS = -DUSE_IOCTL -DNO_MEMMOVE $(CDEBUGFLAGS)
-+#CFLAGS = -DUSE_IOCTL -DNO_MEMMOVE $(CDEBUGFLAGS)
+@@ -52,7 +52,7 @@
+ #CFLAGS = -DUSE_IOCTL -DNO_MEMMOVE -DNO_STRERROR $(CDEBUGFLAGS)
  
  # Linux
- #CFLAGS = -DUSE_IOCTL -DSYSV $(CDEBUGFLAGS)
-@@ -83,14 +87,9 @@
- 	${CC} ${CFLAGS} -o $@ ${GOBJS} ${LDLIBS}
+-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
++#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
+ 
+ # SGI
+ #CFLAGS = -DSYSV $(CDEBUGFLAGS)
+@@ -61,7 +61,7 @@
+ #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
+ 
+ # FreeBSD
+-#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
++CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
+ 
+ # AIX 4.1.4 and 3.2.5
+ #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
+@@ -103,14 +103,9 @@
+ 	${CC} ${CFLAGS} -o $@ ${EOBJS} ${LDLIBS}
  
  install : all
 -	[ -d ${INSTROOT} ] || mkdir ${INSTROOT}
@@ -40,4 +44,4 @@
 +	ln -f -s ${INSTBIN}/getpeername ${INSTBIN}/getsockname
  
  clean	:
- 	rm -f ${FOBJS} ${HOBJS} ${SOBJS} ${GOBJS}
+ 	rm -f ${FOBJS} ${HOBJS} ${SOBJS} ${GOBJS} ${TOBJS} ${EOBJS}
diff --git a/net/netpipes/pkg-descr b/net/netpipes/pkg-descr
index fd130bd11c7..161ca1590df 100644
--- a/net/netpipes/pkg-descr
+++ b/net/netpipes/pkg-descr
@@ -2,4 +2,4 @@ Netpipes is a collection of utilities which attempts to provide the
 functionality of pipes over a network.
 
  - Daniel O'Connor
-   doconnor@ist.flinders.edu.au
+   doconnor@gsoft.com.au
diff --git a/net/netpipes/pkg-plist b/net/netpipes/pkg-plist
index 288454f6e3d..00e8e6fa626 100644
--- a/net/netpipes/pkg-plist
+++ b/net/netpipes/pkg-plist
@@ -2,7 +2,11 @@ bin/faucet
 bin/hose
 bin/sockdown
 bin/getpeername
+bin/encapsulate
+bin/timelimit
 man/man1/faucet.1.gz
 man/man1/hose.1.gz
 man/man1/sockdown.1.gz
 man/man1/getpeername.1.gz
+man/man1/encapsulate.1.gz
+man/man1/timelimit.1.gz