ports/158523: [PATCH] www/squid30: various changes

[Sunpoet Po-Chuan Hsieh]

>Number:         158523
>Category:       ports
>Synopsis:       [PATCH] www/squid30: various changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 30 06:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Jun 20 21:52:00 CST 2011
>Description:
- Use PLIST_DIRSTRY for ETCDIR: configuration file (not in PLIST) is ETCDIR/squid.conf by default
- Use ETCDIR
- Make portlint happier
- Bump PORTREVISION for PLIST change

Port maintainer (tmseck at web.de) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- squid-3.0.25_4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/squid30/Makefile,v
retrieving revision 1.240
diff -u -u -r1.240 Makefile
--- Makefile	23 Jun 2011 15:11:18 -0000	1.240
+++ Makefile	30 Jun 2011 06:10:39 -0000
@@ -61,7 +61,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.0.${SQUID_STABLE_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -190,10 +190,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} \
 		--enable-removal-policies="lru heap" \
 		--disable-linux-netfilter \
 		--disable-linux-tproxy \
@@ -383,19 +383,18 @@
 # 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/,}
 
 .for d in ${SQUID_LANGUAGES} templates
-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_DIRS+=	etc/squid/errors etc/squid
+PLIST_DIRS+=	%%ETCDIR%%/errors
+PLIST_DIRSTRY+=	%%ETCDIR%%
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
--- squid-3.0.25_4.patch ends here ---

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