aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-27 10:51:56 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-27 10:51:56 -0300
commit7a4ab0bd9e8fa424eeafa6c76677d324df4cd6d2 (patch)
tree4dee008a15d52b759793730b02622850fd5dd880
parent942f489ef647252418d9b78440b3b6403de86df4 (diff)
downloadpfsense-packages-7a4ab0bd9e8fa424eeafa6c76677d324df4cd6d2.tar.gz
pfsense-packages-7a4ab0bd9e8fa424eeafa6c76677d324df4cd6d2.tar.bz2
pfsense-packages-7a4ab0bd9e8fa424eeafa6c76677d324df4cd6d2.zip
Sanitize lightsquid version, add port_category, run_depends and fix pbi checking
-rw-r--r--config/lightsquid/lightsquid.inc12
-rw-r--r--pkg_config.10.xml4
2 files changed, 9 insertions, 7 deletions
diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc
index 054713a1..9e51913f 100644
--- a/config/lightsquid/lightsquid.inc
+++ b/config/lightsquid/lightsquid.inc
@@ -41,15 +41,15 @@ else update_log("File 'squid.inc' not found.");
$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
switch ($pfs_version) {
- case "1.2":
- case "2.0":
- define('LIGHTSQUID_BASE','/usr/local');
- break;
case "2.1":
define('LIGHTSQUID_BASE', '/usr/pbi/lightsquid-' . php_uname("m"));
break;
- default:
+ case "2.2":
define('LIGHTSQUID_BASE', '/usr/pbi/lightsquid-' . php_uname("m") . '/local');
+ break;
+ default:
+ define('LIGHTSQUID_BASE','/usr/local');
+ break;
}
define ('CMD_PKGDELETE', 'pkg_delete lightsquid-1.7.1');
@@ -471,4 +471,4 @@ function ls_cleanup_bad_link($link) {
}
}
-?> \ No newline at end of file
+?>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index cee7d275..661b1c42 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -562,8 +562,10 @@
<descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr>
<website>http://lightsquid.sf.net/</website>
<category>Network Report</category>
- <version>1.8.2 pkg v.2.36</version>
+ <version>2.36</version>
<maintainer>dv_serg@mail.ru</maintainer>
+ <port_category>www</port_category>
+ <run_depends>libexec/lightsquid/ip2name.list:www/lightsquid</run_depends>
<depends_on_package_pbi>lightsquid-1.8_2-##ARCH##.pbi</depends_on_package_pbi>
<build_pbi>
<ports_before>graphics/gd graphics/p5-GD</ports_before>