diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-23 14:31:49 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-23 14:32:38 -0300 |
| commit | 78c4191c4a1c37ce4e98740f8316b61d2a57b748 (patch) | |
| tree | 04ba12fa8f66e1ce357c6330768042b21ef7b833 | |
| parent | 84af67a6d227d59fad29bf1ec5b6752bf78e39e5 (diff) | |
| download | pfsense-packages-78c4191c4a1c37ce4e98740f8316b61d2a57b748.tar.gz pfsense-packages-78c4191c4a1c37ce4e98740f8316b61d2a57b748.tar.bz2 pfsense-packages-78c4191c4a1c37ce4e98740f8316b61d2a57b748.zip | |
Sanitize Avahi version, add depends and fix check for PBI only on 2.1 and 2.2
| -rw-r--r-- | config/avahi/avahi.inc | 12 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc index 554a647c..6d46df59 100644 --- a/config/avahi/avahi.inc +++ b/config/avahi/avahi.inc @@ -30,14 +30,10 @@ */ $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); -switch ($pfs_version) { - case "1.2": - case "2.0": - define('AVAHI_BASE', '/usr/local'); - break; - default: - define('AVAHI_BASE', '/usr/pbi/avahi-' . php_uname("m")); -} +if ($pfs_version == "2.1" || $pfs_version == "2.2") + define('AVAHI_BASE', '/usr/pbi/avahi-' . php_uname("m")); +else + define('AVAHI_BASE', '/usr/local'); function avahi_start() { mwexec_bg("/usr/local/etc/rc.d/avahi-daemon.sh start"); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index dde8cede..2eab0ff7 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -250,13 +250,15 @@ <website>http://www.avahi.org/</website> <descr>Avahi is a system which facilitates service discovery on a local network. This means that you can plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. This kind of technology is already found in Apple MacOS X (branded Rendezvous, Bonjour and sometimes Zeroconf) and is very convenient. Avahi is mainly based on Lennart Poettering's flexmdns mDNS implementation for Linux which has been discontinued in favour of Avahi.</descr> <category>Network Management</category> + <lib_depends>libavahi-core.so:net-avahi-app</lib_depends> + <port_category>net</port_category> <build_options>avahi_UNSET_FORCE=GTK;cairo_UNSET_FORCE=X11 XCB</build_options> <build_pbi> <port>net/avahi</port> <ports_after>net/avahi-app devel/dbus</ports_after> </build_pbi> <depends_on_package_pbi>avahi-0.6.31-##ARCH##.pbi</depends_on_package_pbi> - <version>0.6.31 pkg v1.09</version> + <version>v1.09</version> <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/avahi/avahi.xml</config_file> |