diff -urN ucspi-tcp.old/Makefile ucspi-tcp/Makefile
--- ucspi-tcp.old/Makefile	Thu Feb 17 17:53:06 2005
+++ ucspi-tcp/Makefile	Mon Apr 25 14:11:34 2005
@@ -11,33 +11,53 @@
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://cr.yp.to/ucspi-tcp/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
-.if defined(WITH_RSS_DIFF)
-PATCH_SITES=	http://www.qmail.org/
-PATCHFILES=	ucspi-rss.diff
-PATCH_DIST_STRIP=	-p1
-.endif
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	Command-line tools for building TCP client-server applications
 
+NO_PACKAGE=	"Unsure of djb\'s license"
+
+ALL_TARGET=	prog install instcheck
+
+SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
+		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
+
+OPTIONS=	IPV6 "IPv6 support" off \
+		RSS "RSS Diff" off
+
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_MAN)
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
 DISTFILES+=	${DISTNAME}-man.tar.gz:1
+EXTRACT_ONLY+=	${DISTNAME}-man.tar.gz
 
 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
 
-NO_PACKAGE=	"Unsure of djb\'s license"
-
-ALL_TARGET=	prog install instcheck
+.if defined(WITH_RSS_DIFF)
+PATCH_SITES=	http://www.qmail.org/
+PATCHFILES=	ucspi-rss.diff
+PATCH_DIST_STRIP=	-p1
+.endif
 
-SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
-		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
+.if defined(WITH_IPV6)
+IPV6_DIFF=		diff15
+PATCH_STRIP+=		-p1
+IPV6_DIFFFILE=		ucspi-tcp-0.88-ipv6.${IPV6_DIFF}.bz2
+DISTFILES+=             ${IPV6_DIFFFILE}:ipv6
+EXTRA_IPV6_PATCHFILE=	${WRKDIR}/ipv6.patch
+EXTRA_PATCHES+=		${EXTRA_IPV6_PATCHFILE}
+MASTER_SITES+=		http://www.fefe.de/ucspi/:ipv6
+.endif
 
-.include <bsd.port.pre.mk>
+pre-patch:
+.if defined(WITH_IPV6)
+	@${BZCAT} ${DISTDIR}/${IPV6_DIFFFILE} | ${SED} -e 's/EPROTO/ECONNABORTED/g' > ${EXTRA_IPV6_PATCHFILE}
+.endif
 
 post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
diff -urN ucspi-tcp.old/distinfo ucspi-tcp/distinfo
--- ucspi-tcp.old/distinfo	Thu Feb 17 17:53:06 2005
+++ ucspi-tcp/distinfo	Mon Apr 25 09:38:18 2005
@@ -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.diff15.bz2) = f123b518bc0d6a2993155c1cc54deafa
+SIZE (ucspi-tcp-0.88-ipv6.diff15.bz2) = 22964
diff -urN ucspi-tcp.old/files/patch-ipv6-sparc64-tcpserver.c ucspi-tcp/files/patch-ipv6-sparc64-tcpserver.c
--- ucspi-tcp.old/files/patch-ipv6-sparc64-tcpserver.c	Thu Jan  1 09:00:00 1970
+++ ucspi-tcp/files/patch-ipv6-sparc64-tcpserver.c	Tue Apr 26 16:25:40 2005
@@ -0,0 +1,20 @@
+--- tcpserver.c.orig	Tue Apr 26 16:15:16 2005
++++ tcpserver.c	Tue Apr 26 16:14:16 2005
+@@ -333,6 +333,7 @@
+   unsigned long u;
+   int s;
+   int t;
++  uint16 s_port;
+ 
+   while ((opt = getopt(argc,argv,"46dDvqQhHrR1UXx:t:u:g:l:b:B:c:I:pPoO")) != opteof)
+     switch(opt) {
+@@ -384,7 +385,8 @@
+     se = getservbyname(x,"tcp");
+     if (!se)
+       strerr_die3x(111,FATAL,"unable to figure out port number for ",x);
+-    uint16_unpack_big((char*)&se->s_port,&localport);
++    s_port = (uint16)se->s_port;
++    uint16_unpack_big((char*)&s_port,&localport);
+   }
+ 
+   if (!*argv) usage();