ports/160342: [Maintainer] www/squid31: update to 3.1.15

[Thomas-Martin Seck]

>Number:         160342
>Category:       ports
>Synopsis:       [Maintainer] www/squid31: update to 3.1.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 31 18:30:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of August 31, 2011.

	
>Description:
- update to 3.1.15 + vendor patch 10373
- fix ports/156737
- portlintify
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid31)	(Revision 1943)
+++ Makefile	(.../local/squid31)	(Revision 1943)
@@ -81,14 +81,17 @@
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v3/3.1/changesets
-PATCHFILES=	# empty
+PATCHFILES=	squid-3.1-10373.patch
 
 MAINTAINER=	tmseck at web.de
 COMMENT=	HTTP Caching Proxy
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LATEST_LINK=	squid31
 
-SQUID_STABLE_VER=	14
+SQUID_STABLE_VER=	15
 
 CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
 GNU_CONFIGURE=	yes
@@ -96,9 +99,6 @@
 USE_PERL5=	yes
 USE_RC_SUBR=	squid
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 SQUID_UID?=	squid
 SQUID_GID?=	squid
 
Index: distinfo
===================================================================
--- distinfo	(.../www/squid31)	(Revision 1943)
+++ distinfo	(.../local/squid31)	(Revision 1943)
@@ -1,2 +1,4 @@
-SHA256 (squid3.1/squid-3.1.14.tar.bz2) = 8faf16d73ae44029e698160386c45ab853f2fc842601bd550a1c5461815d8a3e
-SIZE (squid3.1/squid-3.1.14.tar.bz2) = 2510694
+SHA256 (squid3.1/squid-3.1.15.tar.bz2) = 1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35
+SIZE (squid3.1/squid-3.1.15.tar.bz2) = 2510536
+SHA256 (squid3.1/squid-3.1-10373.patch) = 42e64e6a4df593fee927f9849d6853dd45d68d449da93afaad523295894c2ebf
+SIZE (squid3.1/squid-3.1-10373.patch) = 1326
Index: files/squid.in
===================================================================
--- files/squid.in	(.../www/squid31)	(Revision 1943)
+++ files/squid.in	(.../local/squid31)	(Revision 1943)
@@ -41,7 +41,7 @@
 #
 
 squid_checkrunning() {
-	${command} ${squid_flags} -k check 2>/dev/null
+	${command} ${command_args} ${squid_flags} -k check 2>/dev/null
 }
 
 squid_setfib() {
@@ -55,7 +55,7 @@
 
 squid_stop() {
 	echo "Stopping ${name}."
-	${command} ${squid_flags} -k shutdown
+	${command} ${command_args} ${squid_flags} -k shutdown
 	run_rc_command poll
 }
 
@@ -66,7 +66,7 @@
 
 command=%%PREFIX%%/sbin/squid
 extra_commands=reload
-reload_cmd="${command} ${squid_flags} -k reconfigure"
+reload_cmd="${command} ${command_args} ${squid_flags} -k reconfigure"
 start_precmd="squid_setfib"
 stop_precmd="squid_checkrunning"
 stop_cmd="squid_stop"
	


>Release-Note:
>Audit-Trail:
>Unformatted: