aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/imspector/imspector.inc8
-rw-r--r--pkg_config.10.xml4
2 files changed, 9 insertions, 3 deletions
diff --git a/config/imspector/imspector.inc b/config/imspector/imspector.inc
index 89fbda2b..7853e627 100644
--- a/config/imspector/imspector.inc
+++ b/config/imspector/imspector.inc
@@ -35,8 +35,12 @@
require_once("service-utils.inc");
/* IMSpector */
+ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+ if ($pf_version == "2.1" || $pf_version == "2.2")
+ define('IMSPECTOR_ETC', "/usr/pbi/imspector-" . php_uname("m") . "/local/etc/imspector");
+ else
+ define('IMSPECTOR_ETC', "/usr/local/etc/imspector");
define('IMSPECTOR_RCFILE', '/usr/local/etc/rc.d/imspector.sh');
- define('IMSPECTOR_ETC', "/usr/pbi/imspector-" . php_uname("m") . "/local/etc/imspector");
define('IMSPECTOR_CONFIG', IMSPECTOR_ETC . '/imspector.conf');
function imspector_warn ($msg) { syslog(LOG_WARNING, "imspector: {$msg}"); }
@@ -542,4 +546,4 @@ function imspector_do_xmlrpc_sync($sync_to_ip, $password) {
}
}
-?> \ No newline at end of file
+?>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 82a737b0..bc2c3ff8 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -758,7 +758,7 @@
<website>http://www.imspector.org/</website>
<category>Network Management</category>
<maintainer>marcellocoutinho@gmail.com</maintainer>
- <version>20111108_2 pkg v 0.3.2</version>
+ <version>0.3.2</version>
<required_version>2.2</required_version>
<status>BETA</status>
<pkginfolink>https://doc.pfsense.org/index.php/IMSpector_package</pkginfolink>
@@ -766,6 +766,8 @@
<configurationfile>imspector.xml</configurationfile>
<depends_on_package_pbi>imspector-20111108_2-##ARCH##.pbi</depends_on_package_pbi>
<build_options>imspector_SET_FORCE=PLUGINS;imspector_UNSET_FORCE=IPFW</build_options>
+ <port_category>net-im</port_category>
+ <run_depends>sbin/imspector:net-im/imspector</run_depends>
<build_pbi>
<port>net-im/imspector</port>
</build_pbi>