From owner-svn-ports-head@FreeBSD.ORG Fri Feb 14 18:09:23 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D92BA77; Fri, 14 Feb 2014 18:09:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0800F15E5; Fri, 14 Feb 2014 18:09:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EI9Mat063059; Fri, 14 Feb 2014 18:09:22 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EI9Mvs063057; Fri, 14 Feb 2014 18:09:22 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402141809.s1EI9Mvs063057@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 14 Feb 2014 18:09:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344293 - head/www/varnish X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 18:09:23 -0000 Author: mat Date: Fri Feb 14 18:09:22 2014 New Revision: 344293 URL: http://svnweb.freebsd.org/changeset/ports/344293 QAT: https://qat.redports.org/buildarchive/r344293/ Log: Even if it is stupid, people will modify the default.vcl file, so, treat it as a normal configuration file and install it as .sample. While there, remove a remnant of STAGE conversion. Sponsored by: Absolight Modified: head/www/varnish/Makefile head/www/varnish/pkg-plist Modified: head/www/varnish/Makefile ============================================================================== --- head/www/varnish/Makefile Fri Feb 14 18:03:21 2014 (r344292) +++ head/www/varnish/Makefile Fri Feb 14 18:09:22 2014 (r344293) @@ -61,8 +61,8 @@ post-install: .for f in vct.h vmod_abi.h vre.h vrt.h vqueue.h vsb.h libvarnish.h miniobj.h vas.h vav.h http_headers.h vcl_returns.h ${INSTALL_DATA} ${WRKSRC}/include/${f} ${STAGEDIR}${PREFIX}/include/varnish .endfor - @${CAT} ${PKGMESSAGE} @${RM} -f ${STAGEDIR}${PREFIX}/lib/libvarnishapi.*a ${STAGEDIR}${PREFIX}/lib/varnish/lib*a ${STAGEDIR}${PREFIX}/lib/varnish/vmods/lib*a + @${MV} ${STAGEDIR}${ETCDIR}/default.vcl ${STAGEDIR}${ETCDIR}/default.vcl.sample .include Modified: head/www/varnish/pkg-plist ============================================================================== --- head/www/varnish/pkg-plist Fri Feb 14 18:03:21 2014 (r344292) +++ head/www/varnish/pkg-plist Fri Feb 14 18:09:22 2014 (r344293) @@ -7,7 +7,9 @@ bin/varnishsizes bin/varnishstat bin/varnishtest bin/varnishtop -etc/varnish/default.vcl +@unexec if cmp -s %D/etc/varnish/default.vcl.sample %D/etc/varnish/default.vcl; then rm -f %D/etc/varnish/default.vcl; fi +etc/varnish/default.vcl.sample +@exec if [ ! -f %D/etc/varnish/default.vcl ] ; then cp -p %D/%F %B/default.vcl; fi include/varnish/acct_fields.h include/varnish/body_status.h include/varnish/cache.h