From mm@mail.vx.sk  Thu Nov 13 12:19:38 2008
Return-Path: <mm@mail.vx.sk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C1962106567C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Nov 2008 12:19:38 +0000 (UTC)
	(envelope-from mm@mail.vx.sk)
Received: from mail.vx.sk (neo.vx.sk [194.160.65.240])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F3178FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Nov 2008 12:19:38 +0000 (UTC)
	(envelope-from mm@mail.vx.sk)
Received: from localhost (localhost [127.0.0.1])
	by mail.vx.sk (Postfix) with ESMTP id B8C954AE63
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Nov 2008 13:19:36 +0100 (CET)
Received: from mail.vx.sk ([127.0.0.1])
	by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id UwVDW+G5OjGo for <FreeBSD-gnats-submit@freebsd.org>;
	Thu, 13 Nov 2008 13:19:34 +0100 (CET)
Received: by mail.vx.sk (Postfix, from userid 1001)
	id 6CADA4ADB1; Thu, 13 Nov 2008 13:19:34 +0100 (CET)
Message-Id: <20081113121934.6CADA4ADB1@mail.vx.sk>
Date: Thu, 13 Nov 2008 13:19:34 +0100 (CET)
From: Martin Matuska <mm@FreeBSD.org>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] www/varnish 2.0.1 enhancements
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         128838
>Category:       ports
>Synopsis:       [PATCH] www/varnish 2.0.1 enhancements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    des
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 13 12:20:00 UTC 2008
>Closed-Date:    Tue Mar 23 12:31:34 UTC 2010
>Last-Modified:  Tue Mar 23 12:31:34 UTC 2010
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->des 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 13 12:20:10 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128838 

From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/128838: [PATCH] www/varnish 2.0.1 enhancements
Date: Fri, 14 Nov 2008 14:00:02 +0100

 default.vcl is just a copy of the built-in default configuration; it is
 not intended to be used, whether by default or otherwise.  The default
 configuration file is ${HOSTNAME}.vcl.
 
 DES
 --=20
 Dag-Erling Sm=C3=B8rgrav - des@des.no
State-Changed-From-To: open->closed 
State-Changed-By: mm 
State-Changed-When: Tue Mar 23 12:31:33 UTC 2010 
State-Changed-Why:  
Closed on submitter request (me). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128838 
>Unformatted:
