From tmseck@netcologne.de  Wed Aug 31 18:22:27 2011
Return-Path: <tmseck@netcologne.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E097E106574B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 31 Aug 2011 18:22:26 +0000 (UTC)
	(envelope-from tmseck@netcologne.de)
Received: from cc-smtpout1.netcologne.de (cc-smtpout1.netcologne.de [89.1.8.211])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E07F8FC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 31 Aug 2011 18:22:26 +0000 (UTC)
Received: from cc-smtpin3.netcologne.de (cc-smtpin3.netcologne.de [89.1.8.203])
	by cc-smtpout1.netcologne.de (Postfix) with ESMTP id B90761280A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 31 Aug 2011 20:22:24 +0200 (CEST)
Received: from wcfields.tmseck.homedns.org (xdsl-89-0-103-87.netcologne.de [89.0.103.87])
	by cc-smtpin3.netcologne.de (Postfix) with ESMTPSA id 9CFAB11E88
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 31 Aug 2011 20:22:24 +0200 (CEST)
Received: by wcfields.tmseck.homedns.org (Postfix, from userid 1001)
	id 5EE33130C6E; Wed, 31 Aug 2011 20:22:24 +0200 (CEST)
Message-Id: <20110831182224.5EE33130C6E@wcfields.tmseck.homedns.org>
Date: Wed, 31 Aug 2011 20:22:24 +0200 (CEST)
From: Thomas-Martin Seck <tmseck@web.de>
Reply-To: Thomas-Martin Seck <tmseck@web.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer] www/squid31: update to 3.1.15
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         160342
>Category:       ports
>Synopsis:       [Maintainer] www/squid31: update to 3.1.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    flo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 31 18:30:08 UTC 2011
>Closed-Date:    Wed Aug 31 21:09:56 UTC 2011
>Last-Modified:  Wed Aug 31 21:10:06 UTC 2011
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->flo 
Responsible-Changed-By: flo 
Responsible-Changed-When: Wed Aug 31 19:25:55 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160342 
State-Changed-From-To: open->closed 
State-Changed-By: flo 
State-Changed-When: Wed Aug 31 21:09:55 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160342 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160342: commit references a PR
Date: Wed, 31 Aug 2011 21:09:32 +0000 (UTC)

 flo         2011-08-31 21:09:18 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/squid31          Makefile distinfo 
     www/squid31/files    squid.in 
   Log:
   - update to 3.1.15 + vendor patch 10373 [1]
   - portlintify [1]
   - make sure we pass ${command_args} to all invocations of ${command} [2]
   
   PR:             ports/160342 [1]
                   ports/156737 [2]
   Submitted by:   Thomas-Martin Seck <tmseck@web.de> (maintainer) [1]
                   Martin Birgmeier <martin.birgmeier@aon.at> [2]
   Approved by:    maintainer [2]
   
   Revision  Changes    Path
   1.254     +5 -5      ports/www/squid31/Makefile
   1.195     +4 -2      ports/www/squid31/distinfo
   1.10      +4 -4      ports/www/squid31/files/squid.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
