Revert the addition of varnishd_user and varnishd_group. They are magic

to rc.subr.  While we're here, s/Id/FreeBSD/ in all three rc scripts.

8 files changed, 12 insertions, 18 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index bc7d888d5b14..40d0389e967f 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
diff --git a/www/varnish/files/varnishd.in b/www/varnish/files/varnishd.in
index e283839e5fae..fcbf3bd3f012 100644
--- a/www/varnish/files/varnishd.in
+++ b/www/varnish/files/varnishd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: varnishd
@@ -18,9 +18,7 @@
 #varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"
 #varnishd_telnet="localhost:6082"
 #varnishd_storage="file,/tmp,50%"
-#varnishd_user="www"
-#varnishd_group="www"
-#varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"
+#varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"
 #
 # See varnishd(1) for a detailed overview of command-line options.
 #
@@ -40,8 +38,6 @@ load_rc_config ${name}
 : ${varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"}
 : ${varnishd_telnet="localhost:6082"}
 : ${varnishd_storage="file,/tmp,50%"}
-: ${varnishd_user="www"}
-: ${varnishd_group="www"}
-: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"}
+: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"}
 
 run_rc_command "$1"
diff --git a/www/varnish/files/varnishlog.in b/www/varnish/files/varnishlog.in
index 3c06c610f7bb..7d07528e7b52 100644
--- a/www/varnish/files/varnishlog.in
+++ b/www/varnish/files/varnishlog.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: varnishlog
diff --git a/www/varnish/files/varnishncsa.in b/www/varnish/files/varnishncsa.in
index 25c4bd4fa12e..46b113f50e4c 100644
--- a/www/varnish/files/varnishncsa.in
+++ b/www/varnish/files/varnishncsa.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: varnishncsa
diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile
index bc7d888d5b14..40d0389e967f 100644
--- a/www/varnish2/Makefile
+++ b/www/varnish2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
diff --git a/www/varnish2/files/varnishd.in b/www/varnish2/files/varnishd.in
index e283839e5fae..fcbf3bd3f012 100644
--- a/www/varnish2/files/varnishd.in
+++ b/www/varnish2/files/varnishd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: varnishd
@@ -18,9 +18,7 @@
 #varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"
 #varnishd_telnet="localhost:6082"
 #varnishd_storage="file,/tmp,50%"
-#varnishd_user="www"
-#varnishd_group="www"
-#varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"
+#varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"
 #
 # See varnishd(1) for a detailed overview of command-line options.
 #
@@ -40,8 +38,6 @@ load_rc_config ${name}
 : ${varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"}
 : ${varnishd_telnet="localhost:6082"}
 : ${varnishd_storage="file,/tmp,50%"}
-: ${varnishd_user="www"}
-: ${varnishd_group="www"}
-: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"}
+: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"}
 
 run_rc_command "$1"
diff --git a/www/varnish2/files/varnishlog.in b/www/varnish2/files/varnishlog.in
index 3c06c610f7bb..7d07528e7b52 100644
--- a/www/varnish2/files/varnishlog.in
+++ b/www/varnish2/files/varnishlog.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: varnishlog
diff --git a/www/varnish2/files/varnishncsa.in b/www/varnish2/files/varnishncsa.in
index 25c4bd4fa12e..46b113f50e4c 100644
--- a/www/varnish2/files/varnishncsa.in
+++ b/www/varnish2/files/varnishncsa.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 #
 
 # PROVIDE: varnishncsa