Index: head/security/putty/Makefile
===================================================================
--- head/security/putty/Makefile	(revision 447755)
+++ head/security/putty/Makefile	(revision 447756)
@@ -1,89 +1,99 @@
 # $FreeBSD$
 
 PORTNAME=	putty
-PORTVERSION=	0.69
-PORTREVISION=	1
+PORTVERSION=	0.70
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
 
 # Beat Gaetzi (beat@) is permitted to take maintainership back
 # or commit to this port without my prior approval.
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Secure shell and telnet client
 
 LICENSE=	MIT
 LICENSE_FILE=	${FILESDIR}/LICENSE
 
 USES=		cpe gmake pkgconfig
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 MAKEFILE=	Makefile.gtk
 
 CPE_VENDOR=	simon_tatham
 
 PLIST_FILES=	bin/plink bin/pscp bin/psftp bin/puttygen
 PLIST_FILES+=	man/man1/plink.1.gz man/man1/pscp.1.gz man/man1/psftp.1.gz man/man1/puttygen.1.gz
 
-OPTIONS_DEFINE=	GSSAPI GTK3
-OPTIONS_DEFAULT=GSSAPI GTK3
+OPTIONS_DEFINE=	GTK3
+OPTIONS_DEFAULT=GSSAPI_BASE GTK3
+OPTIONS_SINGLE=	GSSAPI_SELECT
+OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL \
+				GSSAPI_MIT
 
 CONFLICTS_INSTALL?=	pssh-[0-9]* putty-nogtk-[0-9]*
 
 .include <bsd.port.options.mk>
 
 CFLAGS+=	-DBSD_PTYS -DOMIT_UTMP -DIPV6
 LDFLAGS+=	-Wl,--as-needed
 
 .if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11)
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11
 
 PLIST_FILES+=	bin/pageant bin/pterm bin/putty bin/puttytel
 PLIST_FILES+=	man/man1/pageant.1.gz man/man1/pterm.1.gz man/man1/putty.1.gz man/man1/puttytel.1.gz
 PLIST_FILES+=	share/pixmaps/putty.ico
 MAKE_ARGS+=	PUTTY_WITH_GTK=yes GTK_CONFIG="pkg-config gtk+-3.0 x11 --cflags"
 DESKTOP_ENTRIES="PuTTY" \
 		"${COMMENT}" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 		"${PORTNAME}" \
 		"" \
 		false
 .else
 MAKE_ARGS+=	GTK_CONFIG=:
 .endif
 
-.if ${PORT_OPTIONS:MGSSAPI}
+.if ${PORT_OPTIONS:MGSSAPI_BASE}
 _COMPAT=		-DSTATIC_GSSAPI
 USES+=		gssapi:base,flags
+MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
+.elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
+_COMPAT=		-DSTATIC_GSSAPI
+USES+=		gssapi:heimdal,flags
+MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
+.elif ${PORT_OPTIONS:MGSSAPI_MIT}
+_COMPAT=		-DSTATIC_GSSAPI
+USES+=		gssapi:mit,flags
 MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
 .else
 _COMPAT=		-DNO_GSSAPI
 .endif
 
 _COMPAT+=	-DOMIT_UTMP
 
 .if defined(WITH_DEBUG) && ${WITH_DEBUG} != "no"
 XFLAGS=		-DDEBUG
 .endif
 
 # upstream sets -Werror - there are no issues on 9.1-FreeBSD amd64
 # currently, but override it nonetheless.
 XFLAGS+=	-Wno-error
 
 MAKE_ARGS+=	COMPAT="${_COMPAT}" \
 		CC="${CC}" \
 		XFLAGS="${XFLAGS}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,prefix=/usr/local,prefix=${PREFIX},;\
 			      s,make,${MAKE_CMD},'\
 		${WRKSRC}/${MAKEFILE}
 
 post-install-GTK3-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/../windows/putty.ico \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
Index: head/security/putty/distinfo
===================================================================
--- head/security/putty/distinfo	(revision 447755)
+++ head/security/putty/distinfo	(revision 447756)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493852442
-SHA256 (putty-0.69.tar.gz) = b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1
-SIZE (putty-0.69.tar.gz) = 2122306
+TIMESTAMP = 1500391843
+SHA256 (putty-0.70.tar.gz) = bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be
+SIZE (putty-0.70.tar.gz) = 2386108