diff options
| author | pav <pav@FreeBSD.org> | 2004-04-01 14:12:37 +0000 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-04-01 14:12:37 +0000 |
| commit | bd54de6b668bf5cbd8379ad8c139a5108c5e47b3 (patch) | |
| tree | 42041667d55ce02256680a6f1050e1b18c6736c1 /www/squid30/Makefile | |
| parent | 6349c8196ffbb6814f964fb19b40c04a63a484da (diff) | |
| download | FreeBSD-ports-bd54de6b668bf5cbd8379ad8c139a5108c5e47b3.zip FreeBSD-ports-bd54de6b668bf5cbd8379ad8c139a5108c5e47b3.tar.gz | |
- Integrate four new vendor patches applicable to FreeBSD, see
http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- Fix OPTIONS parser to handle a default-to-on option correctly
when either the portoptions file does not exist and/or is not read
(i.e. the PACKAGE_BUILDING and BATCH cases)
- use IGNORE instead of .error to abort
- use ${ID} consistently
- inform the user of squid.sh's rcNG-ness when /etc/rc.subr is present
at installation time
- bump PORTREVISION
PR: ports/64946
Submitted by: Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Diffstat (limited to 'www/squid30/Makefile')
| -rw-r--r-- | www/squid30/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 2bf807a..45eb961 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -29,6 +29,7 @@ PORTNAME= squid PORTVERSION= 2.5.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -42,7 +43,11 @@ DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ PATCHFILES= squid-2.5.STABLE5-ntlm_assert.patch \ - squid-2.5.STABLE5-ldap.patch + squid-2.5.STABLE5-ldap.patch \ + squid-2.5.STABLE5-helper_warning.patch \ + squid-2.5.STABLE5-vary.patch \ + squid-2.5.STABLE5-deny_info.patch \ + squid-2.5.STABLE5-CONNECT_timeout.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -163,7 +168,7 @@ CONFIGURE_ARGS+= --enable-cache-digests .if defined(WITHOUT_SQUID_WCCP) CONFIGURE_ARGS+= --disable-wccp .endif -.if defined(WITH_SQUID_UNDERSCORES) +.if !defined(WITHOUT_SQUID_UNDERSCORES) CONFIGURE_ARGS+= --enable-underscores .endif .if defined(WITHOUT_SQUID_CHECK_HOSTNAME) @@ -188,7 +193,7 @@ CONFIGURE_ARGS+= --enable-arp-acl # on 5.[0-2] systems instead, go on, I will integrate your patch. CONFIGURE_ARGS+= --enable-pf-transparent .else -.error WITH_SQUID_PF only works on systems where pf is part of the base system. +IGNORE= WITH_SQUID_PF only works on systems where pf is part of the base system. .endif .endif .if defined(WITH_SQUID_FOLLOW_XFF) @@ -306,7 +311,7 @@ changeuser: ${ECHO_CMD} "this target!" exit 1 .endif - @if [ `id -u` -ne 0 ]; \ + @if [ `${ID} -u` -ne 0 ]; \ then ${ECHO_CMD} "Sorry, you must be root to use this target."; exit 1; fi; \ current_uid=`id -u ${SQUID_UID}`; \ current_gid=`pw groupshow ${SQUID_GID}|cut -f 3 -d :`; \ |
