svn commit: r428810 - head/www/h2o
Matthew Seaman
matthew at FreeBSD.org
Sat Dec 17 22:42:06 UTC 2016
Author: matthew
Date: Sat Dec 17 22:42:05 2016
New Revision: 428810
URL: https://svnweb.freebsd.org/changeset/ports/428810
Log:
- add option knob mruby handler as default
- simplify ssl option
- bump portversion
PR: 213733
Submitted by: dch at skunkwerks.at (maintainer)
Modified:
head/www/h2o/Makefile
head/www/h2o/pkg-plist
Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile Sat Dec 17 22:30:45 2016 (r428809)
+++ head/www/h2o/Makefile Sat Dec 17 22:42:05 2016 (r428810)
@@ -5,6 +5,7 @@ PORTNAME= h2o
PORTVERSION= 2.0.4
PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= dch at skunkwerks.at
@@ -36,20 +37,30 @@ H2O_LOGDIR= /var/log/${PORTNAME}/
USE_RC_SUBR= ${PORTNAME}
-OPTIONS_DEFINE= LIBRESSL
+OPTIONS_DEFINE= LIBRESSL MRUBY
+OPTIONS_DEFAULT= LIBRESSL MRUBY
+OPTIONS_SUB= yes
LIBRESSL_DESC= Build with bundled LibreSSL instead of OpenSSL
-OPTIONS_DEFAULT= LIBRESSL
+MRUBY_DESC= Build with mruby handler support
CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
.include <bsd.port.options.mk>
+LIBRESSL_CMAKE_ON= -DWITH_BUNDLED_SSL=ON
+LIBRESSL_CMAKE_OFF= -DWITH_BUNDLED_SSL=OFF
+MRUBY_CMAKE_ON= -DWITH_MRUBY=ON
+MRUBY_CMAKE_OFF= -DWITH_MRUBY=OFF
+
.if ${PORT_OPTIONS:MLIBRESSL}
-CMAKE_ARGS+= -DWITH_BUNDLED_SSL=ON
-WITH_OPENSSL_PORT= no
+USES_SSL= yes
.else
-CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF
-WITH_OPENSSL_PORT= yes
+USES_SSL= no
+.endif
+
+.if ${PORT_OPTIONS:MMRUBY}
+USE_RUBY= yes
+BUILD_DEPENDS+= bison:devel/bison
.endif
post-patch:
Modified: head/www/h2o/pkg-plist
==============================================================================
--- head/www/h2o/pkg-plist Sat Dec 17 22:30:45 2016 (r428809)
+++ head/www/h2o/pkg-plist Sat Dec 17 22:42:05 2016 (r428810)
@@ -7,7 +7,7 @@ share/h2o/start_server
%%DATADIR%%/fastcgi-cgi
%%DATADIR%%/setuidgid
%%DATADIR%%/status/index.html
- at dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
+%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
@@ -57,4 +57,5 @@ share/h2o/start_server
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
+ at dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
@sample %%ETCDIR%%/h2o.conf.sample
More information about the svn-ports-head
mailing list