XML tidy this file also - hooks still not running right

1 files changed, 259 insertions, 263 deletions

diff --git a/pkg_config.xml b/pkg_config.xml
index d69e32af..36693228 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -16,7 +16,7 @@
     </package>
     <package>
       <name>AutoConfigBackup</name>
-	  <maintainer>portal@bsdperimeter.com</maintainer>
+      <maintainer>portal@bsdperimeter.com</maintainer>
       <descr>Automatically backs up your pfSense configuration.  All contents are encrypted on the server.  Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
       <website>https://portal.pfsense.org</website>
       <category>Services</category>
@@ -25,7 +25,7 @@
       <required_version>1.2</required_version>
       <config_file>http://www.pfsense.com/packages/config/autoconfigbackup/autoconfigbackup.xml</config_file>
       <configurationfile>autoconfigbackup.xml</configurationfile>
-    </package>	
+    </package>
     <package>
       <name>spamd</name>
       <website>http://www.openbsd.org/spamd/</website>
@@ -90,7 +90,7 @@
       <version>0.6.2</version>
       <status>BETA</status>
       <required_version>1.2</required_version>
-	  <maximum_version>1.9</maximum_version>
+      <maximum_version>1.9</maximum_version>
       <configurationfile>dashboard.xml</configurationfile>
     </package>
     <package>
@@ -237,14 +237,14 @@
       Currently it supports MSN, AIM, ICQ, Yahoo and IRC to different degrees.</descr>
       <website>http://www.imspector.org/</website>
       <category>Network Management</category>
-	  <maintainer>rswagoner@gmail.com</maintainer>
+      <maintainer>rswagoner@gmail.com</maintainer>
       <version>0.4</version>
       <required_version>1.0.1</required_version>
       <status>BETA</status>
       <config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file>
-	  <configurationfile>imspector.xml</configurationfile>
-	  <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
-	  <depends_on_package>imspector-0.4.tbz</depends_on_package>
+      <configurationfile>imspector.xml</configurationfile>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
+      <depends_on_package>imspector-0.4.tbz</depends_on_package>
     </package>
     <package>
       <name>nut</name>
@@ -255,24 +255,24 @@
       <status>BETA</status>
       <required_version>1.0</required_version>
       <maintainer>rswagoner@gmail.com</maintainer>
-	  <config_file>http://www.pfsense.com/packages/config/nut/nut.xml</config_file>
-	  <configurationfile>nut.xml</configurationfile>
-	  <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
+      <config_file>http://www.pfsense.com/packages/config/nut/nut.xml</config_file>
+      <configurationfile>nut.xml</configurationfile>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
       <depends_on_package>nut-2.0.4.tbz</depends_on_package>
       <depends_on_package>nut-usb-2.0.4.tbz</depends_on_package>
-	</package>
-	<package>
-		<name>diag_new_states</name>
-		<descr>Paul Taylors version of Diagnostics States which utilizes pftop.</descr>
-		<website>http://www.addressplus.net</website>
-		<category>Network Management</category>
-		<version>0.2</version>
-		<maintainer>ptaylor@addressplus.net</maintainer>
-		<required_version>1.0</required_version>
-		<status>BETA</status>
-		<config_file>http://www.pfsense.org/packages/config/diag_states_pt/diag_new_states.xml</config_file>
-		<configurationfile>http://www.pfsense.com/packages/config/diag_states_pt/diag_new_states.xml</configurationfile>
-	</package>
+    </package>
+    <package>
+      <name>diag_new_states</name>
+      <descr>Paul Taylors version of Diagnostics States which utilizes pftop.</descr>
+      <website>http://www.addressplus.net</website>
+      <category>Network Management</category>
+      <version>0.2</version>
+      <maintainer>ptaylor@addressplus.net</maintainer>
+      <required_version>1.0</required_version>
+      <status>BETA</status>
+      <config_file>http://www.pfsense.org/packages/config/diag_states_pt/diag_new_states.xml</config_file>
+      <configurationfile>http://www.pfsense.com/packages/config/diag_states_pt/diag_new_states.xml</configurationfile>
+    </package>
     <package>
       <name>freenas</name>
       <website>http://www.freenas.org/</website>
