Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-extra

1 files changed, 12 insertions, 17 deletions

diff --git a/avahi-server/Pkgfile b/avahi-server/Pkgfile
index b35710acb..899ee6860 100644
--- a/avahi-server/Pkgfile
+++ b/avahi-server/Pkgfile
@@ -2,17 +2,22 @@
 # URL: http://www.avahi.org/
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libdaemon,intltool,dbus,dbus-python
-# Run on: libdaemon,dbus,dbus-python
+# Depends on: libdaemon, intltool, dbus, dbus-python, avahi
+# Run on: libdaemon,dbus,dbus-python,avahi
 
 name=avahi-server
-version=0.6.30
-release=3
-source=(http://www.avahi.org/download/avahi-$version.tar.gz
-	avahid)
+version=0.6.31
+release=1
+source=(http://www.avahi.org/download/avahi-$version.tar.gz)
 
 build() {
-	cd avahi-$version
+	source /etc/blfs-bootscripts
+	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+	tar xf $scripts-$scriptsversion.tar.bz2
+	cd $scripts-$scriptsversion
+	make DESTDIR=$PKG install-avahi
+
+	cd ../avahi-$version
 	PYTHON=python2 ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -41,15 +46,5 @@ build() {
 		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
-
-	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}}}
 }