diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-28 16:38:46 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-28 16:38:46 -0300 |
| commit | 5226131a36d00bc83ca58bffa0ca0f0cd8c7b2de (patch) | |
| tree | 4f7dad01f1a8a6db0039621a00ca419ee843f963 /config | |
| parent | 0ee6e8d728a1ce6440bd5a08b779cb335633f80d (diff) | |
| download | pfsense-packages-5226131a36d00bc83ca58bffa0ca0f0cd8c7b2de.tar.gz pfsense-packages-5226131a36d00bc83ca58bffa0ca0f0cd8c7b2de.tar.bz2 pfsense-packages-5226131a36d00bc83ca58bffa0ca0f0cd8c7b2de.zip | |
Sanitize LCDproc and LCDproc-dev version, add port_category, run_depends and fix pbi checking
Diffstat (limited to 'config')
| -rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 2 | ||||
| -rw-r--r-- | config/lcdproc/lcdproc.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index fed2e7dc..ebe3cc57 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -33,7 +33,7 @@ /* LCDproc */ define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh'); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) { + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf'); } else { define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc index 321328bc..d4b4856a 100644 --- a/config/lcdproc/lcdproc.inc +++ b/config/lcdproc/lcdproc.inc @@ -34,7 +34,7 @@ define('LCDPROC_RCFILE', '/usr/local/etc/rc.d/lcdproc.sh'); define('LCDPROC_CLIENT', '/tmp/lcdclient.sh'); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if (($pfs_version == "2.2") && is_dir('/usr/pbi/lcdproc-' . php_uname('m'))) { + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('LCDPROC_CONFIG', '/usr/pbi/lcdproc-' . php_uname('m') . '/local/etc/LCDd.conf'); } else { define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); |