Index: ports/sysutils/ucspi-tcp/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/ucspi-tcp/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ports/sysutils/ucspi-tcp/Makefile	14 May 2005 18:26:08 -0000	1.20
+++ ports/sysutils/ucspi-tcp/Makefile	18 May 2005 10:02:35 -0000
@@ -6,26 +6,31 @@
 #
 
 PORTNAME=	ucspi-tcp
-PORTVERSION=	0.88
+PORTVERSION=	${UCSPI_VER}
 PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://cr.yp.to/ucspi-tcp/
+DISTNAME=	${PORTNAME}-${UCSPI_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	Command-line tools for building TCP client-server applications
 
+UCSPI_VER=	0.88
+UCSPI_V6_VER=	diff10
+
 .if !defined(WITHOUT_MAN)
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
 DISTFILES+=	${DISTNAME}-man.tar.gz:1
 
-OPTIONS=	RSS_DIFF "Patch rblsmtpd for qmail users" off
-
 MAN1=		addcr.1 argv0.1 date@.1 delcr.1 finger@.1 fixcrio.1 \
 		http@.1 mconnect.1 rblsmtpd.1 recordio.1 tcpcat.1 \
 		tcpclient.1 tcprules.1 tcprulescheck.1 tcpserver.1 who@.1
 .endif
 
+OPTIONS=	RSS_DIFF "Patch rblsmtpd for qmail users" off \
+		IPV6 "Apply Felix von Leitner's IPv6 patch" off
+
 NO_PACKAGE=	"Unsure of djb\'s license"
 
 ALL_TARGET=	prog install instcheck
@@ -36,8 +41,17 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_RSS_DIFF)
-PATCH_SITES=	http://www.qmail.org/
-PATCHFILES=	ucspi-rss.diff
+PATCH_SITES=	http://www.qmail.org/:rss
+PATCHFILES=	ucspi-rss.diff:rss
+PATCH_DIST_STRIP=	-p1
+.endif
+
+.if defined(WITH_IPV6)
+PKGNAMESUFFIX=	-ipv6
+PORTVERSION=	${UCSPI_VER}.${UCSPI_V6_VER:S/test/b/:S/diff//}
+CATEGORIES+=	ipv6
+PATCH_SITES+=	http://www.fefe.de/ucspi/:ipv6
+PATCHFILES+=	${PORTNAME}-${UCSPI_VER}-ipv6.${UCSPI_V6_VER}.bz2:ipv6
 PATCH_DIST_STRIP=	-p1
 .endif
 
Index: ports/sysutils/ucspi-tcp/distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/ucspi-tcp/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- ports/sysutils/ucspi-tcp/distinfo	17 Feb 2005 08:53:06 -0000	1.5
+++ ports/sysutils/ucspi-tcp/distinfo	18 Feb 2005 16:58:23 -0000
@@ -4,3 +4,5 @@
 SIZE (ucspi-tcp-0.88-man.tar.gz) = 7562
 MD5 (ucspi-rss.diff) = 554ec0eb60f619667efde3fb5325310d
 SIZE (ucspi-rss.diff) = 1828
+MD5 (ucspi-tcp-0.88-ipv6.diff10.bz2) = 5068018c73cdcb66f5de5977fc1648c7
+SIZE (ucspi-tcp-0.88-ipv6.diff10.bz2) = 18711