@@ -283,7 +283,7 @@
         configuration interface.
         &lt;/p&gt;
         &lt;p&gt;
-        Please read the &lt;a href=&quot;http://www.pfsense.com/packages/config/freenas/doc/README.txt&quot; target=&quot;_blank&quot;&gt;FreeNAS README&lt;/a&gt; before installing this package.
+        Please read the &lt;a href="http://www.pfsense.com/packages/config/freenas/doc/README.txt" target="_blank"&gt;FreeNAS README&lt;/a&gt; before installing this package.
         &lt;/p&gt;
       </descr>
       <category>Network</category>
@@ -320,7 +320,7 @@
       <configurationfile>dspam.xml</configurationfile>
       <depends_on_package_base_url>http://files.pfsense.com/packages/All/</depends_on_package_base_url>
       <depends_on_package>dspam-3.6.8-sqlite3-noldap.tbz</depends_on_package>
-      <!--
+<!--
         Archiver deps are introduced by ClamAV.
       -->
       <depends_on_package>unzoo-4.4</depends_on_package>
@@ -380,9 +380,9 @@
       <website>http://dmr.ath.cx/net/darkstat/</website>
       <descr>darkstat is a network statistics gatherer. It's a packet sniffer that runs as a background process on a cable/DSL router, gathers all sorts of statistics about network usage, and serves them over HTTP.</descr>
       <category>Network Management</category>
-	  <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
-	  <depends_on_package>darkstat-3.0.619.tbz</depends_on_package>
-	  <depends_on_package>gettext-0.14.5_2.tbz</depends_on_package>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
+      <depends_on_package>darkstat-3.0.619.tbz</depends_on_package>
+      <depends_on_package>gettext-0.14.5_2.tbz</depends_on_package>
       <version>3.0.619</version>
       <status>Stable</status>
       <required_version>1.0</required_version>
@@ -523,7 +523,7 @@
       <depends_on_package_base_url>http://files.pfsense.org/mirror/packages/All</depends_on_package_base_url>
       <depends_on_package>squid-2.6.18.tbz</depends_on_package>
       <depends_on_package>squid_radius_auth-1.0.8.tbz</depends_on_package>
-	  <depends_on_package>openldap-client-2.3.40.tbz</depends_on_package>
+      <depends_on_package>openldap-client-2.3.40.tbz</depends_on_package>
       <config_file>http://www.pfsense.org/packages/config/squid/squid.xml</config_file>
       <configurationfile>squid.xml</configurationfile>
     </package>
@@ -559,82 +559,78 @@
       </logging>
     </package>
     <package>
-  	  <name>squidGuard</name> 
-  	  <descr>
+      <name>squidGuard</name>
+      <descr>
           High perfomance web proxy filter. 
           Required proxy squid. 
