Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Feb 2014 03:31:24 +0800
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        Mathieu Arnold <mat@freebsd.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers <ports-committers@freebsd.org>
Subject:   Re: svn commit: r344293 - head/www/varnish
Message-ID:  <CAMHz58Skd6co4-R=Q26bYhGD5VE6%2BYw_S-mkcmhAOkOJOzysvQ@mail.gmail.com>
In-Reply-To: <201402141809.s1EI9Mvs063057@svn.freebsd.org>
References:  <201402141809.s1EI9Mvs063057@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Feb 15, 2014 at 2:09 AM, Mathieu Arnold <mat@freebsd.org> 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 <bsd.port.pre.mk>
>
>
> 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?



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58Skd6co4-R=Q26bYhGD5VE6%2BYw_S-mkcmhAOkOJOzysvQ>