aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-27 16:50:02 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-27 16:50:02 -0300
commit9a8da001013fca6fa9c66591a7f57045ade3d96e (patch)
treed6a97ac1bb200993a506d60c30891fd0fde1651e
parent533bc184bc5732f2e8e75157d4104da392ac48ae (diff)
downloadpfsense-packages-9a8da001013fca6fa9c66591a7f57045ade3d96e.tar.gz
pfsense-packages-9a8da001013fca6fa9c66591a7f57045ade3d96e.tar.bz2
pfsense-packages-9a8da001013fca6fa9c66591a7f57045ade3d96e.zip
Sanitize varnish version, add port_category, run_depends and fix pbi checking
-rw-r--r--config/varnish3/varnish.inc2
-rw-r--r--pkg_config.10.xml4
2 files changed, 4 insertions, 2 deletions
diff --git a/config/varnish3/varnish.inc b/config/varnish3/varnish.inc
index 50b37990..5df8052b 100644
--- a/config/varnish3/varnish.inc
+++ b/config/varnish3/varnish.inc
@@ -35,7 +35,7 @@
$shortcut_section = "varnish";
$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-if (is_dir('/usr/pbi/varnish-' . php_uname("m"))) {
+if ($pfs_version == "2.1" || $pfs_version == "2.2") {
define('VARNISH_LOCALBASE', '/usr/pbi/varnish-' . php_uname("m"));
} else {
define('VARNISH_LOCALBASE','/usr/local');
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 4686bc74..b8686a59 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -631,12 +631,14 @@
<website>http://varnish-cache.org</website>
<pkginfolink>https://doc.pfsense.org/index.php/Varnish_package</pkginfolink>
<category>Services</category>
- <version>3.0.5_3 pkg v.0.2.4</version>
+ <version>0.2.4</version>
<status>RC</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/varnish3/varnish_backends.xml</config_file>
<configurationfile>varnish_backends.xml</configurationfile>
<depends_on_package_pbi>varnish-3.0.5_3-##ARCH##.pbi</depends_on_package_pbi>
+ <port_category>www</port_category>
+ <run_depends>bin/varnishadm:www/varnish</run_depends>
<build_pbi>
<port>www/varnish</port>
<ports_after>lang/gcc</ports_after>