5 files changed, 19 insertions, 37 deletions
diff --git a/network/nss-mdns/README b/network/nss-mdns/README
index 75a811a1bd..7a73bda786 100644
--- a/network/nss-mdns/README
+++ b/network/nss-mdns/README
@@ -4,15 +4,7 @@ Multicast DNS (a.k.a. Zeroconf, a.k.a. Apple Rendezvous, a.k.a Apple Bonjour).
 This effectively allows name resolution by common Unix/Linux programs in the
 ad-hoc mDNS domain .local.
 
-By default nss-mdns tries to contact a running avahi-daemon for resolving
-host names and addresses and making use of its superior record caching.
-Optionally nss-mdns can be compiled with a mini mDNS stack that can be
-used to resolve host names without a local Avahi installation. Both Avahi
-support and this mini mDNS stack are optional, however at least one of the
-needs to be enabled. If both are enabled a connection to Avahi is tried first,
-and if that fails the mini mDNS stack is used.  This build script enables 
-both, but the mini mDNS stack will be used on a default Slackware install,
-as Avahi is not included.
-
 To test, the following command should return a mapping for the remote host:
   getent hosts <hostname>.local
+
+This requires avahi.
diff --git a/network/nss-mdns/doinst.sh b/network/nss-mdns/doinst.sh
index 66a1051516..b38c5e155d 100644
--- a/network/nss-mdns/doinst.sh
+++ b/network/nss-mdns/doinst.sh
@@ -10,7 +10,5 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-
 config etc/mdns.allow.new
 config etc/nsswitch.conf-mdns.new
-
diff --git a/network/nss-mdns/nss-mdns.SlackBuild b/network/nss-mdns/nss-mdns.SlackBuild
index 3420a18c55..f87775b83f 100644
--- a/network/nss-mdns/nss-mdns.SlackBuild
+++ b/network/nss-mdns/nss-mdns.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for nss-mdns
 # Written by Menno Duursma <druiloor@zonnet.nl>
+# Maintained by Robby Workman <rw@rlworkman.net>
 
 PRGNAM=nss-mdns
 VERSION=0.10
@@ -52,16 +53,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Options that may be of interest:
-#
-#  --enable-avahi          Enable lookups with Avahi (default=yes)
-#  --enable-legacy         Enable legacy unicast mDNS lookups when Avahi isn't
-#                          available (default=no)
-#  --enable-search-domains Honour search domains from /etc/resolv.conf
-#                          (default=no)
-#
-# install into /lib as /usr maybe unavailable in bootstrapping
- 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -69,24 +60,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-legacy
+  --disable-legacy \
+  --enable-avahi \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [A-Z][A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION/html
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/etc 
 cat $CWD/mdns.allow > $PKG/etc/mdns.allow.new
 cat $CWD/nsswitch.conf-mdns > $PKG/etc/nsswitch.conf-mdns.new
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a [A-Z][A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION/html
+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
diff --git a/network/nss-mdns/nss-mdns.info b/network/nss-mdns/nss-mdns.info
index e3704516cf..0352253b4e 100644
--- a/network/nss-mdns/nss-mdns.info
+++ b/network/nss-mdns/nss-mdns.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz"
 MD5SUM="03938f17646efbb50aa70ba5f99f51d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Menno Duursma"
-EMAIL="druiloor@zonnet.nl"
-APPROVED="rworkman,BP{k}"
+MAINTAINER="Robby Workman"
+EMAIL="rw@rlworkman.net"
+APPROVED="BP{k}"
diff --git a/network/nss-mdns/slack-desc b/network/nss-mdns/slack-desc
index 0722dad437..e23914582c 100644
--- a/network/nss-mdns/slack-desc
+++ b/network/nss-mdns/slack-desc
@@ -7,13 +7,13 @@
 
         |-----handy-ruler------------------------------------------------------|
 nss-mdns: NSS-mDNS (Multicast DNS host name resolution NSS module)
-nss-mdns: 
+nss-mdns:
 nss-mdns: nss-mdns is a plugin for the GNU Name Service Switch (NSS)
 nss-mdns: functionality of the GNU C Library (glibc) which provides
 nss-mdns: host name resolution via via Multicast DNS (a.k.a. Zeroconf,
 nss-mdns: a.k.a. Apple Rendezvous, a.k.a Apple Bonjour). This effectively
 nss-mdns: allows name resolution by common Unix/Linux programs in the ad-hoc
 nss-mdns: ad-hoc mDNS domain .local.
-nss-mdns: 
-nss-mdns: nss-mdns is maintained by Lennart Poettering
+nss-mdns:
+nss-mdns:
 nss-mdns: