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 | |
| 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
| -rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 2 | ||||
| -rw-r--r-- | config/lcdproc/lcdproc.inc | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 10 |
3 files changed, 10 insertions, 4 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'); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 748f3e9b..4c61e0dc 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1022,13 +1022,16 @@ <descr>LCD display driver</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>lcdproc-0.5.7_2 pkg.v.1.0.2</version> + <version>1.0.2</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>seth.mos@dds.nl</maintainer> <depends_on_package_pbi>lcdproc-0.5.7_2-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/lcdproc/lcdproc.xml</config_file> <configurationfile>lcdproc.xml</configurationfile> + <port_category>sysutils</port_category> + <run_depends>bin/lcdproc:sysutils/lcdproc</run_depends> + <conflicts>LCDproc-dev</conflicts> <build_pbi> <port>sysutils/lcdproc</port> </build_pbi> @@ -1040,7 +1043,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.11</version> + <version>0.9.11</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>michele@nt2.it</maintainer> @@ -1048,6 +1051,9 @@ <depends_on_package_pbi>lcdproc-0.5.7_2-##ARCH##.pbi</depends_on_package_pbi> <config_file>https://packages.pfsense.org/packages/config/lcdproc-dev/lcdproc.xml</config_file> <configurationfile>lcdproc.xml</configurationfile> + <port_category>sysutils</port_category> + <run_depends>bin/lcdproc:sysutils/lcdproc</run_depends> + <conflicts>LCDproc</conflicts> <build_pbi> <port>sysutils/lcdproc</port> </build_pbi> |