-	  </descr> 
-  	  <website>http://www.squidGuard.org/</website> 
-  	  <maintainer>dv_serg@mail.ru</maintainer> 
-  	  <category>Network Management</category> 
-  	  <version>1.2.0_1-2</version> 
-  	  <status>Beta</status> 
-  	  <required_version>1.1</required_version> 
-  	  <depends_on_package_base_url>http://www.pfsense.org/mirrors/packages/All/</depends_on_package_base_url> 
-  	  <depends_on_package>squidGuard-1.2.0_1.tbz</depends_on_package> 
-  	  <config_file>http://www.pfsense.org/packages/config/squidGuard/squidguard.xml</config_file> 
-  	  <configurationfile>squidguard.xml</configurationfile> 
-    </package>
-	<package>
-		<name>Zabbix Agent (1.4)</name>
-		<descr>Monitoring agent.</descr>
-		<category>Services</category>
-		<config_file>http://www.pfsense.com/packages/config/zabbix-agent.xml</config_file>
-		<version>0.22</version>
-		<status>FINAL</status>
-		<required_version>1.2</required_version>
-		<configurationfile>zabbix-agent.xml</configurationfile>
-		<maintainer>remco.verhoef@redfive.biz</maintainer>
-		<depends_on_package_base_url>ftp://freebsd.isc.org/../pub/FreeBSD/ports/i386/packages-6.4-release/net-mgmt/</depends_on_package_base_url>
-		<depends_on_package>zabbix-agent-1.4.5,2.tbz</depends_on_package>
-	</package>
-  </packages>
-<ENDOFPACKAGES>
-</ENDOFPACKAGES>
-
-
-
-
-    <package>
-      <name>upnp</name>
-      <descr>Emulates Microsoft's Internet Connection Service (ICS). It implements the UPnP Internet Gateway Device specification (IGD) and allows UPnP aware clients, such as MSN Messenger to work properly from behind a NAT firewall.</descr>
-      <website>http://linux-igd.sourceforge.net/</website>
-      <category>Network Management</category>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
-      <depends_on_package>linuxigd-0.92_2.tbz</depends_on_package>
-      <version>1.0.5</version>
-      <status>*ALPHA* *DANGER* *MAY WRECK SECURITY, USE AT OWN RISK*</status>
-      <required_version>1.0</required_version>
-      <config_file>http://www.pfsense.com/packages/config/upnpd.xml</config_file>
-      <configurationfile>upnpd.xml</configurationfile>
-    </package>
-    <package>
-      <name>powerdns</name>
-      <descr>PowerDNS (AKA pdns) is an advanced high performance authoritative nameserver with MANY advanced features</descr>
-      <website>http://www.powerdns.com/</website>
+	  </descr>
+      <website>http://www.squidGuard.org/</website>
+      <maintainer>dv_serg@mail.ru</maintainer>
       <category>Network Management</category>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.3-release/All</depends_on_package_base_url>
-      <depends_on_package>powerdns-2.9.16_4.tbz</depends_on_package>
-      <version>2.9.16_4</version>
-      <status>ALPHA (NO GUI)</status>
-      <required_version>1.0</required_version>
-      <config_file>http://www.pfsense.com/packages/config/powerdns.xml</config_file>
-      <configurationfile>powerdns.xml</configurationfile>
+      <version>1.2.0_1-2</version>
+      <status>Beta</status>
+      <required_version>1.1</required_version>
+      <depends_on_package_base_url>http://www.pfsense.org/mirrors/packages/All/</depends_on_package_base_url>
+      <depends_on_package>squidGuard-1.2.0_1.tbz</depends_on_package>
+      <config_file>http://www.pfsense.org/packages/config/squidGuard/squidguard.xml</config_file>
+      <configurationfile>squidguard.xml</configurationfile>
     </package>
     <package>
-      <name>postfix</name>
-      <descr>Postfix mail forwarder.	Forwards mail to another mail server.</descr>
-      <website>http://www.postfix.com/</website>
-      <category>Mail</category>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.3-release/mail</depends_on_package_base_url>
-      <depends_on_package>postfix-1.1.12_1%2c1.tbz</depends_on_package>
-      <version>1.1.12_1</version>
-      <status>ALPHA</status>
-      <required_version>1.0</required_version>
-      <config_file>http://www.pfsense.com/packages/config/postfix.xml</config_file>
-      <configurationfile>postfix.xml</configurationfile>
+      <name>Zabbix Agent (1.4)</name>
+      <descr>Monitoring agent.</descr>
+      <category>Services</category>
+      <config_file>http://www.pfsense.com/packages/config/zabbix-agent.xml</config_file>
+      <version>0.22</version>
+      <status>FINAL</status>
+      <required_version>1.2</required_version>
+      <configurationfile>zabbix-agent.xml</configurationfile>
+      <maintainer>remco.verhoef@redfive.biz</maintainer>
+      <depends_on_package_base_url>ftp://freebsd.isc.org/../pub/FreeBSD/ports/i386/packages-6.4-release/net-mgmt/</depends_on_package_base_url>
+      <depends_on_package>zabbix-agent-1.4.5,2.tbz</depends_on_package>
     </package>
