Attachment #170907 for bug #209927

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+9 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20160601
		9	AFFECTS: Users of www/h2o
		10	AUTHOR: dch@skunkwerks.at
		11
		12	File paths no longer have a trailing / appended to them. This enables
		13	directing specific paths to a file but may break existing configurations.
		14	Refer to https://h2o.examp1e.net/configure/file_directives.html and
		15	revise your yaml config appropriately.
		16
8	20160527	17	20160527
9	AFFECTS: Users of mail/opensmtpd-extras (any of them)	18	AFFECTS: Users of mail/opensmtpd-extras (any of them)
10	AUTHOR: adamw@FreeBSD.org	19	AUTHOR: adamw@FreeBSD.org

Lines 2-8 Link Here

(-)b/www/h2o/Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= h2o	4	PORTNAME= h2o
5	PORTVERSION= 1.7.3	5	PORTVERSION= 2.0.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= www	7	CATEGORIES= www
8		8
Lines 12-17 COMMENT= Optimized HTTP2 server with support for HTTP/1.x Link Here
12	LICENSE= MIT	12	LICENSE= MIT
13		13
14	USE_GITHUB= yes	14	USE_GITHUB= yes
		15	GH_TAGNAME= v2.0.0
15		16
16	USES= cmake compiler:c11 perl5 shebangfix	17	USES= cmake compiler:c11 perl5 shebangfix
17	USE_PERL5= run	18	USE_PERL5= run

Lines 1-3 Link Here

(-)b/www/h2o/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464774475	1	TIMESTAMP = 1464775587
2	SHA256 (h2o-h2o-v1.7.3_GH0.tar.gz) = 546bcde8aa3cf996d161d1e75aaad159d10fca1b3d368c4270f0674e8c78a213	2	SHA256 (h2o-h2o-v2.0.0_GH0.tar.gz) = 068cc88fe7313ea3c637764abc296629f6c9250e12b714f5629065bdc49d28c8
3	SIZE (h2o-h2o-v1.7.3_GH0.tar.gz) = 6541316	3	SIZE (h2o-h2o-v2.0.0_GH0.tar.gz) = 15007086




# Set it to YES to enable h2o.
#
# h2o_config    (string): Optional full path for h2o config file
# h2o_perl      (string): Optional full path to perl executable

. /etc/rc.subr


# defaults
: ${h2o_enable:="NO"}
: ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"}
: ${h2o_perl:="%%LOCALBASE%%/bin/perl"}

# daemon
pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
h2o_env="H2O_PERL=${h2o_perl}"
command="%%PREFIX%%/bin/${name}"
command_args="-m daemon -c ${h2o_config}"
procname="%%LOCALBASE%%/bin/perl"




share/h2o/fetch-ocsp-response
share/h2o/kill-on-close
share/h2o/start_server
%%DATADIR%%/ca-bundle.crt
%%DATADIR%%/fastcgi-cgi
%%DATADIR%%/setuidgid
%%DATADIR%%/status/index.html
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png

%%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html
%%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html
%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
%%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.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/quick_start.html
%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/h2o.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.crt
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.key
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/install.html

Return to bug 209927

Lines 14-19 Link Here

(-)b/www/h2o/files/h2o.in (+3 lines)
14	# Set it to YES to enable h2o.	14	# Set it to YES to enable h2o.
15	#	15	#
16	# h2o_config (string): Optional full path for h2o config file	16	# h2o_config (string): Optional full path for h2o config file
		17	# h2o_perl (string): Optional full path to perl executable
17		18
18	. /etc/rc.subr	19	. /etc/rc.subr
19		20
Lines 23-31 rcvar=h2o_enable Link Here
23	# defaults	24	# defaults
24	: ${h2o_enable:="NO"}	25	: ${h2o_enable:="NO"}
25	: ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"}	26	: ${h2o_config:="%%PREFIX%%/etc/${name}/${name}.conf"}
		27	: ${h2o_perl:="%%LOCALBASE%%/bin/perl"}
26		28
27	# daemon	29	# daemon
28	pidfile=`grep pid-file ${h2o_config} \| cut -d' ' -f2`	30	pidfile=`grep pid-file ${h2o_config} \| cut -d' ' -f2`
		31	h2o_env="H2O_PERL=${h2o_perl}"
29	command="%%PREFIX%%/bin/${name}"	32	command="%%PREFIX%%/bin/${name}"
30	command_args="-m daemon -c ${h2o_config}"	33	command_args="-m daemon -c ${h2o_config}"
31	procname="%%LOCALBASE%%/bin/perl"	34	procname="%%LOCALBASE%%/bin/perl"

Lines 3-10 share/h2o/annotate-backtrace-symbols Link Here

(-)b/www/h2o/pkg-plist (-1 / +17 lines)
3	share/h2o/fetch-ocsp-response	3	share/h2o/fetch-ocsp-response
4	share/h2o/kill-on-close	4	share/h2o/kill-on-close
5	share/h2o/start_server	5	share/h2o/start_server
		6	%%DATADIR%%/ca-bundle.crt
6	%%DATADIR%%/fastcgi-cgi	7	%%DATADIR%%/fastcgi-cgi
7	%%DATADIR%%/setuidgid	8	%%DATADIR%%/setuidgid
		9	%%DATADIR%%/status/index.html
8	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%	10	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
9	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png	11	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
10	%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png	12	%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
Lines 19-29 share/h2o/start_server Link Here
19	%%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html	21	%%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html
20	%%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html	22	%%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html
21	%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html	23	%%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html
		24	%%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html
22	%%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html	25	%%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html
23	%%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html	26	%%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html
24	%%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html	27	%%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html
25	%%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html	28	%%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html
26	%%PORTDOCS%%%%DOCSDIR%%/configure/gzip_directives.html
27	%%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html	29	%%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html
28	%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html	30	%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
29	%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html	31	%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
Lines 33-39 share/h2o/start_server Link Here
33	%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html	35	%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
34	%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html	36	%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
35	%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html	37	%%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html
		38	%%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html
36	%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html	39	%%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html
		40	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
		41	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
		42	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
		43	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key
		44	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/h2o.conf
		45	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.crt
		46	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.key
		47	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
		48	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
		49	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c
		50	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
		51	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c
		52	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c
37	%%PORTDOCS%%%%DOCSDIR%%/faq.html	53	%%PORTDOCS%%%%DOCSDIR%%/faq.html
38	%%PORTDOCS%%%%DOCSDIR%%/index.html	54	%%PORTDOCS%%%%DOCSDIR%%/index.html
39	%%PORTDOCS%%%%DOCSDIR%%/install.html	55	%%PORTDOCS%%%%DOCSDIR%%/install.html