Index: branches/2015Q4/www/hiawatha/Makefile
===================================================================
--- branches/2015Q4/www/hiawatha/Makefile	(revision 402840)
+++ branches/2015Q4/www/hiawatha/Makefile	(revision 402841)
@@ -1,82 +1,84 @@
 # Created by: Hugo Leisink
 # $FreeBSD$
 
 PORTNAME=	hiawatha
-PORTVERSION=	9.14
+PORTVERSION=	9.15
 CATEGORIES=	www
-MASTER_SITES=	https://www.hiawatha-webserver.org/files/
+MASTER_SITES=	https://www.hiawatha-webserver.org/files/hiawatha-9/
 
-MAINTAINER=	chris@bsdjunk.com
+MAINTAINER=	ports@FreeBSD.org
 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 \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/man \
 		-DWEBROOT_DIR=${WWWDIR}
 
 OPTIONS_DEFINE=	CACHE DOCS IPV6 MONITOR RPROXY SSL TOMAHAWK TOOLKIT XSLT
 
 OPTIONS_DEFAULT=	CACHE IPV6 RPROXY SSL TOOLKIT XSLT DOCS
 
 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_ON=		-DENABLE_CACHE=on
 CACHE_CMAKE_OFF=	-DENABLE_CACHE=off
 
 TOMAHAWK_CMAKE_ON=	-DENABLE_TOMAHAWK=on
 TOMAHAWK_CMAKE_OFF=	-DENABLE_TOMAHAWK=off
 
 IPV6_CMAKE_ON=		-DENABLE_IPV6=on
 IPV6_CMAKE_OFF=		-DENABLE_IPV6=off
 
 MONITOR_CMAKE_ON=	-DENABLE_MONITOR=on
 MONITOR_CMAKE_OFF=	-DENABLE_MONITOR=off
 
 RPROXY_CMAKE_ON=	-DENABLE_RPROXY=on
 RPROXY_CMAKE_OFF=	-DENABLE_RPROXY=off
 
 SSL_CMAKE_ON=		-DENABLE_SSL=on
 SSL_CMAKE_OFF=		-DENABLE_SSL=off
 
 TOOLKIT_CMAKE_ON=	-DENABLE_TOOLKIT=on
 TOOLKIT_CMAKE_OFF=	-DENABLE_TOOLKIT=off
 
 XSLT_USE=		GNOME=libxslt
 XSLT_CMAKE_ON=		-DENABLE_XSLT=on
 XSLT_CMAKE_OFF=		-DENABLE_XSLT=off
 
 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:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-
 .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: branches/2015Q4/www/hiawatha/distinfo
===================================================================
--- branches/2015Q4/www/hiawatha/distinfo	(revision 402840)
+++ branches/2015Q4/www/hiawatha/distinfo	(revision 402841)
@@ -1,2 +1,2 @@
-SHA256 (hiawatha-9.14.tar.gz) = 79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa
-SIZE (hiawatha-9.14.tar.gz) = 891930
+SHA256 (hiawatha-9.15.tar.gz) = e9252133a1114095d1a9a89144b88828ee3b9754f435bd88270f7bf444dd9421
+SIZE (hiawatha-9.15.tar.gz) = 869922
Index: branches/2015Q4/www/hiawatha/pkg-plist
===================================================================
--- branches/2015Q4/www/hiawatha/pkg-plist	(revision 402840)
+++ branches/2015Q4/www/hiawatha/pkg-plist	(revision 402841)
@@ -1,30 +1,30 @@
 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
 sbin/cgi-wrapper
 sbin/hiawatha
 sbin/wigwam
 lib/hiawatha/libmbedtls.so
 lib/hiawatha/libmbedcrypto.so
 lib/hiawatha/libmbedcrypto.so.0
-lib/hiawatha/libmbedcrypto.so.2.0.0
+lib/hiawatha/libmbedcrypto.so.2.1.2
 lib/hiawatha/libmbedtls.so.10
-lib/hiawatha/libmbedtls.so.2.0.0
+lib/hiawatha/libmbedtls.so.2.1.2
 lib/hiawatha/libmbedx509.so
 lib/hiawatha/libmbedx509.so.0
-lib/hiawatha/libmbedx509.so.2.0.0
+lib/hiawatha/libmbedx509.so.2.1.2
 man/man1/cgi-wrapper.1.gz
 man/man1/hiawatha.1.gz
 man/man1/ssi-cgi.1.gz
 man/man1/wigwam.1.gz
 @sample %%WWWDIR%%/index.html.sample
 @dir %%WWWDIR%%
 @dir lib/hiawatha
 @dir %%ETCDIR%%
 @dir /var/log/hiawatha
 @dir /var/lib/hiawatha
 @dir /var/lib
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 402840)
+++ branches/2015Q4	(revision 402841)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r399650,399808,399956,402639