diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-28 09:17:53 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-28 09:17:53 -0300 |
| commit | 3546bfbf96e59a7b1bc52b9265c32af02285d506 (patch) | |
| tree | a3c7009915c6ab6ecf81a0dac1551ff513c08f6a | |
| parent | 173f48bf08482c9b6c919f7275e6f0cc2b402944 (diff) | |
| download | pfsense-packages-3546bfbf96e59a7b1bc52b9265c32af02285d506.tar.gz pfsense-packages-3546bfbf96e59a7b1bc52b9265c32af02285d506.tar.bz2 pfsense-packages-3546bfbf96e59a7b1bc52b9265c32af02285d506.zip | |
Sanitize imspector version, add run_depends and fix pbi checking
| -rw-r--r-- | config/nut/nut.inc | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config/nut/nut.inc b/config/nut/nut.inc index aa0bbe13..9ba942ab 100644 --- a/config/nut/nut.inc +++ b/config/nut/nut.inc @@ -36,10 +36,10 @@ define('NUT_RCFILE', '/usr/local/etc/rc.d/nut.sh'); $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - if ($pfs_version == "2.0") { - define('NUT_DIR','/usr/local/etc/nut'); - } else { + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('NUT_DIR', '/usr/pbi/nut-' . php_uname("m") . '/etc/nut'); + } else { + define('NUT_DIR','/usr/local/etc/nut'); } function nut_notice ($msg) { syslog(LOG_NOTICE, "nut: {$msg}"); return; } diff --git a/pkg_config.10.xml b/pkg_config.10.xml index bc2c3ff8..378eefe4 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -777,13 +777,14 @@ <descr>Network UPS Tools</descr> <website>http://www.networkupstools.org/</website> <category>Network Management</category> - <version>2.7.2_6 pkg 2.0.4</version> + <version>2.0.4</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>rswagoner@gmail.com</maintainer> <config_file>https://packages.pfsense.org/packages/config/nut/nut.xml</config_file> <configurationfile>nut.xml</configurationfile> <depends_on_package_pbi>nut-2.7.2_6-##ARCH##.pbi</depends_on_package_pbi> + <run_depends>bin/upsc:sysutils/nut</run_depends> <build_pbi> <port>sysutils/nut</port> </build_pbi> |