Index: branches/2015Q3/www/h2o/Makefile =================================================================== --- branches/2015Q3/www/h2o/Makefile (revision 397228) +++ branches/2015Q3/www/h2o/Makefile (revision 397229) @@ -1,60 +1,59 @@ # Created by: Dave Cottlehuber # $FreeBSD$ PORTNAME= h2o -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.5 DISTVERSIONPREFIX= v CATEGORIES= www MAINTAINER= dch@skunkwerks.at COMMENT= Optimized HTTP2 server with support for HTTP/1.x LICENSE= MIT USE_GITHUB= yes -USES= cmake compiler:c11 shebangfix +USES= cmake compiler:c11 perl5 shebangfix +USE_PERL5= run SHEBANG_FILES= share/h2o/start_server PORTDOCS= README.md SUB_FILES= ${PORTNAME} SUB_LIST+= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ - H2O_PIDDIR=${H2O_PIDDIR} \ H2O_LOGDIR=${H2O_LOGDIR} PLIST_SUB= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ - H2O_PIDDIR=${H2O_PIDDIR} \ H2O_LOGDIR=${H2O_LOGDIR} H2O_USER?= www H2O_GROUP?= www H2O_LOGDIR= /var/log/${PORTNAME}/ -H2O_PIDDIR= /var/run/${PORTNAME}/ USE_RC_SUBR= ${PORTNAME} .include -.if ${OSVERSION} < 900000 -BROKEN= fails to compile on 8.x -.endif - -CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF +CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF USE_OPENSSL_PORT= yes +post-patch: + @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ + ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ + ${WRKSRC}/share/h2o/fetch-ocsp-response \ + ${WRKSRC}/share/h2o/kill-on-close \ + ${WRKSRC}/share/h2o/start_server + post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${ETCDIR} \ - ${STAGEDIR}${H2O_PIDDIR} \ ${STAGEDIR}${H2O_LOGDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ ${FILESDIR}/${PORTNAME}.conf.sample \ ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample .include Index: branches/2015Q3/www/h2o/distinfo =================================================================== --- branches/2015Q3/www/h2o/distinfo (revision 397228) +++ branches/2015Q3/www/h2o/distinfo (revision 397229) @@ -1,2 +1,2 @@ -SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f -SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709 +SHA256 (h2o-h2o-v1.4.5_GH0.tar.gz) = 0f60e8d35afad61afc284a7abfa9c9a3b976e8f9faed3f0966fb34056e2e138d +SIZE (h2o-h2o-v1.4.5_GH0.tar.gz) = 4736984 Index: branches/2015Q3/www/h2o/files/h2o.conf.sample =================================================================== --- branches/2015Q3/www/h2o/files/h2o.conf.sample (revision 397228) +++ branches/2015Q3/www/h2o/files/h2o.conf.sample (revision 397229) @@ -1,27 +1,30 @@ # vi: ft=yaml # to find out the configuration commands, run: h2o --help +user: www +pid-file: /var/run/h2o.pid +access-log: /var/log/h2o/h2o-access.log +error-log: /var/log/h2o/h2o-error.log listen: 80 listen: port: 443 ssl: minimum-version: TLSv1.2 # generate your own certificates certificate-file: /usr/local/etc/h2o/server.crt key-file: /usr/local/etc/h2o/server.key -access-log: /var/log/h2o/h2o.log file.dirlisting: on # per-host configuration hosts: my.example.org: paths: "/": file.dir: "/usr/local/www/data/my.example.org" pkg.example.org: # virtual directory layout paths: "/poudriere": file.dir: "/usr/local/poudriere/data/logs/bulk" "/FreeBSD:10:amd64": file.dir: "/usr/local/poudriere/data/packages/10_1_amd64-default/" "/FreeBSD:11:amd64": file.dir: "/usr/local/poudriere/data/packages/current_amd64-default/" Index: branches/2015Q3/www/h2o/files/h2o.in =================================================================== --- branches/2015Q3/www/h2o/files/h2o.in (revision 397228) +++ branches/2015Q3/www/h2o/files/h2o.in (revision 397229) @@ -1,44 +1,34 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: h2o # REQUIRE: LOGIN DAEMON NETWORKING # KEYWORD: shutdown # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # h2o_enable (bool): Set to NO by default. # Set it to YES to enable h2o. # # h2o_config (string): Optional full path for h2o config file -# h2o_user (user): Set to h2o by default. . /etc/rc.subr name=h2o rcvar=h2o_enable # defaults : ${h2o_enable:="NO"} -: ${h2o_user:="%%H2O_USER%%"} : ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"} -: ${h2o_options:=" --conf ${h2o_config}"} # daemon -h2o_pidfile="%%H2O_PIDDIR%%${name}.pid" -procname="%%PREFIX%%/bin/${name}" -command=/usr/sbin/daemon -command_args=" -f -c -p ${h2o_pidfile} ${procname} ${h2o_options}" -start_precmd="h2o_precmd" - -h2o_precmd() -{ - # create empty pidfile with correct permissions - install -o ${h2o_user} /dev/null ${h2o_pidfile} -} +pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2` +command="%%PREFIX%%/bin/${name}" +command_args="-m daemon -c ${h2o_config}" +procname="%%LOCALBASE%%/bin/perl" load_rc_config $name run_rc_command "$1" Index: branches/2015Q3/www/h2o/files/patch-CMakeLists.txt =================================================================== --- branches/2015Q3/www/h2o/files/patch-CMakeLists.txt (nonexistent) +++ branches/2015Q3/www/h2o/files/patch-CMakeLists.txt (revision 397229) @@ -0,0 +1,30 @@ +--- CMakeLists.txt.orig 2015-09-01 19:56:02 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) + TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES}) + + INSTALL(TARGETS h2o +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib) ++ RUNTIME DESTINATION bin) + + ADD_EXECUTABLE(setuidgid src/setuidgid.c) + INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o) + +-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}) Property changes on: branches/2015Q3/www/h2o/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q3/www/h2o/pkg-plist =================================================================== --- branches/2015Q3/www/h2o/pkg-plist (revision 397228) +++ branches/2015Q3/www/h2o/pkg-plist (revision 397229) @@ -1,6 +1,8 @@ bin/h2o +share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response +share/h2o/kill-on-close share/h2o/start_server +%%DATADIR%%/setuidgid @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% -@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%% @sample %%ETCDIR%%/h2o.conf.sample Index: branches/2015Q3 =================================================================== --- branches/2015Q3 (revision 397228) +++ branches/2015Q3 (revision 397229) Property changes on: branches/2015Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r393066,396229,396629,397062