From 4f8c3fdab295f7f69c1ccbab3c2839f7a8b9294b Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Mon, 30 Aug 2010 01:06:10 -0400
Subject: unbreak packages

---
 pkg_config.8.xml.amd64 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 04283874..7345b741 100755
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -307,17 +307,10 @@
       <website>http://www.snort.org</website>
       <descr>Used by fortune 500 companies and governments Snort is the most widely deployed IDS/IPS technology worldwide. It features rules based logging and can perform content searching/matching in addition to being used to detect a variety of other attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, and much more.</descr>
       <category>Security</category>
-<<<<<<< HEAD
-      <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.0.x86/</depends_on_package_base_url>
-	  <depends_on_package>pcre-8.02.tbz</depends_on_package>
-	  <depends_on_package>perl-5.10.1_2.tbz</depends_on_package>
-      <depends_on_package>mysql-client-5.0.90.tbz</depends_on_package>
-=======
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.1x64/</depends_on_package_base_url>
 	  <depends_on_package>pcre-8.10.tbz</depends_on_package>
 	  <depends_on_package>perl-threaded-5.12.1_1.tbz</depends_on_package>
       <depends_on_package>mysql-client-5.1.50_1.tbz</depends_on_package>
->>>>>>> snort, update binaries for 1.2.3 x86, 2.0 x86, x64, update rule files to match.
 	  <depends_on_package>snort-2.8.6.1.tbz</depends_on_package>
 	  <build_port_path>/usr/ports/devel/pcre</build_port_path>
 	  <build_port_path>/usr/ports/lang/perl5.10</build_port_path>
-- 
cgit v1.2.3