Date: Thu, 30 Jun 2011 14:10:20 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tmseck@web.de Subject: ports/158522: [PATCH] www/squid31: various changes Message-ID: <20110630061020.6085E3691@sunpoet.net> Resent-Message-ID: <201106300620.p5U6K8XO090220@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158522
>Category: ports
>Synopsis: [PATCH] www/squid31: 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:08 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:
- Remove DISTNAME
- 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@web.de) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- squid-3.1.12_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/squid31/Makefile,v
retrieving revision 1.252
diff -u -u -r1.252 Makefile
--- Makefile 23 Jun 2011 15:11:18 -0000 1.252
+++ Makefile 30 Jun 2011 06:09:01 -0000
@@ -51,6 +51,7 @@
PORTNAME= squid
PORTVERSION= 3.1.${SQUID_STABLE_VER}
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
@@ -69,10 +70,8 @@
http://www1.jp.squid-cache.org/Versions/v3/3.1/ \
http://www1.za.squid-cache.org/Versions/v3/3.1/
MASTER_SITE_SUBDIR= squid
-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,10 +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
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LATEST_LINK= squid31
SQUID_STABLE_VER= 12
@@ -96,9 +99,6 @@
USE_PERL5= yes
USE_RC_SUBR= squid
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
SQUID_UID?= squid
SQUID_GID?= squid
@@ -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' \
--- squid-3.1.12_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110630061020.6085E3691>