diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2012-11-18 16:33:31 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2012-11-18 16:33:31 +0000 |
| commit | f81193cbbfbd47aa2604b8031b0f7f599445ac20 (patch) | |
| tree | 1ffb9d9fff08f721f8e673e137d247bc6e798adc /www/squid32 | |
| parent | 36ecb8f48195ff40a7717440c1b733cfc18f1ed9 (diff) | |
| download | ports-f81193cbbfbd47aa2604b8031b0f7f599445ac20.tar.gz ports-f81193cbbfbd47aa2604b8031b0f7f599445ac20.zip | |
Fix rc.d script to support systems before and after ${name}_fib is introduced
into rc.subr. Bump PORTREVISION.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307542
Diffstat (limited to 'www/squid32')
| -rw-r--r-- | www/squid32/Makefile | 2 | ||||
| -rw-r--r-- | www/squid32/files/squid.in | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/www/squid32/Makefile b/www/squid32/Makefile index 73a338a10959..93ca7846e39e 100644 --- a/www/squid32/Makefile +++ b/www/squid32/Makefile @@ -37,7 +37,7 @@ PORTNAME= squid PORTVERSION= 3.2.${SQUID_STABLE_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ diff --git a/www/squid32/files/squid.in b/www/squid32/files/squid.in index 6565dfcbcc45..aff0418b0003 100644 --- a/www/squid32/files/squid.in +++ b/www/squid32/files/squid.in @@ -50,7 +50,6 @@ load_rc_config ${name} : ${squid_chdir:=/var/squid} : ${squid_conf:=%%PREFIX%%/etc/squid/squid.conf} : ${squid_enable:=NO} -: ${squid_fib:=NONE} : ${squid_pidfile:=/var/run/squid/squid.pid} : ${squid_user:=squid} @@ -77,7 +76,13 @@ command_args="-f ${squid_conf}" squid_setfib() { - sysctl net.fibs >/dev/null 2>&1 || return 0 + if command -v check_namevarlist > /dev/null 2>&1; then + check_namevarlist fib && return 0 + fi + + ${SYSCTL} net.fibs >/dev/null 2>&1 || return 0 + + squid_fib=${squid_fib:-"NONE"} if [ "x${squid_fib}" != "xNONE" ]; then command="setfib -F ${squid_fib} ${command}" else |