-    <!--
+  </packages>
+  <ENDOFPACKAGES>
+</ENDOFPACKAGES>
+  <package>
+    <name>upnp</name>
+    <descr>Emulates Microsoft's Internet Connection Service (ICS). It implements the UPnP Internet Gateway Device specification (IGD) and allows UPnP aware clients, such as MSN Messenger to work properly from behind a NAT firewall.</descr>
+    <website>http://linux-igd.sourceforge.net/</website>
+    <category>Network Management</category>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
+    <depends_on_package>linuxigd-0.92_2.tbz</depends_on_package>
+    <version>1.0.5</version>
+    <status>*ALPHA* *DANGER* *MAY WRECK SECURITY, USE AT OWN RISK*</status>
+    <required_version>1.0</required_version>
+    <config_file>http://www.pfsense.com/packages/config/upnpd.xml</config_file>
+    <configurationfile>upnpd.xml</configurationfile>
+  </package>
+  <package>
+    <name>powerdns</name>
+    <descr>PowerDNS (AKA pdns) is an advanced high performance authoritative nameserver with MANY advanced features</descr>
+    <website>http://www.powerdns.com/</website>
+    <category>Network Management</category>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.3-release/All</depends_on_package_base_url>
+    <depends_on_package>powerdns-2.9.16_4.tbz</depends_on_package>
+    <version>2.9.16_4</version>
+    <status>ALPHA (NO GUI)</status>
+    <required_version>1.0</required_version>
+    <config_file>http://www.pfsense.com/packages/config/powerdns.xml</config_file>
+    <configurationfile>powerdns.xml</configurationfile>
+  </package>
+  <package>
+    <name>postfix</name>
+    <descr>Postfix mail forwarder.	Forwards mail to another mail server.</descr>
+    <website>http://www.postfix.com/</website>
+    <category>Mail</category>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.3-release/mail</depends_on_package_base_url>
+    <depends_on_package>postfix-1.1.12_1%2c1.tbz</depends_on_package>
+    <version>1.1.12_1</version>
+    <status>ALPHA</status>
+    <required_version>1.0</required_version>
+    <config_file>http://www.pfsense.com/packages/config/postfix.xml</config_file>
+    <configurationfile>postfix.xml</configurationfile>
+  </package>
+<!--
     <package>
       <name>squidGuard</name>
       <descr>High performance Web proxy Guard</descr>
@@ -648,173 +644,173 @@
       <config_file>http://www.pfsense.com/packages/config/squidGuard.xml</config_file>
       <configurationfile>squidGuard.xml</configurationfile>
     </package>
