sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Use PLIST_DIRSTRY for ETCDIR: configuration file (not in PLIST) is ETCDIR/squid.conf by default

Browse source 
- Use ETCDIR
- Make portlint happier
- Bump PORTREVISION for PLIST change

PR:		ports/158524
Submitted by:	sunpoet (myself)
Approved by:	Thomas-Martin Seck <tmseck@web.de> (maintainer)
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2011-07-06 16:37:55 +00:00
parent 7658630158
commit eff5d59e52
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=277184
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
www/squid/Makefile
View file

@ -77,6 +77,7 @@
PORTNAME= squid PORTNAME= squid
PORTVERSION= 2.7.${SQUID_STABLE_VER} PORTVERSION= 2.7.${SQUID_STABLE_VER}
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \ http://mirrors.ccs.neu.edu/Squid/ \
@ -107,8 +108,8 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \
http://www2.tw.squid-cache.org/%SUBDIR%/ http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR= Versions/v2/2.7/changesets PATCH_SITE_SUBDIR= Versions/v2/2.7/changesets
PATCHFILES=
PATCH_DIST_STRIP= -p1 PATCH_DIST_STRIP= -p1
PATCHFILES= # empty
MAINTAINER= tmseck@web.de MAINTAINER= tmseck@web.de
COMMENT= HTTP Caching Proxy COMMENT= HTTP Caching Proxy
@ -199,10 +200,10 @@ sbin= RunCache squidclient squid
CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \
--sbindir=${PREFIX}/sbin \ --sbindir=${PREFIX}/sbin \
--datadir=${PREFIX}/etc/squid \ --datadir=${ETCDIR} \
--libexecdir=${PREFIX}/libexec/squid \ --libexecdir=${PREFIX}/libexec/squid \
--localstatedir=/var/squid \ --localstatedir=/var/squid \
--sysconfdir=${PREFIX}/etc/squid \ --sysconfdir=${ETCDIR} \
--enable-removal-policies="lru heap" \ --enable-removal-policies="lru heap" \
--disable-linux-netfilter \ --disable-linux-netfilter \
--disable-linux-tproxy \ --disable-linux-tproxy \
@ -383,20 +384,19 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \
# Finally, add additional user specified configuration options: # Finally, add additional user specified configuration options:
CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
CPPFLAGS="${CPPFLAGS}"\
LDFLAGS="${LDFLAGS}" \
GREP="${GREP}" GREP="${GREP}"
PLIST_DIRS= etc/squid/icons libexec/squid PLIST_DIRS= %%ETCDIR%%/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
.for d in ${SQUID_LANGUAGES} .for d in ${SQUID_LANGUAGES}
PLIST_DIRS+= etc/squid/errors/${d} PLIST_DIRS+= %%ETCDIR%%/errors/${d}
PLIST_FILES+= ${error_files:S,^,etc/squid/errors/${d}/,} PLIST_FILES+= ${error_files:S,^,%%ETCDIR%%/errors/${d}/,}
.endfor .endfor
PLIST_DIRS+= etc/squid/errors etc/squid PLIST_DIRS+= %%ETCDIR%%/errors
PLIST_DIRSTRY+= %%ETCDIR%%
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \