From 89734e0d62e7011cd895a71aa81cec1fd07fbbe8 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 8 Jul 2011 18:17:08 -0400
Subject: Add conflict note

---
 pkg_config.8.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkg_config.8.xml')

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index ae6e83ca..25cfe6de 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -781,6 +781,7 @@
 		<depends_on_package>squid-3.1.9.tbz</depends_on_package>
 		<depends_on_package>squid_radius_auth-1.10.tbz</depends_on_package>
 		<depends_on_package>libwww-5.4.0_4.tbz</depends_on_package>
+		<!-- Do not add build paths please, it conflicts with squid 2.x -->
 		<build_options>WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_IPV6=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITHOUT_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_ECAP=true WITH_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_SQUID_DEBUG=true</build_options>
 		<config_file>http://www.pfsense.org/packages/config/squid3/squid.xml</config_file>
 		<configurationfile>squid.xml</configurationfile>
-- 
cgit v1.2.3