svn commit: r400168 - in head/www/h2o: . files

[Jason Unovitch]

Author: junovitch
Date: Sun Oct 25 23:05:44 2015
New Revision: 400168
URL: https://svnweb.freebsd.org/changeset/ports/400168

Log:
  www/h2o: update 1.5.0 -> 1.5.2
  
  - Update cmake args and regen cmake patch for the new release
  - Add documentation files to pkg-plist
  
  Changes:	https://github.com/h2o/h2o/releases/tag/v1.5.1
  Changes:	https://github.com/h2o/h2o/releases/tag/v1.5.2
  
  PR:		203956
  Submitted by:	Dave Cottlehuber <dch at skunkwerks.at> (maintainer)

Modified:
  head/www/h2o/Makefile
  head/www/h2o/distinfo
  head/www/h2o/files/patch-CMakeLists.txt
  head/www/h2o/pkg-plist

Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile	Sun Oct 25 21:28:04 2015	(r400167)
+++ head/www/h2o/Makefile	Sun Oct 25 23:05:44 2015	(r400168)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -37,7 +37,7 @@ USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.options.mk>
 
-CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
+CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
 USE_OPENSSL_PORT=	yes
 
 post-patch:

Modified: head/www/h2o/distinfo
==============================================================================
--- head/www/h2o/distinfo	Sun Oct 25 21:28:04 2015	(r400167)
+++ head/www/h2o/distinfo	Sun Oct 25 23:05:44 2015	(r400168)
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.5.0_GH0.tar.gz) = b0700b30e26852d6dca2fc72d3f742ab8a0694ae7e1871e33b0cfb5ce1bdde7e
-SIZE (h2o-h2o-v1.5.0_GH0.tar.gz) = 6261794
+SHA256 (h2o-h2o-v1.5.2_GH0.tar.gz) = 1daf205b86e0a5ce96937db733ab02205a4f57dcb9ded8507fc7dd0a00c00dc2
+SIZE (h2o-h2o-v1.5.2_GH0.tar.gz) = 6263184

Modified: head/www/h2o/files/patch-CMakeLists.txt
==============================================================================
--- head/www/h2o/files/patch-CMakeLists.txt	Sun Oct 25 21:28:04 2015	(r400167)
+++ head/www/h2o/files/patch-CMakeLists.txt	Sun Oct 25 23:05:44 2015	(r400168)
@@ -1,14 +1,6 @@
---- CMakeLists.txt.orig	2015-09-01 19:56:02 UTC
+--- CMakeLists.txt.orig	2015-10-20 06:50:39 UTC
 +++ CMakeLists.txt
-@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND)
-     ELSE (LIBUV_FOUND)
-         SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
-     ENDIF (LIBUV_FOUND)
--    INSTALL(TARGETS libh2o-evloop DESTINATION lib)
- ELSE (OPENSSL_FOUND)
-     SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
-     SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES EXCLUDE_FROM_ALL 1)
-@@ -353,16 +352,15 @@ ENDIF (WITH_BUNDLED_SSL)
+@@ -357,11 +357,11 @@ ENDIF (WITH_MRUBY)
  TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
  
  INSTALL(TARGETS h2o
@@ -16,15 +8,10 @@
 -    LIBRARY DESTINATION lib)
 +    RUNTIME DESTINATION bin)
  
- ADD_EXECUTABLE(setuidgid src/setuidgid.c)
- INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o)
+ IF (NOT WITHOUT_LIBS)
+-    INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
++    INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
++        EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
+ ENDIF ()
  
--INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
-+INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
-+    EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
- 
- INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o)
--INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE)
- 
- # tests
- ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES})
+ INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/setuidgid share/h2o/start_server DESTINATION share/h2o)

Modified: head/www/h2o/pkg-plist
==============================================================================
--- head/www/h2o/pkg-plist	Sun Oct 25 21:28:04 2015	(r400167)
+++ head/www/h2o/pkg-plist	Sun Oct 25 23:05:44 2015	(r400168)
@@ -5,4 +5,34 @@ share/h2o/kill-on-close
 share/h2o/start_server
 %%DATADIR%%/setuidgid
 @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
+%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
+%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
+%%PORTDOCS%%%%DOCSDIR%%/assets/searchstyle.css
+%%PORTDOCS%%%%DOCSDIR%%/assets/style.css
+%%PORTDOCS%%%%DOCSDIR%%/benchmarks.html
+%%PORTDOCS%%%%DOCSDIR%%/configure.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/gzip_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
+%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/search/jquery-1.9.1.min.js
+%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
+%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
+%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
 @sample %%ETCDIR%%/h2o.conf.sample