avahi-server 0.6.30-2 correction port

6 files changed, 45 insertions, 56 deletions

diff --git a/extra/avahi-server/.footprint.i686 b/extra/avahi-server/.footprint.i686
index a15fa3e87..37c10e0dc 100644
--- a/extra/avahi-server/.footprint.i686
+++ b/extra/avahi-server/.footprint.i686
@@ -9,12 +9,13 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/avahi
 -rwxr-xr-x	root/root	etc/rc.d/init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+drwxr-xr-x	root/root	etc/rc.d/rc2.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
@@ -23,19 +24,12 @@ drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/systemd/
-drwxr-xr-x	root/root	lib/systemd/system/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
 -rwxr-xr-x	root/root	usr/sbin/avahi-daemon
 -rwxr-xr-x	root/root	usr/sbin/avahi-dnsconfd
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/dbus-1/
-drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
-drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
-drwxr-xr-x	root/root	usr/share/gir-1.0/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/avahi-autoipd.8.gz
diff --git a/extra/avahi-server/.footprint.x86_64 b/extra/avahi-server/.footprint.x86_64
index a15fa3e87..37c10e0dc 100644
--- a/extra/avahi-server/.footprint.x86_64
+++ b/extra/avahi-server/.footprint.x86_64
@@ -9,12 +9,13 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/avahi
 -rwxr-xr-x	root/root	etc/rc.d/init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+drwxr-xr-x	root/root	etc/rc.d/rc2.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
@@ -23,19 +24,12 @@ drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/systemd/
-drwxr-xr-x	root/root	lib/systemd/system/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
 -rwxr-xr-x	root/root	usr/sbin/avahi-daemon
 -rwxr-xr-x	root/root	usr/sbin/avahi-dnsconfd
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/dbus-1/
-drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
-drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
-drwxr-xr-x	root/root	usr/share/gir-1.0/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/avahi-autoipd.8.gz
diff --git a/extra/avahi-server/.md5sum.i686 b/extra/avahi-server/.md5sum.i686
index fdd316db4..fd08362a3 100644
--- a/extra/avahi-server/.md5sum.i686
+++ b/extra/avahi-server/.md5sum.i686
@@ -1,3 +1,2 @@
 e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
 09877d8619de924d02bc018bcef21150  avahid
-42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/extra/avahi-server/.md5sum.x86_64 b/extra/avahi-server/.md5sum.x86_64
index fdd316db4..fd08362a3 100644
--- a/extra/avahi-server/.md5sum.x86_64
+++ b/extra/avahi-server/.md5sum.x86_64
@@ -1,3 +1,2 @@
 e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
 09877d8619de924d02bc018bcef21150  avahid
-42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/extra/avahi-server/Pkgfile b/extra/avahi-server/Pkgfile
index 137ca2eaa..f8e8262f3 100644
--- a/extra/avahi-server/Pkgfile
+++ b/extra/avahi-server/Pkgfile
@@ -2,51 +2,54 @@
 # URL: http://www.avahi.org/
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: qt, gtk, libdaemon, pygtk, dbus-python
-# Run on: 
+# Depends on: libdaemon
+# Run on: libdaemon
 
 name=avahi-server
 version=0.6.30
-release=1
-source=(http://www.avahi.org/download/avahi-$version.tar.gz\
-	avahid network-wired.png)
+release=2
+source=(http://www.avahi.org/download/avahi-$version.tar.gz
+	avahid)
 
 build() {
 	cd avahi-$version
 	PYTHON=python2 ./configure \
-                --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var/lib \
-                --disable-gtk3 \
-                --disable-qt3 \
-                --disable-monodoc \
-                --disable-doxygen-doc \
-                --disable-xmltoman \
-                --disable-mono \
-                --enable-compat-libdns_sd \
-                --enable-compat-howl \
-                --with-distro=lfs \
-                --with-avahi-priv-access-group=network \
-                --with-autoipd-user=avahi \
-                --with-autoipd-group=avahi \
-                --with-systemdsystemunitdir=/lib/systemd/system \
-		--enable-autoipd 
-	make
-	make DESTDIR=$PKG install
-        mkdir -v -p $PKG/etc/rc.d/init.d
-        mkdir -v -p $PKG/etc/rc.d/rc{0,1,3,4,5,6}.d
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--enable-autoipd \
+		--disable-gtk3 \
+		--disable-gtk \
+		--disable-pygtk \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-monodoc \
+		--disable-doxygen-doc \
+		--disable-xmltoman \
+		--disable-mono \
+		--enable-compat-libdns_sd \
+		--enable-compat-howl \
+		--with-distro=lfs \
+		--with-avahi-priv-access-group=network \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/lib/systemd/system
+	for i in avahi-common avahi-core; do
+		make -C $i
+	done
+	for i in avahi-autoipd avahi-daemon avahi-dnsconfd man; do
+		make -C $i
+		make -C $i DESTDIR=$PKG install
+	done
+
+	mkdir -p $PKG/etc/rc.d/{init.d,rc{0,1,2,3,4,5,6}.d}
         install -D -m755 ../avahid $PKG/etc/rc.d/init.d/avahid
 
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc3.d/S43avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc5.d/S43avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc4.d/S43avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc0.d/K13avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc1.d/K13avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc6.d/K13avahid
-	rm -r $PKG/{etc/dbus-1,usr/{include,bin,lib,share/{avahi,locale,applications,man/man{1,5}}}}
-	rm $PKG/lib/systemd/system/avahi-*
-	rm $PKG/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.*
-	rm $PKG/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
-	rm $PKG/usr/share/gir-1.0/Avahi*
+	for i in 3 4 5; do
+		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/S43avahid
+	done
+	for i in 0 1 2 6; do
+		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/K13avahid
+	done
+	rm -rf $PKG/{lib,etc/dbus-1,usr/share/{avahi,dbus-1,man/man{1,5}}}
 }
-  
diff --git a/extra/avahi-server/network-wired.png b/extra/avahi-server/network-wired.png
deleted file mode 100644
index 227d0678a..000000000
--- a/extra/avahi-server/network-wired.png
+++ /dev/null