From tmseck@netcologne.de  Wed Jul  6 12:08:17 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 17F671065674
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jul 2011 12:08:17 +0000 (UTC)
	(envelope-from tmseck@netcologne.de)
Received: from cc-smtpout3.netcologne.de (cc-smtpout3.netcologne.de [89.1.8.213])
	by mx1.freebsd.org (Postfix) with ESMTP id 912988FC18
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jul 2011 12:08:16 +0000 (UTC)
Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201])
	by cc-smtpout3.netcologne.de (Postfix) with ESMTP id 4134B124BD
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jul 2011 13:51:18 +0200 (CEST)
Received: from wcfields.tmseck.homedns.org (xdsl-89-0-154-59.netcologne.de [89.0.154.59])
	by cc-smtpin1.netcologne.de (Postfix) with ESMTPSA id 167AF11E6C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jul 2011 13:51:18 +0200 (CEST)
Received: by wcfields.tmseck.homedns.org (Postfix, from userid 1001)
	id 0C461130C20; Wed,  6 Jul 2011 13:51:18 +0200 (CEST)
Message-Id: <20110706115118.0C461130C20@wcfields.tmseck.homedns.org>
Date: Wed,  6 Jul 2011 13:51:18 +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.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         158685
>Category:       ports
>Synopsis:       [Maintainer] www/squid31: update to 3.1.14
>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 Jul 06 12:10:12 UTC 2011
>Closed-Date:    Wed Jul 06 18:07:15 UTC 2011
>Last-Modified:  Wed Jul  6 18:10:07 UTC 2011
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of July 6, 2011.

	
>Description:
- Update to 3.1.14
- Integrate changes from ports/158522 by sunpoet@
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: distinfo
===================================================================
--- distinfo	(.../www/squid31)	(Revision 1926)
+++ distinfo	(.../local/squid31)	(Revision 1926)
@@ -1,2 +1,2 @@
-SHA256 (squid3.1/squid-3.1.12.tar.bz2) = 1f67b8587432ca61c372015e468d8b91f32f836d8373e407ab33b1b6ec7fc322
-SIZE (squid3.1/squid-3.1.12.tar.bz2) = 2491613
+SHA256 (squid3.1/squid-3.1.14.tar.bz2) = 8faf16d73ae44029e698160386c45ab853f2fc842601bd550a1c5461815d8a3e
+SIZE (squid3.1/squid-3.1.14.tar.bz2) = 2510694
Index: Makefile
===================================================================
--- Makefile	(.../www/squid31)	(Revision 1926)
+++ Makefile	(.../local/squid31)	(Revision 1926)
@@ -72,7 +72,6 @@
 DISTNAME=	squid-3.1.${SQUID_STABLE_VER}
 DIST_SUBDIR=	squid3.1
 
-PATCHFILES=
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www2.us.squid-cache.org/%SUBDIR%/ \
 		http://www1.at.squid-cache.org/%SUBDIR%/ \
@@ -82,13 +81,14 @@
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v3/3.1/changesets
+PATCHFILES=	# empty
 
 MAINTAINER=	tmseck@web.de
 COMMENT=	HTTP Caching Proxy
 
 LATEST_LINK=	squid31
 
-SQUID_STABLE_VER=	12
+SQUID_STABLE_VER=	14
 
 CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
 GNU_CONFIGURE=	yes
@@ -216,10 +216,10 @@
 CONFIGURE_ARGS=	--with-default-user=${SQUID_UID} \
 		--bindir=${PREFIX}/sbin  \
 		--sbindir=${PREFIX}/sbin  \
-		--datadir=${PREFIX}/etc/squid \
+		--datadir=${ETCDIR} \
 		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=/var/squid \
-		--sysconfdir=${PREFIX}/etc/squid \
+		--sysconfdir=${ETCDIR} \
 		--with-logdir=/var/log/squid \
 		--with-pidfile=/var/run/squid/squid.pid \
 		--enable-removal-policies="lru heap" \
@@ -415,21 +415,20 @@
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
-			CPPFLAGS="${CPPFLAGS}"\
-			LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 
-PLIST_DIRS=	etc/squid/icons libexec/squid
-PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
+PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
+PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
 		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
 
-PLIST_FILES+=	etc/squid/errors/COPYRIGHT etc/squid/errors/TRANSLATORS
+PLIST_FILES+=	%%ETCDIR%%/errors/COPYRIGHT %%ETCDIR%%/errors/TRANSLATORS
 .for d in ${error_dirs}
-PLIST_DIRS+=	etc/squid/errors/${d}
-PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
+PLIST_DIRS+=	%%ETCDIR%%/errors/${d}
+PLIST_FILES+=	${error_files:S,^,%%ETCDIR%%/errors/${d}/,}
 .endfor
-PLIST_FILES+=	${error_dir_links:S,^,etc/squid/errors/,}
-PLIST_DIRS+=	etc/squid/errors etc/squid
+PLIST_FILES+=	${error_dir_links:S,^,%%ETCDIR%%/errors/,}
+PLIST_DIRS+=	%%ETCDIR%%/errors
+PLIST_DIRSTRY+=	%%ETCDIR%%
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->flo 
Responsible-Changed-By: flo 
Responsible-Changed-When: Wed Jul 6 12:11:36 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158685 
State-Changed-From-To: open->closed 
State-Changed-By: flo 
State-Changed-When: Wed Jul 6 18:07:14 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158685: commit references a PR
Date: Wed,  6 Jul 2011 18:06:16 +0000 (UTC)

 flo         2011-07-06 18:06:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/squid31          Makefile distinfo 
   Log:
   - update to 3.1.14 [1]
   - Use PLIST_DIRSTRY for ETCDIR: configuration file (not in PLIST) is
     ETCDIR/squid.conf by default [2]
   - Use ETCDIR [2]
   - Make portlint happier [2]
   - Bump PORTREVISION for PLIST change [2]
   
   PR:             ports/158685 [1]
                   ports/158522 [2]
   Submitted by:   Thomas-Martin Seck <tmseck@web.de> (maintainer) [1]
                   sunpoet [2]
   Approved by:    maintainer [2]
   
   Revision  Changes    Path
   1.253     +13 -14    ports/www/squid31/Makefile
   1.194     +2 -2      ports/www/squid31/distinfo
 _______________________________________________
 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:
