From e93b9fa8f1001f07f78d43c1522e56bd843d61df Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 18 May 2011 14:47:55 +0000 Subject: [PATCH] Add daemon_flags support to squid.rc. From Marcus MERIGHI. ok Brad (maintainer), dcoppa@, aja@ --- www/squid/Makefile | 4 ++-- www/squid/pkg/squid.rc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index 3159922ed4e..a2f244fcea3 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.117 2011/04/14 08:11:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.118 2011/05/18 14:47:55 sthen Exp $ COMMENT= WWW and FTP proxy cache and accelerator DISTNAME= squid-2.7.STABLE9 -REVISION= 8 +REVISION= 9 CATEGORIES= www MASTER_SITES= ${HOMEPAGE}/Versions/v2/2.7/ DIST_SUBDIR= squid diff --git a/www/squid/pkg/squid.rc b/www/squid/pkg/squid.rc index 7f186cbdcd8..19a5a320da7 100644 --- a/www/squid/pkg/squid.rc +++ b/www/squid/pkg/squid.rc @@ -1,17 +1,17 @@ #!/bin/sh # -# $OpenBSD: squid.rc,v 1.4 2010/12/27 14:50:24 ajacoutot Exp $ +# $OpenBSD: squid.rc,v 1.5 2011/05/18 14:47:55 sthen Exp $ daemon="${TRUEPREFIX}/sbin/squid" . /etc/rc.d/rc.subr rc_stop() { - ${daemon} -k shutdown + ${daemon} ${daemon_flags} -k shutdown } rc_reload() { - ${daemon} -k reconfigure + ${daemon} ${daemon_flags} -k reconfigure } rc_cmd $1