Date: Thu, 30 Jun 2011 14:12:21 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tmseck@web.de Subject: ports/158524: [PATCH] www/squid: various changes Message-ID: <20110630061221.D50EC369E@sunpoet.net> Resent-Message-ID: <201106300620.p5U6K9GK090238@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158524 >Category: ports >Synopsis: [PATCH] www/squid: 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@web.de) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- squid-2.7.9_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/squid/Makefile,v retrieving revision 1.229 diff -u -u -r1.229 Makefile --- Makefile 23 Jun 2011 15:11:18 -0000 1.229 +++ Makefile 30 Jun 2011 06:11:26 -0000 @@ -77,6 +77,7 @@ PORTNAME= squid PORTVERSION= 2.7.${SQUID_STABLE_VER} +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -107,8 +108,8 @@ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v2/2.7/changesets -PATCHFILES= PATCH_DIST_STRIP= -p1 +PATCHFILES= # empty MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy @@ -199,10 +200,10 @@ CONFIGURE_ARGS= --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,20 +384,19 @@ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}"\ - LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ GREP="${GREP}" -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} -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|-lpthread|${PTHREAD_LIBS}|g' \ --- squid-2.7.9_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?20110630061221.D50EC369E>