Date: Tue, 9 Mar 2004 11:50:15 -0800 (PST) From: Thomas-Martin Seck <tmseck@netcologne.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/63651: [Maintainer] www/squid: Update to 2.5.STABLE5 Message-ID: <200403091950.i29JoF88063434@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/63651; it has been noted by GNATS.
From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@freebsd.org
Cc:
Subject: Re: ports/63651: [Maintainer] www/squid: Update to 2.5.STABLE5
Date: Tue, 9 Mar 2004 20:41:57 +0100
Check OSVERSION when enabling PF support, suggested by Joe Marcus Clarke(?)
via Adam McLaurin:
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/projekte/FreeBSD/ports/www/squid/Makefile,v
retrieving revision 1.5.2.28
diff -u -r1.5.2.28 Makefile
--- Makefile 2 Mar 2004 18:02:16 -0000 1.5.2.28
+++ Makefile 9 Mar 2004 19:37:18 -0000
@@ -63,6 +63,8 @@
PORTDOCS= ${docs:T}
.endif
+.include <bsd.port.pre.mk>
+
OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
SQUID_DELAY_POOLS "Enable delay pools" off \
SQUID_SNMP "Enable SNMP support" off \
@@ -80,11 +82,13 @@
SQUID_IDENT "Enable ident (RFC 931) lookups" on \
SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
- SQUID_PF "Enable transp. proxy support using PF" off \
SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
SQUID_AUFS "Enable the aufs store type" off \
SQUID_COSS "Enable the COSS store type" off \
SQUID_STACKTRACES "Create backtraces on fatal errors" off
+.if ${OSVERSION} >= 502106
+OPTIONS+= SQUID_PF "Enable transp. proxy support using PF" off
+.endif
PLIST_FILES= etc/rc.d/squid.sh etc/squid/mib.txt etc/squid/mime.conf.default \
etc/squid/msntauth.conf.default etc/squid/squid.conf.default \
@@ -96,8 +100,6 @@
--localstatedir=${PREFIX}/squid \
--enable-removal-policies="lru heap"
-.include <bsd.port.pre.mk>
-
# Authentication methods and modules:
basic_auth= NCSA PAM YP MSNT winbind
@@ -182,10 +184,14 @@
CONFIGURE_ARGS+= --enable-arp-acl
.endif
.if defined(WITH_SQUID_PF)
+.if ${OSVERSION} >= 502106
# This will work only systems where PF is part of the base system for now.
# If someone is eager to teach autoconf to pick up the pf port
# 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.
+.endif
.endif
.if defined(WITH_SQUID_FOLLOW_XFF)
EXTRA_PATCHES+= ${PATCHDIR}/follow_xff-2.5.patch \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403091950.i29JoF88063434>