Update to 1.7.0.0

2008/10/15: socat version 1.7.0.0 brings support for SCTP stream, raw
interface, and generic sockets. New option escape allows to interrupt raw
terminal connections. Listening and receiving sockets can set a couple of
environment variables. Added base control of System V STREAMS. Lots of
corrections were performed. socat compiles on Mac OS X again.

Patch from Leonardo Taccari

5 files changed, 12 insertions, 54 deletions

diff --git a/net/socat/Makefile b/net/socat/Makefile
index 384b7fedf1e..d9c37ec90b6 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:31 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/10/25 18:21:18 adrianp Exp $
 
-DISTNAME=	socat-1.6.0.0
-PKGREVISION=	2
+DISTNAME=	socat-1.7.0.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/
 
@@ -24,6 +23,12 @@ SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	doc/socat.1
 SUBST_SED.paths=	-e 's,/usr/,${PREFIX}/,g'
 
+SUBST_CLASSES+=		makefile
+SUBST_MESSAGE.makefile=	Fixing Makefile CCOPTS.
+SUBST_STAGE.makefile=	post-patch
+SUBST_FILES.makefile=	Makefile.in
+SUBST_SED.makefile=	-e '/CCOPTS/ s/-Wall -Wno-parentheses//'
+
 .include "options.mk"
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/socat/distinfo b/net/socat/distinfo
index e6546c561fc..e2e1fbb7929 100644
--- a/net/socat/distinfo
+++ b/net/socat/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/01/27 12:35:16 rillig Exp $
+$NetBSD: distinfo,v 1.11 2008/10/25 18:21:18 adrianp Exp $
 
-SHA1 (socat-1.6.0.0.tar.gz) = d7e20e67c2691926e965272520a844644226f0b9
-RMD160 (socat-1.6.0.0.tar.gz) = 37b4f46e9e6ae49c2bf3a36ba94d3d63318a9826
-Size (socat-1.6.0.0.tar.gz) = 427187 bytes
-SHA1 (patch-aa) = 60d8dc14e1b15a7da5efb717b5bffd7338f86158
-SHA1 (patch-ab) = 8b8d9f86b7d0d08c5c8870ace5c2fb5a4515c95a
-SHA1 (patch-ac) = 981f623c32f3e03120aa86c3520bf8527afb5221
+SHA1 (socat-1.7.0.0.tar.gz) = f20badcaff11c4dad1e89f2ce396bd60a14d3464
+RMD160 (socat-1.7.0.0.tar.gz) = b03ef9ba23c45a55632dac17930b4a26346aa430
+Size (socat-1.7.0.0.tar.gz) = 547219 bytes
diff --git a/net/socat/patches/patch-aa b/net/socat/patches/patch-aa
deleted file mode 100644
index 3362509c8dd..00000000000
--- a/net/socat/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/02/17 17:44:57 adrianp Exp $
-
---- Makefile.in.orig	2006-07-13 23:18:49.000000000 +0100
-+++ Makefile.in
-@@ -21,7 +21,7 @@ srcdir = @srcdir@
- VPATH = @srcdir@
- 
- CC = @CC@
--CCOPTS = $(CCOPT) -Wall -Wno-parentheses
-+CCOPTS = $(CCOPT)
- 
- SYSDEFS = @SYSDEFS@
- CPPFLAGS = -I. @CPPFLAGS@
diff --git a/net/socat/patches/patch-ab b/net/socat/patches/patch-ab
deleted file mode 100644
index 1e7a714e89b..00000000000
--- a/net/socat/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/01/27 12:35:17 rillig Exp $
-
-The construction #if FOO #elif FOO #endif is almost always wrong.
-
---- xiohelp.c.orig	2007-02-05 22:15:57.000000000 +0100
-+++ xiohelp.c	2008-01-27 13:29:19.000000000 +0100
-@@ -25,7 +25,7 @@ static const char *optiontypenames[] = {
- 	"OFF_T",	"OFF64_T",
- #if HAVE_STRUCT_IP_MREQN
- 					"STRUCT-IP_MREQN",
--#elif HAVE_STRUCT_IP_MREQN
-+#elif HAVE_STRUCT_IP_MREQ
- 					"STRUCT-IP_MREQ",
- #endif
- 							"IP4NAME",
diff --git a/net/socat/patches/patch-ac b/net/socat/patches/patch-ac
deleted file mode 100644
index 27ec906fb95..00000000000
--- a/net/socat/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/01/27 12:35:17 rillig Exp $
-
-As the author said: Keep the enums and their names in sync.
-
---- xioopts.h.orig	2007-03-06 22:19:46.000000000 +0100
-+++ xioopts.h	2008-01-27 13:32:15.000000000 +0100
-@@ -49,7 +49,9 @@ enum e_types {
-    TYPE_LONGLONG,	/* long long */
-    TYPE_OFF32,		/* off_t */
-    TYPE_OFF64,		/* off64_t */
-+#if HAVE_STRUCT_IP_MREQ || HAVE_STRUCT_IP_MREQN
-    TYPE_IP_MREQN,	/* for  struct ip_mreq  or  struct ip_mreqn */
-+#endif
-    TYPE_IP4NAME,	/* IPv4 hostname or address */
- 
-    TYPE_2BYTE = TYPE_USHORT