Index: head/www/hiawatha/Makefile =================================================================== --- head/www/hiawatha/Makefile (revision 378851) +++ head/www/hiawatha/Makefile (revision 378852) @@ -1,82 +1,82 @@ # Created by: Hugo Leisink # $FreeBSD$ PORTNAME= hiawatha -PORTVERSION= 9.8 +PORTVERSION= 9.11 CATEGORIES= www MASTER_SITES= SF/fbsdports/hiawatha/ MAINTAINER= chris@bsdjunk.com COMMENT= Advanced and secure webserver for Unix LICENSE= GPLv2 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 .include Index: head/www/hiawatha/distinfo =================================================================== --- head/www/hiawatha/distinfo (revision 378851) +++ head/www/hiawatha/distinfo (revision 378852) @@ -1,2 +1,2 @@ -SHA256 (hiawatha-9.8.tar.gz) = 6fe9bd408361bc07b47fe6eeaf98d6b644e1cd258b3470da3e70aba510e83b64 -SIZE (hiawatha-9.8.tar.gz) = 888977 +SHA256 (hiawatha-9.11.tar.gz) = bf7f09dff86fe689e872e7adade91e13fd81106a97e5af02ab8afb3c77fccd9c +SIZE (hiawatha-9.11.tar.gz) = 897113 Index: head/www/hiawatha/files/patch-CMakeLists.txt =================================================================== --- head/www/hiawatha/files/patch-CMakeLists.txt (revision 378851) +++ head/www/hiawatha/files/patch-CMakeLists.txt (nonexistent) @@ -1,28 +0,0 @@ -Submitted upstream: https://github.com/hsleisink/hiawatha/pull/20 - -commit 4f61342f9f6ff46fbb8b4dc5646c9f0b15809bef -Author: Raphael Kubo da Costa -Date: Wed Dec 31 19:31:22 2014 +0200 - - Make the INSTALL(DIRECTORY empty) calls work with CMake >= 3.1.0. - - Since CMake 3.1.0, ${LOG_DIR}, ${PID_DIR} and ${WORK_DIR} were no longer - being created because the regular expression does not match anything and - CMake's behavior changed in a way that those directories would not be - created before filtering the match list anymore. - - Instead, just call INSTALL(DIRECTORY) with an empty source, which works - with all CMake versions currently supported. - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -172,6 +172,6 @@ endforeach() - install(FILES extra/index.html DESTINATION ${WEBROOT_DIR}) - - # Create directories --install(DIRECTORY empty DESTINATION ${LOG_DIR} PATTERN "empty" EXCLUDE) --install(DIRECTORY empty DESTINATION ${PID_DIR} PATTERN "empty" EXCLUDE) --install(DIRECTORY empty DESTINATION ${WORK_DIR} PATTERN "empty" EXCLUDE) -+install(DIRECTORY DESTINATION ${LOG_DIR}) -+install(DIRECTORY DESTINATION ${PID_DIR}) -+install(DIRECTORY DESTINATION ${WORK_DIR}) Property changes on: head/www/hiawatha/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/hiawatha/pkg-plist =================================================================== --- head/www/hiawatha/pkg-plist (revision 378851) +++ head/www/hiawatha/pkg-plist (revision 378852) @@ -1,24 +1,24 @@ 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/libpolarssl.so -lib/hiawatha/libpolarssl.so.1.3.8 +lib/hiawatha/libpolarssl.so.1.3.9 lib/hiawatha/libpolarssl.so.7 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