Update XML files to match current package manager feature set

2 files changed, 31 insertions, 19 deletions

diff --git a/packages/ifgraph.xml b/packages/ifgraph.xml
index 498ddeda..97c6220e 100644
--- a/packages/ifgraph.xml
+++ b/packages/ifgraph.xml
@@ -5,18 +5,18 @@
 	<menu>
 		<name>IFGraph</name>
 		<tooltiptext>pfstat is a small utility that collects packet filter statistics and produces graphs.</tooltiptext>
-		<section>System</section>
+		<section>Services</section>
 	</menu>
 	<!-- configpath gets expanded out automatically and config items will be
          stored in that location -->
-	<configpath>installedpackages->package->$packagename->configuration</configpath>
+	<configpath>['installedpackages']['package']['$packagename']['configuration']</configpath>
 	<!-- modify system will modify a file and make sure the text needed to run the 
          package is in place.  The following example edits /etc/crontab and adds the
          code necessart to invoke the pfstat command every 5 minutes. -->
 	<modify_system>
 		<item>
 			<modifyfilename>/etc/crontab</modifyfilename>
-			<textneeded>*    *    *    *    *    root   /usr/local/bin/pfstat -q >> /var/log/pfstat\n*/5  *    *    *    *    root   /usr/local/bin/pfstat -c /usr/local/etc/pfstat.conf -d /var/log/pfstat</textneeded>			
+			<textneeded>*    *    *    *    *    root   /usr/local/bin/pfstat -q >> /var/log/pfstat\n*/5  *    *    *    *    root   /usr/local/bin/pfstat -c /usr/local/etc/pfstat.conf -d /var/log/pfstat\n</textneeded>			
 		</item>
 	</modify_system>
 	<!-- adddeleteeditpagefields items will appear on the first page where you can add / delete or edit
@@ -27,7 +27,7 @@
 			<fieldname>graphname</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>Description</fieldname>
+			<fielddescr>Description</fielddescr>
 			<fieldname>description</fieldname>
 		</columnitem>		
 	</adddeleteeditpagefields>
@@ -64,6 +64,7 @@
 			<description>Graph size in pixels.  Recommend 960x300 for large images, 320x200 for small images.</description>
 			<type>input</type>
 		</field>
+		<field>
 			<fielddescr>Color</fielddescr>
 			<fieldname>color</fieldname>
 			<description>Color of graph</description>
@@ -73,6 +74,7 @@
 				<option>Red</option>
 				<option>Green</option>
 			</options>
+		</field>
 		<field>
 			<fielddescr>Left Counters</fielddescr>
 			<fieldname>leftcounters</fieldname>
@@ -102,6 +104,7 @@
 				<option value="NormalizeCounter">Normalize Counter</option>
 				<option value="MemoryCounter">Memory Counter</option>
 			</options>
+		</field>
 		<field>
 			<fielddescr>Right Counters</fielddescr>
 			<fieldname>rightcounters</fieldname>
@@ -133,5 +136,4 @@
 			</options>
 		</field>	
 	</fields>
-
 </packagegui>
diff --git a/pkg_config.xml b/pkg_config.xml
index 93d6fd10..2975434c 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -1,16 +1,26 @@
-<pfSense>
+<?xml version="1.0"?>
+<!-- pfsense packages -->
+<pfsensepkgs>
+  <packages>
     <package>
-	<name>pfStat</name>
-	<descr>pfstat is a small utility that collects packet filter statistics and produces graphs.</descr>
-	<pfSense_package>http://www.pfsense.com/packages/pfstat.tbz</pfSense_package>
-	<depends_on_package>ftp://ftp2.freebsd.org/pub/FreeBSD/ports/i386/packages-5.3-release/net/pfstat-1.7.tbz</depends_on_package>
+        <name>pfstat</name>
+        <descr>pfstat is a small utility that collects packet filter statistics and produces graphs.</descr>
+        <category>Network Management</category>
+        <pfsense_package_base>http://www.pfsense.com/packages/pfSense</pfsense_package_base>
+        <pfsense_package>pfstat.tbz</pfsense_package>
+        <depends_on_package_base>http://www.pfsense.com/packages/All</depends_on_package_base>
+        <depends_on_package>pfstat-1.7.tbz</depends_on_package>
+        <configurationfile>pfstat.xml</configurationfile>
     </package>
-    <!--
-     <package>
-	<name></name>
-	<description></description>
-	<pfSense_package></pfSense_package>
-	<depends_on_package></depends_on_package>
-     </package>
-    -->
-</pfSense>
+    <package>
+        <name>test</name>
+        <descr>test package</descr>
+        <category>Network Management</category>
+        <pfsense_package_base>http://www.pfsense.com/packages/pfSense</pfsense_package_base>
+        <pfsense_package>test.tbz</pfsense_package>
+        <depends_on_package_base>http://www.pfsense.com/packages/All</depends_on_package_base>
+        <depends_on_package>test-1.7.tbz</depends_on_package>
+        <configurationfile>test.xml</configurationfile>
+    </package>
+  </packages>
+</pfsensepkgs>