Index: head/www/varnish6/Makefile
===================================================================
--- head/www/varnish6/Makefile	(revision 500117)
+++ head/www/varnish6/Makefile	(revision 500118)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	varnish
 PORTVERSION=	6.2.0
 DISTVERSIONPREFIX=	varnish-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS=	varnish-2.* varnish-3.* varnish4-4.* varnish5-5.*
 
 USES=		autoreconf cpe gmake libedit libtool ncurses pathfix \
 		pkgconfig python:3.4+,build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/*.py
 CPE_VENDOR=	varnish-cache
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --without-dot
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 TEST_ARGS=	TESTS_PARALLELISM=1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	varnishcache
 GH_PROJECT=	varnish-cache
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
 	${REINPLACE_CMD} -e '/-Wno-unknown-warning-option -Wno-implicit-fallthrough/d' ${WRKSRC}/configure.ac
 .endif
 
 .include <bsd.port.post.mk>
Index: head/www/varnish6/files/varnishd.in
===================================================================
--- head/www/varnish6/files/varnishd.in	(revision 500117)
+++ head/www/varnish6/files/varnishd.in	(revision 500118)
@@ -1,128 +1,128 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: varnishd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable varnishd:
 #
 # varnishd_enable="YES"
 #
 # Configuration variables and their default values:
 #
 # varnishd_pidfile - full path to the PID file.
 #	default: "/var/run/varnishd.pid"
 #
 # varnishd_listen - address and port at which varnishd will listen for
 #	client requests.
 #	default: ":80"
 #
 # varnishd_admin - address and port at which varnishd will listen for
 #	administrative commands.
 #	default: "localhost:81"
 #
 # varnishd_backend - address of the backend server.
 #	default: "localhost:8080"
 #
 # varnishd_config - name of the varnishd config file.
 #	default: unset.
 #
 # varnishd_hash - hash algorithm
 #       default: "critbit"
 #
 # varnishd_storage - storage method and parameters.
 #	default: "file,/tmp,100M"
 #
 # varnishd_jailuser - unprivileged user for the child process.
 #	default: "varnish"
 #
 # varnishd_flags - complete command line arguments.
 #	default if varnishd_config is unset: "-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"
 #	default if varnishd_config is set: "-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"
 #
 # See varnishd(1) for a detailed overview of command-line options.
 #
 
 . /etc/rc.subr
 
 name=varnishd
 rcvar=varnishd_enable
 
 load_rc_config ${name}
 
 : ${varnishd_enable:=NO}
 : ${varnishd_pidfile=/var/run/${name}.pid}
 : ${varnishd_listen=:80}
 : ${varnishd_admin=localhost:81}
 : ${varnishd_backend=localhost:8080}
 : ${varnishd_storage=file,/tmp,100M}
 : ${varnishd_hash=critbit}
 : ${varnishd_jailuser=varnish}
 
 command="%%PREFIX%%/sbin/${name}"
 pidfile="${varnishd_pidfile}"
 configtest_cmd="varnishd_checkconfig"
 reload_cmd="varnishd_reload"
 restart_precmd="varnishd_checkconfig"
 start_precmd="varnishd_precmd"
 extra_commands="status reload configtest"
 
 if [ -n "${varnishd_config}" ] ; then
 	: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
 else
 	: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
 fi
 
 varnishd_checkconfig()
 {
 	if [ -z "${varnishd_config}" ]; then
 		echo "${name}: nothing to check, no configuration file defined, builtin VCL used"
 	else
 		echo "Performing sanity check on ${name} configuration:"
-		if eval ${command} -C -f "${varnishd_config}" 2> /dev/null ; then
+		if eval ${command} ${varnishd_flags} -C -f "${varnishd_config}" 2> /dev/null ; then
 			echo "${name}: the configuration file ${varnishd_config} syntax is ok"
 		else
 			err 1 "${name}: the configuration file ${varnishd_config} syntax is NOT ok"
 		fi
 	fi
 }
 
 # Adapted from work done by Ingvar Hagelund <ingvar@redpill-linpro.com> (see redhat/varnish_reload_vcl)
 varnishd_reload()
 {
 	local _current_config_name _new_config_name _varnishadm_cmd
 
 	if [ -z "${varnishd_config}" ]; then
 		echo "${name}: nothing to reload, no configuration file defined, builtin VCL used"
 	else
 		_new_config_name="reloaded_$(date +%Y%m%d%H%M%S)"
 		_varnishadm_cmd="%%PREFIX%%/bin/varnishadm ${varnish_cli_flags}"
 		if ! eval ${_varnishadm_cmd} vcl.list > /dev/null; then
 			err 1 "${name}: can't connect to varnishadm"
 		fi
 		_current_config_name=$(${_varnishadm_cmd} vcl.list | awk ' /^active/ { print $3 } ')
 		if ! eval ${_varnishadm_cmd} vcl.load ${_new_config_name} ${varnishd_config} > /dev/null; then
 			err 1 "${name}: vcl.load failed, you're still using previous rules (${_current_config_name})"
 		fi
 		if eval ${_varnishadm_cmd} vcl.use ${_new_config_name} > /dev/null; then
 			echo "VCL file \"${varnishd_config}\" has been successfully loaded as \"${_new_config_name}\""
 			echo "To remove previous loaded configurations, you should run \"${_varnishadm_cmd} vcl.discard <configname>\" by yourself"
 		else
 			err 1 "${name}: vcl.use failed, you're still using previous rules (${_current_config_name})"
 		fi
 	fi
 
 	return 0
 }
 
 varnishd_precmd()
 {
 	# Check config before starting
 	varnishd_checkconfig
 }
 
 run_rc_command "$1"
Index: head/www/varnish6/files/varnishncsa.in
===================================================================
--- head/www/varnish6/files/varnishncsa.in	(revision 500117)
+++ head/www/varnish6/files/varnishncsa.in	(revision 500118)
@@ -1,70 +1,80 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: varnishncsa
 # REQUIRE: DAEMON varnishd
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable varnishncsa:
 #
 # varnishncsa_enable="YES"
 #
 # Configuration variables and their default values:
 #
 # varnishncsa_pidfile - full path to the PID file.
 #	default: "/var/run/varnishncsa.pid"
 #
 # varnishncsa_file - full path to the log file.
 #	default: "/var/log/varnishncsa.log"
 #
+# varnishncsa_log_method - log to file or syslog
+#       default: "-D -a -w ${varnishncsa_file}"
+#       varnishncsa_syslog="YES": '| /usr/bin/logger -t varnish -p daemon.info &'
+#
 # varnishncsa_flags - command line arguments.
-#	default: "-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"
+#	default: "-t off -P ${varnishncsa_pidfile} ${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"} ${varnishncsa_log_method}"
 #
 # varnishncsa_logformat - log file format.
 #       default: "" (uses varnishncsa's default format)
 #       example: "%h %l %u %t %r %s %b %{Referer}i %{User-agent}i"
 #
 # Add the following line to /etc/newsyslog.conf to rotate the log file
 # once a day:
 #
 # /var/log/varnishncsa.log varnishlog:varnish 640 7 * @T00 JB /var/run/varnishncsa.pid
 #
 # See varnishncsa(1) for a detailed overview of command-line options.
 #
 
 . /etc/rc.subr
 
 name=varnishncsa
 rcvar=varnishncsa_enable
 
 load_rc_config ${name}
 
 : ${varnishncsa_enable:=NO}
 : ${varnishncsa_pidfile=/var/run/${name}.pid}
 : ${varnishncsa_file=/var/log/${name}.log}
-: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"}
+: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"}
+: ${varnishncsa_syslog:=NO}
 
-procname="%%PREFIX%%/bin/${name}"
-command="/usr/sbin/daemon"
-command_args="-f -u varnishlog ${procname} ${varnishncsa_flags}"
+if checkyesno varnishncsa_syslog; then
+    varnishncsa_log_method='| /usr/bin/logger -t varnish -p daemon.info &'
+else
+    varnishncsa_log_method="-D -a -w ${varnishncsa_file}"
+fi
+
+command="%%PREFIX%%/bin/${name}"
+command_args="${varnishncsa_flags} ${varnishncsa_log_method}"
 pidfile=${varnishncsa_pidfile}
 start_precmd=precmd
 
 precmd()
 {
         # $varnishncsa_flags gets applied too early if we don't do this.
         rc_flags=""
 
 	if [ ! -e ${pidfile} ]; then
 		install -o varnishlog -g varnish -m 644 /dev/null ${pidfile};
 	fi
 
 	if [ ! -e ${varnishncsa_file} ]; then
 		install -o varnishlog -g varnish -m 640 /dev/null ${varnishncsa_file};
 	fi
 }
 
 run_rc_command "$1"