aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-02-12 09:56:21 -0500
committerjim-p <jimp@pfsense.org>2015-02-12 09:56:21 -0500
commit8b1b7e27646806c6b283f93a62fd59ed6083f97e (patch)
tree6643d78130104635478cdcb4fe4aea70a2a5ab07
parent13b36fee54dd7f7b5e59d0b338960e264077bf43 (diff)
downloadpfsense-packages-8b1b7e27646806c6b283f93a62fd59ed6083f97e.tar.gz
pfsense-packages-8b1b7e27646806c6b283f93a62fd59ed6083f97e.tar.bz2
pfsense-packages-8b1b7e27646806c6b283f93a62fd59ed6083f97e.zip
Fixup config path for lcdproc on 2.2
-rw-r--r--config/lcdproc-dev/lcdproc.inc7
-rw-r--r--config/lcdproc/lcdproc.inc7
-rw-r--r--pkg_config.10.xml4
-rw-r--r--pkg_config.8.xml4
-rw-r--r--pkg_config.8.xml.amd644
5 files changed, 18 insertions, 8 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index 73827721..fed2e7dc 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -32,7 +32,12 @@
require_once("service-utils.inc");
/* LCDproc */
define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh');
- define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) {
+ define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf');
+ } else {
+ define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ }
define('LCDPROC_HOST','localhost');
define('LCDPROC_PORT','13666');
define('LCDPROC_SERVICE_NAME','lcdproc');
diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc
index 760732df..321328bc 100644
--- a/config/lcdproc/lcdproc.inc
+++ b/config/lcdproc/lcdproc.inc
@@ -33,7 +33,12 @@
/* LCDproc */
define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh');
define('LCDPROC_CLIENT', '/tmp/lcdclient.sh');
- define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+ if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) {
+ define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf');
+ } else {
+ define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf');
+ }
define('LCDPROC_HOST','localhost');
define('LCDPROC_PORT','13666');
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 49344495..1ad51ac9 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -912,7 +912,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.7_2 pkg.v.1.0.1</version>
+ <version>lcdproc-0.5.7_2 pkg.v.1.0.2</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
@@ -930,7 +930,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.7_2 pkg v. 0.9.10</version>
+ <version>lcdproc-0.5.7_2 pkg v. 0.9.11</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>michele@nt2.it</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b98fe248..ad08641e 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1211,7 +1211,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.2</version>
<status>BETA</status>
<required_version>1.2.1</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
@@ -1229,7 +1229,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.11</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index d914a59e..37bdfe12 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1198,7 +1198,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.2</version>
<status>BETA</status>
<required_version>1.2.1</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
@@ -1216,7 +1216,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.11</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>