-    --> 
-    <package>
-      <name>pfstat</name>
-      <website>http://www.benzedrine.cx/pfstat.html</website>
-      <descr>pfstat is a small utility that collects packet filter statistics and produces graphs.</descr>
-      <category>Network Management</category>
-      <config_file>http://www.pfsense.com/packages/config/pfstat.xml</config_file>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
-      <depends_on_package>pfstat-1.7.tbz</depends_on_package>
-      <status>Stable</status>
-      <version>1.7</version>
-      <required_version>1.0</required_version>
-      <configurationfile>pfstat.xml</configurationfile>
-    </package>
-    <package>
-      <name>upclient</name>
-      <website>http://uptimes.hostingwired.com</website>
-      <descr>upclient sends system uptime and status information to a server (typically uptimes.hostingwired.com) that tracks and compares uptime statistics.</descr>
-      <category>Miscellaneous</category>
-      <config_file>http://www.pfsense.com/packages/config/upclient.xml</config_file>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/misc</depends_on_package_base_url>
-      <depends_on_package>upclient-5.0.b8_2.tbz</depends_on_package>
-      <version>5.0.b8_2</version>
-      <status>ALPHA</status>
-      <required_version>1.0</required_version>
-      <configurationfile>upclient.xml</configurationfile>
-    </package>
-    <package>
-      <name>quagga</name>
-      <website>http://www.quagga.net/</website>
-      <descr>*NO GUI*</descr>
-      <category>Network Management</category>
-      <depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
-      <depends_on_package>quagga-0.98.5_1.tbz</depends_on_package>
-      <status>ALPHA</status>
-      <required_version>1.0</required_version>
-      <version>9.5</version>
-    </package>
-    <package>
-      <name>zebra</name>
-      <website>http://www.zebra.org/</website>
-      <descr>*NO GUI*</descr>
-      <category>Network Management</category>
-      <depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
-      <depends_on_package>zebra-9.5.tbz</depends_on_package>
-      <status>ALPHA</status>
-      <version>9.5</version>
-      <required_version>1.0</required_version>
-    </package>
-    <package>
-      <name>assp</name>
-      <website>http://assp.sourceforge.net</website>
-      <descr>The Anti-Spam SMTP Proxy (ASSP) Server project is an open source platform-independent SMTP Proxy server which implements whitelists and Bayesian filtering to rid the planet of the blight of unsolicited email (UCE). UCE must be stopped at the SMTP server. Anti-spam tools must be adaptive to new spam and customized for each site's mail patterns. This free, easy-to-use tool works with any mail transport and achieves these goals requiring no operator intervention after the initial setup phase.  Default username: anything, Password: nospam4me</descr>
-      <category>Network Management</category>
-      <config_file>http://www.pfsense.com/packages/config/assp.xml</config_file>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All/</depends_on_package_base_url>
-      <depends_on_package>perl-5.8.7.tbz</depends_on_package>
-      <verifyinstalledpkg>perl</verifyinstalledpkg>
-      <version>0.1</version>
-      <status>ALPHA</status>
-      <required_version>1.0</required_version>
-      <configurationfile>assp.xml</configurationfile>
-    </package>
-    <package>
-      <name>pure-ftpd</name>
-      <website>http://www.pureftpd.org/</website>
-      <descr>*DO NOT RUN THIS ON A FIREWALL. USE A DEDICATED MACHINE!* Pure FTPd Server is a fast, production quality, standards-conformant FTP server based on Troll-FTPd. It has no known vulnerabilities, is trivial to set up, and is especially designed for modern kernels. Features include PAM support, IPv6, chroot()ed home directories, virtual domains, built-in 'ls', FXP protocol, anti-warez system, bandwidth throttling, restricted ports for passive downloads, an LDAP backend, XML output, and more.</descr>
-      <category>FTP</category>
-      <config_file>http://www.pfsense.com/packages/config/pure-ftpd.xml</config_file>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
-      <depends_on_package>pure-ftpd-1.0.20_3.tbz</depends_on_package>
-      <version>1.0.20_3</version>
-      <status>Stable</status>
-      <required_version>1.0</required_version>
-      <configurationfile>pure-ftpd.xml</configurationfile>
-      <logging>
+    -->
+  <package>
+    <name>pfstat</name>
+    <website>http://www.benzedrine.cx/pfstat.html</website>
+    <descr>pfstat is a small utility that collects packet filter statistics and produces graphs.</descr>
+    <category>Network Management</category>
+    <config_file>http://www.pfsense.com/packages/config/pfstat.xml</config_file>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
+    <depends_on_package>pfstat-1.7.tbz</depends_on_package>
+    <status>Stable</status>
+    <version>1.7</version>
+    <required_version>1.0</required_version>
+    <configurationfile>pfstat.xml</configurationfile>
+  </package>
+  <package>
+    <name>upclient</name>
+    <website>http://uptimes.hostingwired.com</website>
+    <descr>upclient sends system uptime and status information to a server (typically uptimes.hostingwired.com) that tracks and compares uptime statistics.</descr>
+    <category>Miscellaneous</category>
+    <config_file>http://www.pfsense.com/packages/config/upclient.xml</config_file>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/misc</depends_on_package_base_url>
+    <depends_on_package>upclient-5.0.b8_2.tbz</depends_on_package>
+    <version>5.0.b8_2</version>
+    <status>ALPHA</status>
+    <required_version>1.0</required_version>
+    <configurationfile>upclient.xml</configurationfile>
+  </package>
+  <package>
+    <name>quagga</name>
+    <website>http://www.quagga.net/</website>
+    <descr>*NO GUI*</descr>
+    <category>Network Management</category>
+    <depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
+    <depends_on_package>quagga-0.98.5_1.tbz</depends_on_package>
+    <status>ALPHA</status>
+    <required_version>1.0</required_version>
+    <version>9.5</version>
+  </package>
+  <package>
+    <name>zebra</name>
+    <website>http://www.zebra.org/</website>
+    <descr>*NO GUI*</descr>
+    <category>Network Management</category>
+    <depends_on_package_base_url>http://www.pfsense.com/packages/All</depends_on_package_base_url>
+    <depends_on_package>zebra-9.5.tbz</depends_on_package>
+    <status>ALPHA</status>
+    <version>9.5</version>
+    <required_version>1.0</required_version>
+  </package>
+  <package>
+    <name>assp</name>
+    <website>http://assp.sourceforge.net</website>
+    <descr>The Anti-Spam SMTP Proxy (ASSP) Server project is an open source platform-independent SMTP Proxy server which implements whitelists and Bayesian filtering to rid the planet of the blight of unsolicited email (UCE). UCE must be stopped at the SMTP server. Anti-spam tools must be adaptive to new spam and customized for each site's mail patterns. This free, easy-to-use tool works with any mail transport and achieves these goals requiring no operator intervention after the initial setup phase.  Default username: anything, Password: nospam4me</descr>
+    <category>Network Management</category>
+    <config_file>http://www.pfsense.com/packages/config/assp.xml</config_file>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All/</depends_on_package_base_url>
+    <depends_on_package>perl-5.8.7.tbz</depends_on_package>
+    <verifyinstalledpkg>perl</verifyinstalledpkg>
+    <version>0.1</version>
+    <status>ALPHA</status>
+    <required_version>1.0</required_version>
+    <configurationfile>assp.xml</configurationfile>
+  </package>
+  <package>
+    <name>pure-ftpd</name>
+    <website>http://www.pureftpd.org/</website>
+    <descr>*DO NOT RUN THIS ON A FIREWALL. USE A DEDICATED MACHINE!* Pure FTPd Server is a fast, production quality, standards-conformant FTP server based on Troll-FTPd. It has no known vulnerabilities, is trivial to set up, and is especially designed for modern kernels. Features include PAM support, IPv6, chroot()ed home directories, virtual domains, built-in 'ls', FXP protocol, anti-warez system, bandwidth throttling, restricted ports for passive downloads, an LDAP backend, XML output, and more.</descr>
+    <category>FTP</category>
+    <config_file>http://www.pfsense.com/packages/config/pure-ftpd.xml</config_file>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All</depends_on_package_base_url>
+    <depends_on_package>pure-ftpd-1.0.20_3.tbz</depends_on_package>
+    <version>1.0.20_3</version>
+    <status>Stable</status>
+    <required_version>1.0</required_version>
+    <configurationfile>pure-ftpd.xml</configurationfile>
+    <logging>
       <facilityname>ftp</facilityname>
       <logfilename>pure-ftpd.log</logfilename>
