diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2011-07-07 00:37:55 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2011-07-07 00:37:55 +0800 |
| commit | 56d4cf22b35b74453746644425bae8df17529270 (patch) | |
| tree | a2f99f25352520f9a86a079cdd75c214faf83dfb /www | |
| parent | d37c84050999cfe260b4bd6694eb3a519a29791f (diff) | |
| download | freebsd-ports-gnome-56d4cf22b35b74453746644425bae8df17529270.tar.gz freebsd-ports-gnome-56d4cf22b35b74453746644425bae8df17529270.tar.zst freebsd-ports-gnome-56d4cf22b35b74453746644425bae8df17529270.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/158524
Submitted by: sunpoet (myself)
Approved by: Thomas-Martin Seck <tmseck@web.de> (maintainer)
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index ec5cc9acf325..1cdfdb364a48 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -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 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ 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 @@ sbin= RunCache squidclient squid 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 @@ 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}" \ 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' \ |