Date: Thu, 13 Nov 2008 13:19:34 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/128838: [PATCH] www/varnish 2.0.1 enhancements Message-ID: <20081113121934.6CADA4ADB1@mail.vx.sk> Resent-Message-ID: <200811131220.mADCK04f082933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 128838
>Category: ports
>Synopsis: [PATCH] www/varnish 2.0.1 enhancements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 13 12:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 7.1-PRERELEASE i386/amd64
>Organization:
>Environment:
FreeBSD 7.1-PRERELEASE i386/amd64
>Description:
- Fix handling of default configuration file and ${PREFIX}/etc/varnish
- files/varnishd.in: introduce varnishd_extraflags so users can specify additional flags (e.g. default_ttl, user, group) without touching original varnishd_flags
>How-To-Repeat:
>Fix:
Index: ports/www/varnish/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/varnish/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ports/www/varnish/Makefile 3 Nov 2008 11:34:58 -0000 1.22
+++ ports/www/varnish/Makefile 13 Nov 2008 12:18:34 -0000
@@ -7,7 +7,7 @@
PORTNAME= varnish
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF
@@ -36,6 +36,7 @@
post-install:
${MKDIR} ${PREFIX}/etc/varnish
+ ${INSTALL_DATA} ${WRKSRC}/etc/default.vcl ${PREFIX}/etc/varnish/default.vcl.sample
@[ -f ${PREFIX}/etc/varnish/default.vcl ] || \
${INSTALL_DATA} ${WRKSRC}/etc/default.vcl ${PREFIX}/etc/varnish/
Index: ports/www/varnish/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/varnish/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- ports/www/varnish/pkg-plist 20 Oct 2008 09:12:57 -0000 1.11
+++ ports/www/varnish/pkg-plist 13 Nov 2008 12:18:34 -0000
@@ -6,7 +6,8 @@
bin/varnishstat
bin/varnishtest
bin/varnishtop
-etc/varnish/default.vcl
+@unexec if cmp -s %D/etc/varnish/default.vcl %D/etc/varnish/default.vcl.sample; then rm -f %D/etc/varnish/default.vcl; fi
+etc/varnish/default.vcl.sample
include/varnish/shmlog.h
include/varnish/shmlog_tags.h
include/varnish/stat_field.h
@@ -33,4 +34,4 @@
@exec mkdir %D/varnish
@dirrmtry varnish
@dirrm include/varnish
-@dirrm etc/varnish
+@dirrmtry etc/varnish
Index: ports/www/varnish/files/varnishd.in
===================================================================
RCS file: /home/pcvs/ports/www/varnish/files/varnishd.in,v
retrieving revision 1.5
diff -u -r1.5 varnishd.in
--- ports/www/varnish/files/varnishd.in 3 Nov 2008 11:34:58 -0000 1.5
+++ ports/www/varnish/files/varnishd.in 13 Nov 2008 12:18:34 -0000
@@ -18,7 +18,8 @@
#varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"
#varnishd_telnet="localhost:6082"
#varnishd_storage="file,/tmp,50%"
-#varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"
+#varnishd_extraflags=""
+#varnishd_flags="-P ${pidfile} -a \"${varnishd_listen}\" -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage} ${varnishd_extraflags}"
#
# See varnishd(1) for a detailed overview of command-line options.
#
@@ -38,6 +39,7 @@
: ${varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"}
: ${varnishd_telnet="localhost:6082"}
: ${varnishd_storage="file,/tmp,50%"}
-: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"}
+: ${varnishd_extraflags=""}
+: ${varnishd_flags="-P ${pidfile} -a \"${varnishd_listen}\" -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage} ${varnishd_extraflags}"}
run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081113121934.6CADA4ADB1>