svn commit: r344293 - head/www/varnish

[Mathieu Arnold]

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
+ at 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
+ at 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