sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- add option knob mruby handler as default

Browse source 
- simplify ssl option
- bump portversion

PR:		213733
Submitted by:	dch@skunkwerks.at (maintainer)
This commit is contained in:
Matthew Seaman 2016-12-17 22:42:05 +00:00
parent c64bb13b46
commit 58bb985474
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=428810
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
www/h2o/Makefile
View file

@ -5,6 +5,7 @@ PORTNAME= h2o
PORTVERSION= 2.0.4 PORTVERSION= 2.0.4
PORTREVISION= 1 PORTREVISION= 1
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MAINTAINER= dch@skunkwerks.at MAINTAINER= dch@skunkwerks.at
@ -36,20 +37,30 @@ H2O_LOGDIR= /var/log/${PORTNAME}/
USE_RC_SUBR= ${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 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 CMAKE_ARGS+= -DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
.include <bsd.port.options.mk> .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} .if ${PORT_OPTIONS:MLIBRESSL}
CMAKE_ARGS+= -DWITH_BUNDLED_SSL=ON USES_SSL= yes
WITH_OPENSSL_PORT= no
.else .else
CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF USES_SSL= no
WITH_OPENSSL_PORT= yes .endif
.if ${PORT_OPTIONS:MMRUBY}
USE_RUBY= yes
BUILD_DEPENDS+= bison:devel/bison
.endif .endif
post-patch: post-patch:

3
www/h2o/pkg-plist
View file

@ -7,7 +7,7 @@ share/h2o/start_server
%%DATADIR%%/fastcgi-cgi %%DATADIR%%/fastcgi-cgi
%%DATADIR%%/setuidgid %%DATADIR%%/setuidgid
%%DATADIR%%/status/index.html %%DATADIR%%/status/index.html
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% %%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.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-english-search.js
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js %%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
@sample %%ETCDIR%%/h2o.conf.sample @sample %%ETCDIR%%/h2o.conf.sample