-      </logging>
-    </package>
-    <package>
-      <name>havp</name>
-      <website>http://havp.sf.net/</website>
-      <descr>HTTP Antivirus Proxy</descr>
-      <category>Services</category>
-      <config_file>http://agni.linuxense.com/packages/config/havp.xml</config_file>
-      <depends_on_package_base_url>http://agni.linuxense.com/packages</depends_on_package_base_url>
-      <depends_on_package>havp-0.80_5.tbz</depends_on_package>
-      <version>0.6</version>
-      <status>ALPHA</status>
-      <required_version>1.0</required_version>
-      <maintainer>raj@linuxense.com</maintainer>
-      <configurationfile>havp.xml</configurationfile>
-    </package>
-	 <package>
-	  <name>doorman</name>
-	  <website>http://doorman.sourceforge.net</website>
-	  <descr>Doorman is a port knocking implementation which allows a server to run silently, invisibly, with all TCP ports closed except to those who know the secret knock.</descr>
-	  <category>Security</category>
-	  <config_file>http://www.pfsense.com/packages/config/doorman.xml</config_file>
-	  <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All/</depends_on_package_base_url>
-	  <depends_on_package>doorman-0.81_1.tbz</depends_on_package>
-	  <version>0.8_1</version>
-	  <status>ALPHA</status>
-	  <required_version>1.2</required_version>
-	  <configurationfile>doorman.xml</configurationfile>
-	 </package>
-	<package>
-      <name>PerUserBW</name>
-      <descr>Adds a per user bandwidth distribution option.  Requires 1.2 or newer.</descr>
-      <category>NET</category>
-      <config_file>http://www.pfsense.com/packages/config/per-user-bandwidth-distribution.xml</config_file>
-      <version>0.1</version>
-      <status>ALPHA</status>
-      <required_version>2.0</required_version>
-      <configurationfile>per-user-bandwidth-distribution.xml</configurationfile>
-    </package>
-    <package>
-      <name>frickin</name>
-      <descr>The Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) client to connect to a PPTP server through Network Address Translation.</descr>
-      <website>http://www.placid.tv</website>
-      <category>Services</category>
-      <version>2.0-BETA2</version>
-      <status>ALPHA</status>
-      <required_version>1.2</required_version>
-      <config_file>http://www.pfsense.com/packages/config/frickin/frickin.xml</config_file>
-      <configurationfile>frickin.xml</configurationfile>
-    </package>
-    <package>
-      <name>routed</name>
-      <descr>RIP v1 and v2 daemon - NOTE: As of 3/18/2007 this package is no longer necessary, it's included in pfSense base and will be removed when 1.0.1 is no longer the current release.</descr>
-      <website>http://www.pfsense.com/</website>
-      <maintainer>billm@pfsense.org</maintainer>
-      <category>Network Management</category>
-      <version>1.1</version>
-      <status>Stable</status>
-      <required_version>1.0</required_version>
-      <config_file>http://www.pfsense.com/packages/config/routed/routed.xml</config_file>
-      <configurationfile>routed.xml</configurationfile>
-    </package>
-    <package>
-      <name>miniupnpd</name>
-      <descr>WARNING! Do not install on 1.2, it's already included. Emulates Microsoft's Internet Connection Service (ICS). It implements the UPnP Internet
+    </logging>
+  </package>
+  <package>
+    <name>havp</name>
+    <website>http://havp.sf.net/</website>
+    <descr>HTTP Antivirus Proxy</descr>
+    <category>Services</category>
+    <config_file>http://agni.linuxense.com/packages/config/havp.xml</config_file>
+    <depends_on_package_base_url>http://agni.linuxense.com/packages</depends_on_package_base_url>
+    <depends_on_package>havp-0.80_5.tbz</depends_on_package>
+    <version>0.6</version>
+    <status>ALPHA</status>
+    <required_version>1.0</required_version>
+    <maintainer>raj@linuxense.com</maintainer>
+    <configurationfile>havp.xml</configurationfile>
+  </package>
+  <package>
+    <name>doorman</name>
+    <website>http://doorman.sourceforge.net</website>
+    <descr>Doorman is a port knocking implementation which allows a server to run silently, invisibly, with all TCP ports closed except to those who know the secret knock.</descr>
+    <category>Security</category>
+    <config_file>http://www.pfsense.com/packages/config/doorman.xml</config_file>
+    <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/All/</depends_on_package_base_url>
+    <depends_on_package>doorman-0.81_1.tbz</depends_on_package>
+    <version>0.8_1</version>
+    <status>ALPHA</status>
+    <required_version>1.2</required_version>
+    <configurationfile>doorman.xml</configurationfile>
+  </package>
+  <package>
+    <name>PerUserBW</name>
+    <descr>Adds a per user bandwidth distribution option.  Requires 1.2 or newer.</descr>
+    <category>NET</category>
+    <config_file>http://www.pfsense.com/packages/config/per-user-bandwidth-distribution.xml</config_file>
+    <version>0.1</version>
+    <status>ALPHA</status>
+    <required_version>2.0</required_version>
+    <configurationfile>per-user-bandwidth-distribution.xml</configurationfile>
+  </package>
+  <package>
+    <name>frickin</name>
+    <descr>The Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP) client to connect to a PPTP server through Network Address Translation.</descr>
+    <website>http://www.placid.tv</website>
+    <category>Services</category>
+    <version>2.0-BETA2</version>
+    <status>ALPHA</status>
+    <required_version>1.2</required_version>
+    <config_file>http://www.pfsense.com/packages/config/frickin/frickin.xml</config_file>
+    <configurationfile>frickin.xml</configurationfile>
+  </package>
+  <package>
+    <name>routed</name>
+    <descr>RIP v1 and v2 daemon - NOTE: As of 3/18/2007 this package is no longer necessary, it's included in pfSense base and will be removed when 1.0.1 is no longer the current release.</descr>
+    <website>http://www.pfsense.com/</website>
+    <maintainer>billm@pfsense.org</maintainer>
+    <category>Network Management</category>
+    <version>1.1</version>
+    <status>Stable</status>
+    <required_version>1.0</required_version>
+    <config_file>http://www.pfsense.com/packages/config/routed/routed.xml</config_file>
+    <configurationfile>routed.xml</configurationfile>
+  </package>
+  <package>
+    <name>miniupnpd</name>
+    <descr>WARNING! Do not install on 1.2, it's already included. Emulates Microsoft's Internet Connection Service (ICS). It implements the UPnP Internet
       Gateway Device specification (IGD) and allows UPnP aware clients, such as MSN Messenger to
       work properly from behind a NAT firewall. WARNING! Do not install on 1.2, it's already included.</descr>
