Index: head/net/guacamole-server/Makefile
===================================================================
--- head/net/guacamole-server/Makefile	(revision 459389)
+++ head/net/guacamole-server/Makefile	(revision 459390)
@@ -1,84 +1,84 @@
 # Created by: Richard Gallamore <ultima@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	guacamole-server
 DISTVERSION=	0.9.14
 CATEGORIES=	net
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	HTML5 Clientless Remote Desktop
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libossp-uuid.so:misc/ossp-uuid \
 		libpng.so:graphics/png
 
 CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
 
 USES=		autoreconf jpeg libtool localbase \
 		pkgconfig shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	apache
 
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	guacd
 SHEBANG_FILES=	${WRKSRC}/src/protocols/rdp/keymaps/generate.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-guacd-conf=${ETCDIR}/guacd.conf
 INSTALL_TARGET=	install-strip
 
 USERS=		guacamole
 GROUPS=		guacamole
 
 SUB_LIST=	GUACD_USER=${USERS} \
 		GUACD_GROUP=${GROUPS}
 
 OPTIONS_DEFINE=		GUACENC NLS SSL WEBP
 OPTIONS_DEFAULT=	RDP SSH SSL VNC VORBIS PULSEAUDIO WEBP GUACENC
 OPTIONS_GROUP=		SP AUDIO
 OPTIONS_GROUP_SP=	RDP SSH VNC
 OPTIONS_GROUP_AUDIO=	VORBIS PULSEAUDIO
 OPTIONS_SUB=		yes
 
 AUDIO_DESC=		Audio Support
 GUACENC_DESC=		Video Encoding Utility
 RDP_DESC=		RDP protocol support
 SP_DESC=		Supported Protocols
 VNC_DESC=		VNC protocol support
 
 GUACENC_CONFIGURE_ENABLE=	guacenc
 GUACENC_CONFIGURE_WITH=		libavcodec libavutil libswscale
 GUACENC_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 NLS_USES=		gettext-runtime
 PULSEAUDIO_CONFIGURE_WITH=	pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 RDP_CONFIGURE_WITH=	rdp
 RDP_LIB_DEPENDS=	libfreerdp1.so:net/freerdp1
-SSH_CONFIGURE_WITH=	pango ssh
+SSH_CONFIGURE_WITH=	pango ssh terminal
 SSH_IMPLIES=		SSL
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_USE=		GNOME=pango
 SSL_CONFIGURE_WITH=	ssl
 SSL_USES=		ssl
 VNC_CONFIGURE_WITH=	vnc
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VORBIS_CONFIGURE_WITH=	vorbis
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \
 			 s|/etc/guacamole|${PREFIX}/etc/guacd|g' \
 			 ${WRKSRC}/src/guacd/man/guacd.conf.5.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
Index: head/net/guacamole-server/pkg-plist
===================================================================
--- head/net/guacamole-server/pkg-plist	(revision 459389)
+++ head/net/guacamole-server/pkg-plist	(revision 459390)
@@ -1,63 +1,63 @@
 %%ETCDIR%%/guacd.conf.sample
 include/guacamole/audio-fntypes.h
 include/guacamole/audio-types.h
 include/guacamole/audio.h
 include/guacamole/client-constants.h
 include/guacamole/client-fntypes.h
 include/guacamole/client-types.h
 include/guacamole/client.h
 include/guacamole/error-types.h
 include/guacamole/error.h
 include/guacamole/hash.h
 include/guacamole/parser-constants.h
 include/guacamole/parser-types.h
 include/guacamole/parser.h
 include/guacamole/layer-types.h
 include/guacamole/layer.h
 include/guacamole/object-types.h
 include/guacamole/object.h
 include/guacamole/plugin-constants.h
 include/guacamole/plugin.h
 include/guacamole/pool-types.h
 include/guacamole/pool.h
 include/guacamole/protocol-types.h
 include/guacamole/protocol.h
 include/guacamole/socket-constants.h
 include/guacamole/socket-fntypes.h
-include/guacamole/socket-ssl.h
+%%SSL%%include/guacamole/socket-ssl.h
 include/guacamole/socket-types.h
 include/guacamole/socket.h
 include/guacamole/stream-types.h
 include/guacamole/stream.h
 include/guacamole/timestamp-types.h
 include/guacamole/timestamp.h
 include/guacamole/unicode.h
 include/guacamole/user-constants.h
 include/guacamole/user-fntypes.h
 include/guacamole/user-types.h
 include/guacamole/user.h
 %%RDP%%lib/freerdp/guacai-client.so
 %%RDP%%lib/freerdp/guacdr-client.so
 %%RDP%%lib/freerdp/guacsnd-client.so
 %%RDP%%lib/freerdp/guacsvc-client.so
 %%RDP%%lib/libguac-client-rdp.a
 %%RDP%%lib/libguac-client-rdp.so
 %%RDP%%lib/libguac-client-rdp.so.0
 %%RDP%%lib/libguac-client-rdp.so.0.0.0
 %%SSH%%lib/libguac-client-ssh.a
 %%SSH%%lib/libguac-client-ssh.so
 %%SSH%%lib/libguac-client-ssh.so.0
 %%SSH%%lib/libguac-client-ssh.so.0.0.0
 %%VNC%%lib/libguac-client-vnc.a
 %%VNC%%lib/libguac-client-vnc.so
 %%VNC%%lib/libguac-client-vnc.so.0
 %%VNC%%lib/libguac-client-vnc.so.0.0.0
 lib/libguac.a
 lib/libguac.so
 lib/libguac.so.12
 lib/libguac.so.12.3.0
 man/man5/guacd.conf.5.gz
 man/man8/guacd.8.gz
 %%GUACENC%%man/man1/guacenc.1.gz
 sbin/guacd
 %%GUACENC%%bin/guacenc