svn commit: r435296 - head/www/hiawatha

[Nikolai Lifanov]

Author: lifanov
Date: Thu Mar  2 21:11:31 2017
New Revision: 435296
URL: https://svnweb.freebsd.org/changeset/ports/435296

Log:
  update www/hiawatha to 10.5
  
  o switch to mbed TLS
  o SkipCacheCookie option added
  o small improvements and bugfixes
  
  PR:		215919
  Submitted by:	Chris Hutchinson <portmaster at bsdforge.com> (maintainer)

Modified:
  head/www/hiawatha/Makefile
  head/www/hiawatha/distinfo
  head/www/hiawatha/pkg-plist

Modified: head/www/hiawatha/Makefile
==============================================================================
--- head/www/hiawatha/Makefile	Thu Mar  2 19:28:52 2017	(r435295)
+++ head/www/hiawatha/Makefile	Thu Mar  2 21:11:31 2017	(r435296)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hiawatha
-PORTVERSION=	10.3
-PORTREVISION=	1
+PORTVERSION=	10.5
 CATEGORIES=	www
 MASTER_SITES=	https://www.hiawatha-webserver.org/files/
 
@@ -22,13 +21,15 @@ 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
@@ -42,11 +43,13 @@ 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 \

Modified: head/www/hiawatha/distinfo
==============================================================================
--- head/www/hiawatha/distinfo	Thu Mar  2 19:28:52 2017	(r435295)
+++ head/www/hiawatha/distinfo	Thu Mar  2 21:11:31 2017	(r435296)
@@ -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

Modified: head/www/hiawatha/pkg-plist
==============================================================================
--- head/www/hiawatha/pkg-plist	Thu Mar  2 19:28:52 2017	(r435295)
+++ head/www/hiawatha/pkg-plist	Thu Mar  2 21:11:31 2017	(r435296)
@@ -5,15 +5,6 @@ bin/ssi-cgi
 @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
@@ -22,6 +13,5 @@ sbin/cgi-wrapper
 sbin/hiawatha
 sbin/wigwam
 @sample %%WWWDIR%%/index.html.sample
- at dir /var/lib/hiawatha
- at dir /var/lib
 @dir /var/log/hiawatha
+ at dir /var/db/hiawatha