From owner-svn-ports-all@FreeBSD.ORG Fri Feb 14 19:31:52 2014 Return-Path: Delivered-To: svn-ports-all@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 92715EF0 for ; Fri, 14 Feb 2014 19:31:52 +0000 (UTC) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 081631D8E for ; Fri, 14 Feb 2014 19:31:51 +0000 (UTC) Received: by mail-lb0-f180.google.com with SMTP id n15so9540691lbi.39 for ; Fri, 14 Feb 2014 11:31:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=U+SHEO3eHGwnTpR039Z7p8yKOilvS/BZKwYQuQ3o2QM=; b=CJhNndFRJuacwEqi7TNFTB6yPvKZ397aYgJF1T70utpZ1rtoyQMqm6VGF0watEFnez imec6VUfr4cljJHj9ZaAykc21KSBa3hRV9vaaZbTR/iFcjGkSPKVzzAasAhtL5t3IQVV W6CvWM3qihnnwPBTYIAk8yAWDZrYV7Oog7XdSpTeejt+ujPHVhjSIb21GUu68q4v0fAi mYw/3QpkGPX+kB+g2RLta4HFg0tjdO45c2aIFWIZGaP9viW47uDCGnNiwwcx3e9KPkOp y6wggFhd8UOu9iRsTsrsTFwsZpGTyJOafa0LrIertlOTZgjNWoEf8nyDLKrOFYN4c2cc sIAA== X-Gm-Message-State: ALoCoQkPELRSWtPBPo948WxsxRgnpGW2VOcn8Af5Bih74MY2xY4qlVNmknZP3YG5pzoBFvzNsbXX X-Received: by 10.152.242.131 with SMTP id wq3mr6763476lac.12.1392406304441; Fri, 14 Feb 2014 11:31:44 -0800 (PST) MIME-Version: 1.0 Sender: sunpoet@sunpoet.net Received: by 10.112.2.200 with HTTP; Fri, 14 Feb 2014 11:31:24 -0800 (PST) In-Reply-To: <201402141809.s1EI9Mvs063057@svn.freebsd.org> References: <201402141809.s1EI9Mvs063057@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 15 Feb 2014 03:31:24 +0800 X-Google-Sender-Auth: VfRKz2r5mIxwotOAINJP1KCS5gk Message-ID: Subject: Re: svn commit: r344293 - head/www/varnish To: Mathieu Arnold Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 19:31:52 -0000 On Sat, Feb 15, 2014 at 2:09 AM, Mathieu Arnold wrote: > 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 > Bump PORTREVISION for package change?