From d0f74c0d65bd1782193ce919f90113890c39b754 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Wed, 1 Jul 2015 16:05:40 -0500
Subject: [PATCH] www/varnish4: update patch to new port version and move port

---
 ...w_varnish4_add_name_var_to_rcscripts.patch | 51 +++++++++++++++++++
 ...ww_varnish_add_name_var_to_rcscripts.patch | 51 -------------------
 2 files changed, 51 insertions(+), 51 deletions(-)
 create mode 100644 cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch
 delete mode 100644 cdn/patch/www_varnish_add_name_var_to_rcscripts.patch

diff --git a/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch b/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch
new file mode 100644
index 0000000..2fe0586
--- /dev/null
+++ b/cdn/patch/www_varnish4_add_name_var_to_rcscripts.patch
@@ -0,0 +1,51 @@
+--- www/varnish4/files/varnishd.in	2015-05-27 09:34:42.000000000 -0500
++++ www/varnish4/files/varnishd.in	2015-07-01 16:00:16.999280135 -0500
+@@ -43,9 +43,12 @@
+ # varnishd_group - unprivileged group for the child process.
+ #	default: "www"
+ #
++# varnishd_name - name used to construct instance directory.
++#	default: unset
++#
+ # varnishd_flags - complete command line arguments.
+-#	default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
+-#	default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
++#	default if varnishd_config is unset: "${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
++#	default if varnishd_config is set: "${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
+ #
+ # See varnishd(1) for a detailed overview of command-line options.
+ #
+@@ -71,9 +74,9 @@
+ pidfile="${varnishd_pidfile}"
+ 
+ if [ -n "${varnishd_config}" ] ; then
+-	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
++	: ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
+ else
+-	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
++	: ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
+ fi
+ 
+ # If we leave these set, rc.subr will su to them before starting
+--- www/varnish4/files/varnishlog.in	2015-05-27 09:34:42.000000000 -0500
++++ www/varnish4/files/varnishlog.in	2015-07-01 16:00:40.378278329 -0500
+@@ -40,7 +40,7 @@
+ : ${varnishlog_enable:=NO}
+ : ${varnishlog_pidfile=/var/run/${name}.pid}
+ : ${varnishlog_file=/var/log/varnish.log}
+-: ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
++: ${varnishlog_flags="${varnishd_name:+-n ${varnishd_name}} -P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
+ 
+ command="%%PREFIX%%/bin/${name}"
+ pidfile=${varnishlog_pidfile}
+--- www/varnish4/files/varnishncsa.in	2015-05-27 09:34:42.000000000 -0500
++++ www/varnish4/files/varnishncsa.in	2015-07-01 16:01:02.508547544 -0500
+@@ -45,7 +45,7 @@
+ : ${varnishncsa_enable:=NO}
+ : ${varnishncsa_pidfile=/var/run/${name}.pid}
+ : ${varnishncsa_file=/var/log/${name}.log}
+-: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
++: ${varnishncsa_flags="${varnishd_name:+-n ${varnishd_name}} -P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
+ 
+ command="%%PREFIX%%/bin/${name}"
+ pidfile=${varnishncsa_pidfile}
diff --git a/cdn/patch/www_varnish_add_name_var_to_rcscripts.patch b/cdn/patch/www_varnish_add_name_var_to_rcscripts.patch
deleted file mode 100644
index fd1ba26..0000000
--- a/cdn/patch/www_varnish_add_name_var_to_rcscripts.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- www/varnish/files/varnishd.in.orig	2013-03-17 05:27:58.000000000 +0000
-+++ www/varnish/files/varnishd.in	2013-03-17 05:29:25.000000000 +0000
-@@ -43,9 +43,12 @@
- # varnishd_group - unprivileged group for the child process.
- #	default: "www"
- #
-+# varnishd_name - name used to construct instance directory.
-+#       default: unset.
-+#
- # varnishd_flags - complete command line arguments.
--#	default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
--#	default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
-+#	default if varnishd_config is unset: "-n ${varnishd_name} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
-+#	default if varnishd_config is set: "-n ${varnishd_name} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
- #
- # See varnishd(1) for a detailed overview of command-line options.
- #
-@@ -69,9 +72,9 @@
- : ${varnishd_user:="www"}
- : ${varnishd_group:="www"}
- if [ -n "${varnishd_config}" ] ; then
--	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"}
-+	: ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"}
- else
--	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"}
-+	: ${varnishd_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"}
- fi
- 
- # If we leave these set, rc.subr will su to them before starting
---- www/varnish/files/varnishlog.in.orig	2013-03-17 05:30:37.000000000 +0000
-+++ www/varnish/files/varnishlog.in	2013-03-17 05:31:22.000000000 +0000
-@@ -43,7 +43,7 @@
- : ${varnishlog_enable:="NO"}
- : ${varnishlog_pidfile:="/var/run/${name}.pid"}
- : ${varnishlog_file:="/var/log/varnish.log"}
--: ${varnishlog_flags:="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
-+: ${varnishlog_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
- 
- pidfile=${varnishlog_pidfile}
- run_rc_command "$1"
---- www/varnish/files/varnishncsa.in.orig	2015-03-23 11:27:36.000000000 -0500
-+++ www/varnish/files/varnishncsa.in	2015-04-03 20:03:09.815688893 -0500
-@@ -48,7 +48,7 @@
- : ${varnishncsa_pidfile:="/var/run/${name}.pid"}
- : ${varnishncsa_file:="/var/log/${name}.log"}
- : ${varnishncsa_logformat:=""}
--: ${varnishncsa_flags:="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
-+: ${varnishncsa_flags:="${varnishd_name:+-n ${varnishd_name}} -P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
- 
- pidfile=${varnishncsa_pidfile}
- run_rc_command "$1"
-- 
2.42.0