Add inet6 option using fefe's patch. Fix indentation and quell pkglint.

5 files changed, 26 insertions, 10 deletions

diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index e2e47c30877..c3d77463f30 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/03/15 17:32:17 schmonz Exp $
+# $NetBSD: Makefile,v 1.37 2011/06/09 01:47:13 schmonz Exp $
 
 DISTNAME=		ucspi-tcp-0.88
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils net
 MASTER_SITES=		http://cr.yp.to/ucspi-tcp/ ftp://cr.yp.to/ucspi-tcp/
 DISTFILES=		${DISTNAME}.tar.gz ${MANPAGES}
diff --git a/net/ucspi-tcp/PLIST b/net/ucspi-tcp/PLIST
index e6daf9cffcd..993c24618ec 100644
--- a/net/ucspi-tcp/PLIST
+++ b/net/ucspi-tcp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/22 01:04:35 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/06/09 01:47:13 schmonz Exp $
 bin/addcr
 bin/argv0
 bin/date@
@@ -21,6 +21,7 @@ man/man1/argv0.1
 man/man1/date@.1
 man/man1/delcr.1
 man/man1/finger@.1
+${PLIST.inet6}man/man1/fixcr.1
 man/man1/fixcrio.1
 man/man1/http@.1
 man/man1/mconnect.1
@@ -32,3 +33,4 @@ man/man1/tcprules.1
 man/man1/tcprulescheck.1
 man/man1/tcpserver.1
 man/man1/who@.1
+${PLIST.inet6}man/man5/tcp-environ.5
diff --git a/net/ucspi-tcp/distinfo b/net/ucspi-tcp/distinfo
index 58e5d9598e3..d42fa22f614 100644
--- a/net/ucspi-tcp/distinfo
+++ b/net/ucspi-tcp/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.8 2010/03/15 17:32:17 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2011/06/09 01:47:13 schmonz Exp $
 
 SHA1 (rblsmtpd-nodefaultrbl.patch) = 5d6048b5928257c13ff5cbcddb40ed0eee9997c0
 RMD160 (rblsmtpd-nodefaultrbl.patch) = fa93dd4522ccc77c5b43d0a79f741ae2ab54f075
 Size (rblsmtpd-nodefaultrbl.patch) = 822 bytes
+SHA1 (ucspi-tcp-0.88-ipv6.diff19.bz2) = c055c7ff33977e595422321600f682b8d8bc9ff2
+RMD160 (ucspi-tcp-0.88-ipv6.diff19.bz2) = 72d4e9de43e7ab69ddc66daa2e6dd1be7edd44b5
+Size (ucspi-tcp-0.88-ipv6.diff19.bz2) = 22632 bytes
 SHA1 (ucspi-tcp-0.88-man-20020317.tar.gz) = 7b2507ff1b49917b44ee64af5995a94a50effd44
 RMD160 (ucspi-tcp-0.88-man-20020317.tar.gz) = 6285882adea8f3c1f700ef82bec0d34078dfa559
 Size (ucspi-tcp-0.88-man-20020317.tar.gz) = 7562 bytes
 SHA1 (ucspi-tcp-0.88.tar.gz) = 793b4189795b563085602c030dd8aa0d206ddc0e
 RMD160 (ucspi-tcp-0.88.tar.gz) = eb20085ea6ffd5d137a805f7c8768e0312c1f56a
 Size (ucspi-tcp-0.88.tar.gz) = 53019 bytes
-SHA1 (patch-aa) = ce7aae99fcfa9d11a0050610153c802ac487cda2
+SHA1 (patch-aa) = 8b0a1fdadec118e1647cd422f6d09fcd60b5f813
diff --git a/net/ucspi-tcp/options.mk b/net/ucspi-tcp/options.mk
index 49f6796dd33..5565a912757 100644
--- a/net/ucspi-tcp/options.mk
+++ b/net/ucspi-tcp/options.mk
@@ -1,14 +1,23 @@
-# $NetBSD: options.mk,v 1.1 2007/02/02 13:00:36 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2011/06/09 01:47:13 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ucspi-tcp
-PKG_SUPPORTED_OPTIONS+=	ucspi-tcp-nodefaultrbl
+PKG_SUPPORTED_OPTIONS+=	inet6 ucspi-tcp-nodefaultrbl
 PKG_SUGGESTED_OPTIONS+=	ucspi-tcp-nodefaultrbl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=			inet6
+.if !empty(PKG_OPTIONS:Minet6)
+IPV6_PATCH=			ucspi-tcp-0.88-ipv6.diff19.bz2
+PATCHFILES+=			${IPV6_PATCH}
+SITES.${IPV6_PATCH}=		http://www.fefe.de/ucspi/
+PATCH_DIST_STRIP.${IPV6_PATCH}=	-p1
+PLIST.inet6=			yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mucspi-tcp-nodefaultrbl)
-NODEFAULTRBL_PATCH=	rblsmtpd-nodefaultrbl.patch
-PATCHFILES+=		${NODEFAULTRBL_PATCH}
+NODEFAULTRBL_PATCH=		rblsmtpd-nodefaultrbl.patch
+PATCHFILES+=			${NODEFAULTRBL_PATCH}
 SITES.${NODEFAULTRBL_PATCH}=	http://pyropus.ca/software/misc/
 PATCH_DIST_STRIP.${NODEFAULTRBL_PATCH}=	-p1
 .endif
diff --git a/net/ucspi-tcp/patches/patch-aa b/net/ucspi-tcp/patches/patch-aa
index 93bf021d86c..4779384444a 100644
--- a/net/ucspi-tcp/patches/patch-aa
+++ b/net/ucspi-tcp/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2010/03/15 17:32:17 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2011/06/09 01:47:13 schmonz Exp $
+
+DESTDIR support.
 
 --- Makefile.orig	2000-03-18 15:18:42.000000000 +0000
 +++ Makefile