network/avahi: Updated for version 0.6.25

5 files changed, 71 insertions, 21 deletions

diff --git a/network/avahi/README b/network/avahi/README
index 168084b8fe9fa..e7fc2df1e2538 100644
--- a/network/avahi/README
+++ b/network/avahi/README
@@ -6,7 +6,9 @@ necessary to minimize the traffic imposed on networks. This kind of
 technology is already found in Apple MacOS X (branded Rendezvous
 Bonjour and sometimes Zeroconf) and is very convenient.
 
-Requires libdaemon, which is also available at SlackBuilds.org.
+Required dependency libdaemon, which is available at SlackBuilds.org.
+Optional dependencies: mono and/or qt4 (also available at 
+SlackBuilds.org); enable with MONO=yes QT4=yes ./avahi.SlackBuild
 
 You will need to have an "avahi" user and group on the target system
 prior to installing the avahi package.  See README.SBo in this 
diff --git a/network/avahi/README.SBo b/network/avahi/README.SBo
index 6bd5c7b886c72..7ed36c711e6e8 100644
--- a/network/avahi/README.SBo
+++ b/network/avahi/README.SBo
@@ -4,12 +4,7 @@ First, be sure you have an "avahi" user and group.  Do this *before*
 you install the avahi package.  We recommend uid/gid of 214, but 
 adjust as needed for your system.  Something like this should suffice:
   # groupadd -g 214 avahi
-  # useradd -u 214 -g 214 -c "Avahi" -d /dev/null -s /bin/false avahi
-
-Ask DBUS to re-read its policies; this only has to be done once:
-	# /etc/rc.d/rc.messagbus reload
-	OR
-	# kill -HUP $(cat /var/run/dbus/pid)
+  # useradd -u 214 -g 214 -c "Avahi User" -d /dev/null -s /bin/false avahi
 
 Now start the Avahi daemon:
 	# /etc/rc.d/rc.avahidaemon start
@@ -17,3 +12,14 @@ Now start the Avahi daemon:
 Optionally start the unicast DNS configuration daemon:
 	# /etc/rc.d/rc.avahidnsconfd start
 
+You will need to start avahi at boot by adding the following 
+to your /etc/rc.d/rc.local and make them executable:
+        # Start avahidaemon
+	if [ -x /etc/rc.d/rc.avahidaemon ]; then
+	  /etc/rc.d/rc.avahidaemon start
+	fi
+        # Start avahidnsconfd
+	if [ -x /etc/rc.d/rc.avahidnsconfd ]; then
+	  /etc/rc.d/rc.avahidnsconfd start
+	fi
+
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index c7462975dd315..5887d37cdbb12 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for avahi
 
-# Copyright 2008 David Somero <dsomero@hotmail.com>
+# Copyright 2008 David Somero <dsomero@hotmail.com> Athens,TN USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avahi
-VERSION=0.6.22
+VERSION=0.6.25
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,6 +33,20 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Support for QT4
+if [ "${QT4:-no}" = "no" ]; then
+    QT4="--disable-qt4"
+else
+    QT4="--enable-qt4"
+fi
+
+# Support for mono
+if [ "${MONO:-no}" = "no" ]; then
+    MONO="--disable-mono"
+else
+    MONO="--enable-mono"
+fi
+
 if [ "${ARCH}" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -41,13 +55,29 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 fi
 
+warn_accounts() {
+  echo "  You must have an avahi user and group to run this script. "
+  echo "  Something like this should suffice for most systems: "
+  echo "      # groupadd -g 214 avahi"
+  echo "      # useradd -u 214 -g 214 -c "Avahi" -d /dev/null -s /bin/false avahi"
+  exit 1
+}
+
+# Bail if user and/or group isn't valid on your system
+if ! grep -q "^avahi:" /etc/passwd; then
+  warn_accounts
+fi 
+if ! grep -q "^avahi:" /etc/group ; then
+  warn_accounts
+fi 
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP 
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
@@ -61,10 +91,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
-  --disable-qt4 \
-  --disable-mono \
   --disable-monodoc \
   --disable-autoipd \
+  --enable-python-dbus \
+  --enable-pygtk\
+  --enable-glib \
+  --enable-dbus \
+  --enable-python \
+  --enable-gtk \
+  --enable-qt3 \
   --enable-core-docs \
   --enable-compat-howl \
   --enable-compat-libdns_sd \
@@ -75,28 +110,32 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-distro=slackware \
   --program-prefix= \
   --program-suffix= \
+  $MONO \
+  $QT4 \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new
 mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
index 73375f936ac01..ed54b54e8c144 100644
--- a/network/avahi/avahi.info
+++ b/network/avahi/avahi.info
@@ -1,8 +1,8 @@
 PRGNAM="avahi"
-VERSION="0.6.22"
+VERSION="0.6.25"
 HOMEPAGE="http://avahi.org/"
-DOWNLOAD="http://avahi.org/download/avahi-0.6.22.tar.gz"
-MD5SUM="c84b1a8a23126e188426728710414dc8"
+DOWNLOAD="http://avahi.org/download/avahi-0.6.25.tar.gz"
+MD5SUM="a83155a6e29e3988f07e5eea3287b21e"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"
diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh
index 573ecf08fa3e1..a6a2efd52c37b 100644
--- a/network/avahi/doinst.sh
+++ b/network/avahi/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -36,3 +34,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+# Reload messagebus service
+if [ -x etc/rc.d/rc.messagebus ]; then
+  chroot . /etc/rc.d/rc.messagebus reload
+fi
+