fixup imspector

2 files changed, 26 insertions, 74 deletions

diff --git a/packages/imspector/imspector.xml b/packages/imspector/imspector.xml
index d23aab3b..8757e2f8 100644
--- a/packages/imspector/imspector.xml
+++ b/packages/imspector/imspector.xml
@@ -13,9 +13,9 @@
 		<url>/pkg_edit.php?xml=imspector.xml&amp;id=0</url>
 	</menu>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/imspector/imspector.inc</item>
 	    <prefix>/usr/local/pkg/</prefix>
-	    <chmod>0755</chmod>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/imspector/imspector.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/sbin/</prefix>
@@ -32,71 +32,6 @@
 		<chmod>0755</chmod>
 		<item>http://www.pfsense.com/packages/config/imspector/lib/libimspector.so</item>
 	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/debugloggingplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/fileloggingplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/icqprotocolplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/ircprotocolplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/msnprotocolplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/yahooprotocolplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/badwordscontentplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/mysqlloggingplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/imspector</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/sqliteloggingplugin.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/lib</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/libstdc++.a</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/lib</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/libstdc++.so</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/lib</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/libstdc++.so.5</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/lib</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/libstdc++_p.a</item>
-	</additional_files_needed>
 	<service>
 		<name>imspector</name>
 		<rcfile>imspector.sh</rcfile>
@@ -177,10 +112,28 @@
 		sync_package_imspector();
 	</custom_php_resync_config_command>    
 	<custom_php_install_command>
-		sync_package_imspector();
+		exec("mkdir -p /usr/local/lib/imspector");
+		exec("fetch -o /usr/local/lib/imspector/debugloggingplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/debugloggingplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/fileloggingplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/fileloggingplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/mysqlloggingplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/mysqlloggingplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/icqprotocolplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/icqprotocolplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/ircprotocolplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/ircprotocolplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/msnprotocolplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/msnprotocolplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/yahooprotocolplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/yahooprotocolplugin.so");
+		exec("fetch -o /usr/local/lib/imspector/badwordscontentplugin.so \
+			http://www.pfsense.com/packages/config/imspector/lib/badwordscontentplugin.so");		
+		exec("chmod 755 /usr/local/lib/imspector/*");
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		exec("rm -f /usr/local/etc/rc.d/imspector*");
 		exec("rm -f /usr/local/etc/imspector.conf");
+		exec("rm -rf /usr/local/lib/imspector");
 	</custom_php_deinstall_command>
 </packagegui>
diff --git a/pkg_config.xml b/pkg_config.xml
index 0706d698..f643a5a8 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -140,9 +140,9 @@
 	</package>
     <package>
       <name>imspector</name>
-	  <descr>** REQUIRES: 1.0.1-SNAPSHOT-11-24-2006 OR LATER ** NOTE: IF MINIUPNPD INSTALLED, YOU NEED TO UPGRADE
-      TO MINIUPNPD 20061123 ** IMSpector is an Instant Messenger transparent proxy with logging capabilities.
-      Currently it supports MSN, AIM, ICQ, Yahoo and IRC to different degrees.</descr>
+	  <descr>** REQUIRES: 1.0.1-SNAPSHOT-11-24-2006 OR LATER ** IMSpector is an Instant Messenger 
+      transparent proxy with logging capabilities. Currently it supports MSN, AIM, ICQ, Yahoo and 
+      IRC to different degrees.</descr>
       <website>http://www.imspector.org/</website>
       <category>Network Management</category>
 	  <maintainer>ryan@wgnrs.dynu.com</maintainer>
@@ -151,9 +151,8 @@
       <status>ALPHA</status>
       <config_file>http://www.pfsense.com/packages/config/imspector/imspector.xml</config_file>
 	  <configurationfile>imspector.xml</configurationfile>
-	  <depends_on_package_base_url>ftp://ftp2.freebsd.org/pub/FreeBSD/ports/i386/packages-6.1-release/Latest</depends_on_package_base_url>
-	  <depends_on_package>mysql51-client.tbz</depends_on_package>
-	  <depends_on_package>sqlite3.tbz</depends_on_package>	  
+	  <depends_on_package_base_url>ftp://ftp2.freebsd.org/pub/FreeBSD/ports/i386/packages-6.1-release/All</depends_on_package_base_url>
+	  <depends_on_package>mysql-client-5.1.6_1.tbz</depends_on_package>
     </package>
     <package>
       <name>nut</name>