From 99b4cad1db3555019310b04a05385f64dabb5301 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Fri, 29 Aug 2014 11:13:46 +0000
Subject: Get "/etc/rc.d/squid status" and "/etc/rc.d/squid restart" to work
 again under NetBSD (and other platforms using "/etc/rc.subr"?).

Bump package revision because of this fix.
---
 www/squid3/Makefile       | 3 ++-
 www/squid3/files/squid.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'www')

diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 09bae67960c..574087096cd 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2014/08/28 16:52:02 adam Exp $
+# $NetBSD: Makefile,v 1.36 2014/08/29 11:13:46 tron Exp $
 
 DISTNAME=	squid-3.4.7
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
 		ftp://ftp.squid-cache.org/pub/squid/ \
diff --git a/www/squid3/files/squid.sh b/www/squid3/files/squid.sh
index 51374f09a53..e3d5ff7d0c5 100644
--- a/www/squid3/files/squid.sh
+++ b/www/squid3/files/squid.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: squid.sh,v 1.1 2013/12/10 14:48:26 adam Exp $
+# $NetBSD: squid.sh,v 1.2 2014/08/29 11:13:46 tron Exp $
 #
 # PROVIDE: squid
 # REQUIRE: DAEMON
@@ -16,12 +16,12 @@ name="squid"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
+procname="squid-1"
 required_files="${squid_conf} @PKG_SYSCONFDIR@/mime.conf"
 command_args="-Y -f ${squid_conf}"
 
 start_precmd='ulimit -n 4096'
 # Note: 'shutdown' waits 30 seconds, while 'interrupt' stops immediately
-stop_cmd="${command} ${squid_flags} ${command_args} -k interrupt"
 reload_cmd="${command} ${squid_flags} ${command_args} -k reconfigure"
 rotate_cmd="${command} ${squid_flags} ${command_args} -k rotate"
 createdirs_cmd="${command} ${squid_flags} ${command_args} -z"
-- 
cgit v1.2.3