Index: head/devel/fossil/Makefile =================================================================== --- head/devel/fossil/Makefile (revision 473019) +++ head/devel/fossil/Makefile (revision 473020) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= fossil PORTVERSION= 2.6 -PORTREVISION= 0 DISTVERSIONPREFIX= src- +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= http://fossil-scm.org/index.html/uv/ MAINTAINER= gahr@FreeBSD.org COMMENT= DSCM with built-in wiki, http interface and server, tickets database LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT-BSD2.txt WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= ssl HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} USE_RC_SUBR= fossil MAKE_JOBS_UNSAFE=yes PLIST_FILES= bin/fossil OPTIONS_DEFINE= JSON FUSE STATIC TH1HOOKS TCL OPTIONS_DEFAULT=JSON JSON_DESC= JSON API support FUSE_DESC= Enable fossil fusefs command TH1HOOKS_DESC= Enable TH1 command and web page hooks TCL_DESC= Enable Tcl integration JSON_CONFIGURE_ON= --json STATIC_CONFIGURE_ON= --static FUSE_CONFIGURE_OFF= --disable-fusefs TH1HOOKS_CONFIGURE_ON= --with-th1-hooks TCL_CONFIGURE_ON= --with-tcl-stubs --with-tcl=${TCL_LIBDIR} TCL_USES= tcl TCL_CFLAGS= -DTCL_LIBRARY_NAME=\\\"libtcl${TCL_SHLIB_VER}.so\\\" \ -DTCL_MINOR_OFFSET=7 FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs FUSE_USES= localbase:ldflags post-patch-FUSE-on: @${REINPLACE_CMD} -e 's/define-append LIBS -lfuse/& -pthread/' ${WRKSRC}/auto.def post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fossil .include Index: head/devel/fossil/files/fossil.in =================================================================== --- head/devel/fossil/files/fossil.in (revision 473019) +++ head/devel/fossil/files/fossil.in (revision 473020) @@ -1,72 +1,77 @@ #!/bin/sh # $FreeBSD$ # # fossil startup script # # PROVIDE: fossil # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service # # fossil_enable="YES" # # You can fine tune others variables too: # fossil_port="8080" # fossil_directory="/nonexistent" # 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 . /etc/rc.subr name="fossil" rcvar=fossil_enable load_rc_config $name pidprefix="/var/run/fossil/fossil" pidfile="${pidprefix}.pid" procname="%%PREFIX%%/bin/fossil" command="/usr/sbin/daemon" start_precmd="fossil_precmd" stop_postcmd="fossil_postcmd" fossil_enable=${fossil_enable:-"NO"} fossil_user=${fossil_user:-"nobody"} fossil_port=${fossil_port:-"8080"} fossil_proto=${fossil_proto:-"http"} 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" +[ -n "${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}" fossil_precmd() { install -d -o root -g wheel -m 1777 /var/run/fossil } fossil_postcmd() { rm -rf /var/run/fossil } run_rc_command "$1"