diff -ruN /usr/ports/sysutils/ucspi-tcp.orig/Makefile /usr/ports/sysutils/ucspi-tcp/Makefile --- /usr/ports/sysutils/ucspi-tcp.orig/Makefile 2013-08-27 03:47:29.000000000 +0900 +++ /usr/ports/sysutils/ucspi-tcp/Makefile 2013-08-27 04:32:21.000000000 +0900 @@ -21,7 +21,6 @@ RBL2SMTPD_DESC= Don't drop connection, pass envvar to smtpd LIMITS_DESC= Implement per-connection and other limits - ALL_TARGET= prog install instcheck SCRIPTS_ENV= BINOWN="${BINOWN}" \ @@ -77,7 +76,7 @@ PATCHFILES+= ucspi-rss.diff:rss .endif -.if ${PORT_OPTIONS:MSSL} +.if ${PORT_OPTIONS:MSSL} && !${PORT_OPTIONS:MIPV6} # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk .include "${PORTSDIR}/Mk/bsd.openssl.mk" PATCH_SITES+= http://www.nrg4u.com/qmail/:ssl @@ -94,18 +93,19 @@ .endif .if ${PORT_OPTIONS:MIPV6} -# Neither can IPv6 and SSL +PATCH_SITES+= http://www.fefe.de/ucspi/:ipv6 +PATCHFILES+= ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6 + . if ${PORT_OPTIONS:MSSL} -BROKEN= SSL and IPv6 options cannot coexist, please choose one of them +.include "${PORTSDIR}/Mk/bsd.openssl.mk" +PATCH_SITES+= http://manuel.mausz.at/coding/patches/ucspi-tcp/gentoo/:ipv6ssl +PATCHFILES+= ucspi-tcp-ipv6-ssl-20061230.patch:ipv6ssl . endif # Same for IPv6 and LIMITS . if ${PORT_OPTIONS:MLIMITS} BROKEN= IPv6 and LIMITS options cannot coexist, please choose one of them . endif - -PATCH_SITES+= http://www.fefe.de/ucspi/:ipv6 -PATCHFILES+= ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6 .endif PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:rss,ssl,rbl2smtpd/} diff -ruN /usr/ports/sysutils/ucspi-tcp.orig/distinfo /usr/ports/sysutils/ucspi-tcp/distinfo --- /usr/ports/sysutils/ucspi-tcp.orig/distinfo 2013-08-27 03:47:35.000000000 +0900 +++ /usr/ports/sysutils/ucspi-tcp/distinfo 2013-08-27 03:55:07.000000000 +0900 @@ -12,3 +12,5 @@ SIZE (tcpserver-limits-2006-01-26.diff) = 15523 SHA256 (ucspi-tcp-0.88-ipv6.diff19.bz2) = 35952cd290d714452c840580126004cbae8db65b1632df67ac9c8fad7d1f9ace SIZE (ucspi-tcp-0.88-ipv6.diff19.bz2) = 22632 +SHA256 (ucspi-tcp-ipv6-ssl-20061230.patch) = e8019f6af54d5a3601097d47d697a78863975c77d061837c37afe4678f805980 +SIZE (ucspi-tcp-ipv6-ssl-20061230.patch) = 14191