-      <website>http://miniupnp.free.fr/</website>
-      <category>Network Management</category>
-      <maintainer>seth.mos@xs4all.nl rswagoner@gmail.com</maintainer>
-      <version>20080130</version>
-      <required_version>1.0</required_version>
-      <status>Stable</status>
-      <config_file>http://www.pfsense.com/packages/config/miniupnpd/miniupnpd.xml</config_file>
-      <configurationfile>miniupnpd.xml</configurationfile>
-    </package>
-   <package>
-      <name>Open-VM-Tools</name>
-      <descr>The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools. They are a set of guest operating system virtualization components that enhance performance and user experience of virtual machines. As virtualization technology rapidly becomes mainstream, each virtualization solution provider implements their own set of tools and utilities to supplement the guest virtual machine. However, most of the implementations are proprietary and are tied to a specific virtualization platform.
+    <website>http://miniupnp.free.fr/</website>
+    <category>Network Management</category>
+    <maintainer>seth.mos@xs4all.nl rswagoner@gmail.com</maintainer>
+    <version>20080130</version>
+    <required_version>1.0</required_version>
+    <status>Stable</status>
+    <config_file>http://www.pfsense.com/packages/config/miniupnpd/miniupnpd.xml</config_file>
+    <configurationfile>miniupnpd.xml</configurationfile>
+  </package>
+  <package>
+    <name>Open-VM-Tools</name>
+    <descr>The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools. They are a set of guest operating system virtualization components that enhance performance and user experience of virtual machines. As virtualization technology rapidly becomes mainstream, each virtualization solution provider implements their own set of tools and utilities to supplement the guest virtual machine. However, most of the implementations are proprietary and are tied to a specific virtualization platform.
 	</descr>
-      <website>http://open-vm-tools.sourceforge.net</website>
-      <category>Network</category>
-      <version>82724</version>
-      <maintainer>sullrich+ovmtools@gmail.com</maintainer>
-      <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
-      <depends_on_package>open-vm-tools-90473_2.tbz</depends_on_package>
-      <status>Beta1</status>
-      <required_version>1.2</required_version>
-      <config_file>http://www.pfsense.com/packages/config/open-vm-tools/open-vm-tools.xml</config_file>
-      <configurationfile>open-vm-tools.xml</configurationfile>
-    </package>
+    <website>http://open-vm-tools.sourceforge.net</website>
+    <category>Network</category>
+    <version>82724</version>
+    <maintainer>sullrich+ovmtools@gmail.com</maintainer>
+    <depends_on_package_base_url>http://files.pfsense.org/packages/All/</depends_on_package_base_url>
+    <depends_on_package>open-vm-tools-90473_2.tbz</depends_on_package>
+    <status>Beta1</status>
+    <required_version>1.2</required_version>
+    <config_file>http://www.pfsense.com/packages/config/open-vm-tools/open-vm-tools.xml</config_file>
+    <configurationfile>open-vm-tools.xml</configurationfile>
+  </package>
 </pfsensepkgs>