aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/avahi/avahi.inc24
-rw-r--r--pkg_config.10.xml1
2 files changed, 16 insertions, 9 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc
index 0bc181ec..e2cb7b6e 100644
--- a/config/avahi/avahi.inc
+++ b/config/avahi/avahi.inc
@@ -33,10 +33,16 @@ $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');
+ define('AVAHI_BASE', '/usr/local');
+ define('AVAHI_LOCALBASE', AVAHI_BASE);
+ break;
+ case "2.1":
+ define('AVAHI_BASE', '/usr/pbi/avahi-' . php_uname("m"));
+ define('AVAHI_LOCALBASE', AVAHI_BASE);
break;
default:
define('AVAHI_BASE', '/usr/pbi/avahi-' . php_uname("m"));
+ define('AVAHI_LOCALBASE', AVAHI_BASE . '/local');
}
function avahi_start() {
@@ -56,8 +62,8 @@ function avahi_install() {
$archive = (substr(trim(file_get_contents("/etc/version")),0,1) == "1") ? "avahi.tar.gz" : "";
// Extract out libraries and avahi-daemon
if(!empty($archive) && file_exists("/root/{$archive}")) {
- exec("mkdir -p " . AVAHI_BASE . "/etc/avahi/services/");
- exec("mv " . AVAHI_BASE . "/etc/avahi/*.service " . AVAHI_BASE . "/etc/avahi/services/");
+ exec("mkdir -p " . AVAHI_LOCALBASE . "/etc/avahi/services/");
+ exec("mv " . AVAHI_LOCALBASE . "/etc/avahi/*.service " . AVAHI_LOCALBASE . "/etc/avahi/services/");
exec("/usr/bin/tar xzPUf /root/{$archive} -C /");
unlink("/root/{$archive}");
// Make sure everthing was extracted
@@ -158,8 +164,8 @@ rlimit-nproc=3
EOF;
/* Write out .conf file */
- safe_mkdir(AVAHI_BASE . "/etc/avahi");
- $fd = fopen(AVAHI_BASE . "/etc/avahi/avahi-daemon.conf", "w");
+ safe_mkdir(AVAHI_LOCALBASE . "/etc/avahi");
+ $fd = fopen(AVAHI_LOCALBASE . "/etc/avahi/avahi-daemon.conf", "w");
fwrite($fd, $avahiconfig);
fclose($fd);
/* Write out rc.d startup file */
@@ -169,18 +175,18 @@ EOF;
$start .= " mount -t procfs procfs /proc\n";
$start .= "fi\n";
$start .= "/usr/bin/killall avahi-daemon\n";
- if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) {
+ if (file_exists(AVAHI_LOCALBASE . "/etc/rc.d/dbus")) {
$start .= "/usr/bin/killall dbus-daemon\n";
$start .= "rm /var/run/dbus/dbus.pid\n";
- $start .= AVAHI_BASE . "/etc/rc.d/dbus onestart\n";
+ $start .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestart\n";
}
$start .= "sleep 5\n";
$start .= AVAHI_BASE . "/sbin/avahi-daemon -D\n";
$start .= "/etc/rc.conf_mount_ro\n";
$stop = "/usr/bin/killall avahi-daemon\n";
- if (file_exists(AVAHI_BASE . "/etc/rc.d/dbus")) {
- $stop .= AVAHI_BASE . "/etc/rc.d/dbus onestop\n";
+ if (file_exists(AVAHI_LOCALBASE . "/etc/rc.d/dbus")) {
+ $stop .= AVAHI_LOCALBASE . "/etc/rc.d/dbus onestop\n";
$stop .= "rm /var/run/dbus/dbus.pid\n";
}
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 070821cf..d545e629 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -196,6 +196,7 @@
<build_options>avahi_UNSET_FORCE=GTK;cairo_UNSET_FORCE=X11 XCB</build_options>
<build_pbi>
<port>net/avahi</port>
+ <ports_after>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.05</version>