From owner-svn-ports-all@freebsd.org  Sun Apr  9 18:29:06 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD161D36E78;
 Sun,  9 Apr 2017 18:29:06 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F1E8DF8;
 Sun,  9 Apr 2017 18:29:06 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v39IT5Pa075475;
 Sun, 9 Apr 2017 18:29:05 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v39IT56F075473;
 Sun, 9 Apr 2017 18:29:05 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201704091829.v39IT56F075473@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 9 Apr 2017 18:29:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r438113 - in head/www/varnish5: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Apr 2017 18:29:06 -0000

Author: feld
Date: Sun Apr  9 18:29:05 2017
New Revision: 438113
URL: https://svnweb.freebsd.org/changeset/ports/438113

Log:
  www/varnish5: Fix rc script reload functionality
  
  VCL names can only use characters [A-Za-z0-9_]
  
  MFH:		2017Q2

Modified:
  head/www/varnish5/Makefile
  head/www/varnish5/files/varnishd.in

Modified: head/www/varnish5/Makefile
==============================================================================
--- head/www/varnish5/Makefile	Sun Apr  9 18:20:34 2017	(r438112)
+++ head/www/varnish5/Makefile	Sun Apr  9 18:29:05 2017	(r438113)
@@ -2,7 +2,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	5.1.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 PKGNAMESUFFIX=	5

Modified: head/www/varnish5/files/varnishd.in
==============================================================================
--- head/www/varnish5/files/varnishd.in	Sun Apr  9 18:20:34 2017	(r438112)
+++ head/www/varnish5/files/varnishd.in	Sun Apr  9 18:29:05 2017	(r438113)
@@ -99,7 +99,7 @@ varnishd_reload()
 	if [ -z "${varnishd_config}" ]; then
 		echo "${name}: nothing to reload, no configuration file defined, builtin VCL used"
 	else
-		_new_config_name="rc.d_reloaded@$(date +%Y%m%d%H%M%S)"
+		_new_config_name="reloaded_$(date +%Y%m%d%H%M%S)"
 		_varnishadm_cmd="%%PREFIX%%/bin/varnishadm ${varnish_cli_flags}"
 		if ! eval ${_varnishadm_cmd} vcl.list > /dev/null; then
 			err 1 "${name}: can't connect to varnishadm"