diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2011-07-07 00:34:58 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2011-07-07 00:34:58 +0800 |
| commit | d37c84050999cfe260b4bd6694eb3a519a29791f (patch) | |
| tree | 5fdd5571a1f04826438b1cca5260972e45620864 /www/squid30 | |
| parent | 165fa442cd65462fe7f1e77f9a93486f072ae655 (diff) | |
| download | freebsd-ports-gnome-d37c84050999cfe260b4bd6694eb3a519a29791f.tar.gz freebsd-ports-gnome-d37c84050999cfe260b4bd6694eb3a519a29791f.tar.zst freebsd-ports-gnome-d37c84050999cfe260b4bd6694eb3a519a29791f.zip | |
- 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
PR: ports/158523
Submitted by: sunpoet (myself)
Approved by: Thomas-Martin Seck <tmseck@web.de> (maintainer)
Diffstat (limited to 'www/squid30')
| -rw-r--r-- | www/squid30/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 238b83ffae99..d6ec5a5431b4 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -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 @@ sbin= RunAccel RunCache squidclient squid 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 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # 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' \ |