Index: Makefile =================================================================== --- Makefile (revision 472974) +++ Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= fossil PORTVERSION= 2.6 -PORTREVISION= 0 +PORTREVISION= 1 DISTVERSIONPREFIX= src- PORTEPOCH= 2 CATEGORIES= devel www Index: files/fossil.in =================================================================== --- files/fossil.in (revision 472974) +++ files/fossil.in (working copy) @@ -18,6 +18,7 @@ # fossil_baseurl="" # fossil_proto="http" # fossil_listenall="" +# fossil_https="" # force the HTTPS CGI parameter to "on" # fossil_files="" # comma separated globing patterns of files to serve # fossil_notfound="" # URI to redirect to in case of 404 # Use fossil_user to run fossil as user @@ -42,20 +43,24 @@ fossil_directory=${fossil_directory:-"/nonexistent"} case "${fossil_proto}" in -http);; -scgi) fossil_args="--scgi" ;; -*) +http) + # http is the default + ;; +scgi) + fossil_args="--scgi" + ;; +*) echo "unsupported protocol: ${fossil_proto}, only scgi and http are supported" >&2 - exit 1 ;; esac -[ -n "${fossil_baseurl}" ] && fossil_args="${fossil_args} --baseurl ${fossil_baseurl}" +[ -n "${fossil_baseurl}" ] && fossil_args="${fossil_args} --baseurl ${fossil_baseurl}" [ -z "${fossil_listenall}" ] && fossil_args="${fossil_args} --localhost" -[ -n "${fossil_files}" ] && fossil_args="${fossil_args} --files '${fossil_files}'" -[ -n "${fossil_notfound}" ] && fossil_args="${fossil_args} --notfound \"${fossil_notfound}\"" -[ -n "${fossil_repolist}" ] && fossil_args="${fossil_args} --repolist" +[ -z "${fossil_https}" ] && fossil_args="${fossil_args} --https" +[ -n "${fossil_files}" ] && fossil_args="${fossil_args} --files '${fossil_files}'" +[ -n "${fossil_notfound}" ] && fossil_args="${fossil_args} --notfound \"${fossil_notfound}\"" +[ -n "${fossil_repolist}" ] && fossil_args="${fossil_args} --repolist" command_args="-f -p ${pidfile} ${procname} server -P ${fossil_port} ${fossil_args} ${fossil_directory}"