From 8fd85b791f167918abfe56860da9f06b1a90ec4a Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Fri, 6 Nov 2015 13:25:39 -0200
Subject: Revert "Bunch of other conflicting things"

This reverts commit 6c6f2117095537ff124ffb806311cad94b2a26a2.
---
 pkg_config.10.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index aac5719b..b69d312e 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -505,8 +505,6 @@
 		</build_pbi>
 		<build_options>dansguardian_UNSET_FORCE=APACHE;dansguardian_SET_FORCE=TRICKLE CLAMD ICAP NTLM SSL</build_options>
 		<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
-		<conflicts>squid3</conflicts>
-		<conflicts>HAVP antivirus</conflicts>
 		<maximum_version>2.2.999</maximum_version>
 	</package>
 	<package>
@@ -1070,8 +1068,6 @@
 		<build_options>c-icap_SET_FORCE=LARGE_FILES;squid_SET_FORCE=ARP_ACL AUTH_LDAP AUTH_NIS AUTH_SASL CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS FS_DISKD GSSAPI_MIT HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_PF WCCP WCCPV2;squid_UNSET_FORCE=AUTH_SMB AUTH_SQL DEBUG DNS_HELPER ECAP ESI FS_ROCK GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL STACKTRACES TP_IPF TP_IPFW VIA_DB</build_options>
 		<conflicts>squid</conflicts>
 		<conflicts>squidGuard-devel</conflicts>
-		<conflicts>HAVP antivirus</conflicts>
-		<conflicts>Dansguardian</conflicts>
 		<config_file>https://packages.pfsense.org/packages/config/squid3/34/squid.xml</config_file>
 		<configurationfile>squid.xml</configurationfile>
 		<depends_on_package_pbi>squid-3.4.10_2-##ARCH##.pbi</depends_on_package_pbi>
@@ -1213,7 +1209,6 @@
 		</build_pbi>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
 		<conflicts>squid3</conflicts>
-		<conflicts>Dansguardian</conflicts>
 		<version>1.10.0</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
-- 
cgit v1.2.3