Index: head/www/hiawatha/Makefile
===================================================================
--- head/www/hiawatha/Makefile	(revision 435295)
+++ head/www/hiawatha/Makefile	(revision 435296)
@@ -1,70 +1,73 @@
 # Created by: Hugo Leisink
 # $FreeBSD$
 
 PORTNAME=	hiawatha
-PORTVERSION=	10.3
-PORTREVISION=	1
+PORTVERSION=	10.5
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Advanced and secure webserver for Unix
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PORTDOCS=	ChangeLog README.md
 CONFIG_FILES=	hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf \
 		error.xslt index.xslt
 
 SUB_FILES=	pkg-message
 USES=		cmake compiler:c11
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	hiawatha
 
-CMAKE_ARGS=	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+LDFLAGS+=	-L${LOCALBASE}/lib
+CMAKE_ARGS+=	-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
-		-DWEBROOT_DIR=${WWWDIR}
+		-DWEBROOT_DIR=${WWWDIR} \
+		-DWORK_DIR=/var/db/${PORTNAME}
 
-OPTIONS_DEFINE=	CACHE DOCS IPV6 MONITOR RPROXY SSL TOMAHAWK TOOLKIT XSLT
+OPTIONS_DEFINE=	CACHE DOCS IPV6 MONITOR RPROXY MBEDTLS TOMAHAWK TOOLKIT XSLT
 
-OPTIONS_DEFAULT=	CACHE RPROXY SSL TOOLKIT XSLT
+OPTIONS_DEFAULT=	CACHE RPROXY MBEDTLS TOOLKIT XSLT
 
 CACHE_DESC=	Enable cache support
 MONITOR_DESC=	Enable Hiawatha Monitor
 RPROXY_DESC=	Enable reverse proxy
 TOMAHAWK_DESC=	Enable Tomahawk command channel
 TOOLKIT_DESC=	Enable URL toolkit
 XSLT_DESC=	Enable XSLT support
 
 CACHE_CMAKE_BOOL=	ENABLE_CACHE
 TOMAHAWK_CMAKE_BOOL=	ENABLE_TOMAHAWK
 IPV6_CMAKE_BOOL=	ENABLE_IPV6
 MONITOR_CMAKE_BOOL=	ENABLE_MONITOR
 RPROXY_CMAKE_BOOL=	ENABLE_RPROXY
-SSL_CMAKE_BOOL=		ENABLE_SSL
+MBEDTLS_CMAKE_BOOL=	ENABLE_TLS USE_SYSTEM_MBEDTLS
 TOOLKIT_CMAKE_BOOL=	ENABLE_TOOLKIT
 XSLT_USE=		GNOME=libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
+
+MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 	${WRKSRC}/man/hiawatha.1.in ${WRKSRC}/man/cgi-wrapper.1.in \
 	${WRKSRC}/config/cgi-wrapper.conf ${WRKSRC}/config/hiawatha.conf.in
 
 	@${REINPLACE_CMD} -e 's|/etc/hiawatha|${ETCDIR}|g' \
 	${WRKSRC}/man/hiawatha.1.in ${WRKSRC}/man/cgi-wrapper.1.in
 
 post-install:
 .for FILE in ${CONFIG_FILES}
 	${INSTALL_DATA} ${WRKSRC}/config/${FILE} ${STAGEDIR}${PREFIX}/etc/hiawatha/${FILE}.sample
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${WWWDIR} ; \
 	${INSTALL_DATA} ${WRKSRC}/extra/index.html ${STAGEDIR}${WWWDIR}/index.html.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/www/hiawatha/distinfo
===================================================================
--- head/www/hiawatha/distinfo	(revision 435295)
+++ head/www/hiawatha/distinfo	(revision 435296)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465723990
-SHA256 (hiawatha-10.3.tar.gz) = 99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e
-SIZE (hiawatha-10.3.tar.gz) = 897607
+TIMESTAMP = 1487830050
+SHA256 (hiawatha-10.5.tar.gz) = d76155430dc9100de412088bd68978a2a9052832609c7ac961dccaf2550c618a
+SIZE (hiawatha-10.5.tar.gz) = 929167
Index: head/www/hiawatha/pkg-plist
===================================================================
--- head/www/hiawatha/pkg-plist	(revision 435295)
+++ head/www/hiawatha/pkg-plist	(revision 435296)
@@ -1,27 +1,17 @@
 bin/ssi-cgi
 @sample %%ETCDIR%%/cgi-wrapper.conf.sample
 @sample %%ETCDIR%%/error.xslt.sample
 @sample %%ETCDIR%%/hiawatha.conf.sample
 @sample %%ETCDIR%%/index.xslt.sample
 @sample %%ETCDIR%%/mimetype.conf.sample
 @sample %%ETCDIR%%/toolkit.conf.sample
-lib/hiawatha/libmbedcrypto.so
-lib/hiawatha/libmbedcrypto.so.0
-lib/hiawatha/libmbedcrypto.so.2.2.1
-lib/hiawatha/libmbedtls.so
-lib/hiawatha/libmbedtls.so.10
-lib/hiawatha/libmbedtls.so.2.2.1
-lib/hiawatha/libmbedx509.so
-lib/hiawatha/libmbedx509.so.0
-lib/hiawatha/libmbedx509.so.2.2.1
 man/man1/cgi-wrapper.1.gz
 man/man1/hiawatha.1.gz
 man/man1/ssi-cgi.1.gz
 man/man1/wigwam.1.gz
 sbin/cgi-wrapper
 sbin/hiawatha
 sbin/wigwam
 @sample %%WWWDIR%%/index.html.sample
-@dir /var/lib/hiawatha
-@dir /var/lib
 @dir /var/log/hiawatha
+@dir /var/db/hiawatha