3 files changed, 49 insertions, 35 deletions
diff --git a/audio/nas/nas.SlackBuild b/audio/nas/nas.SlackBuild
index 25ac255e9f..73543638bd 100644
--- a/audio/nas/nas.SlackBuild
+++ b/audio/nas/nas.SlackBuild
@@ -22,13 +22,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nas
-VERSION=${VERSION:-1.9.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.9.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -56,7 +56,7 @@ fi
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG/etc/rc.d $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz
@@ -69,7 +69,20 @@ find -L . \
  -exec chmod 644 {} \;
 
 xmkmf
-make World
+cd config
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux
+cd ..
+
+make CFLAGS="$SLKCFLAGS" World
 make install.man install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -78,7 +91,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-install -D -m0755 $CWD/rc.nasd.new $PKG/etc/rc.d/rc.nasd.new
+cat $CWD/rc.nasd.new > $PKG/etc/rc.d/rc.nasd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/audio/nas/nas.info b/audio/nas/nas.info
index 72eacf1384..0d928eb4f4 100644
--- a/audio/nas/nas.info
+++ b/audio/nas/nas.info
@@ -1,8 +1,8 @@
 PRGNAM="nas"
-VERSION="1.9.3"
+VERSION="1.9.4"
 HOMEPAGE="http://radscan.com/nas.html"
-DOWNLOAD="http://downloads.sourceforge.net/nas/nas-1.9.3.src.tar.gz"
-MD5SUM="ecd01a3b4e17a9d464efa83a03618025"
+DOWNLOAD="http://downloads.sourceforge.net/nas/nas-1.9.4.src.tar.gz"
+MD5SUM="dac0e6cd3e5d6a37ae1dff364236a752"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/audio/nas/rc.nasd.new b/audio/nas/rc.nasd.new
index 182b9c14c5..0f3ae84cb6 100644
--- a/audio/nas/rc.nasd.new
+++ b/audio/nas/rc.nasd.new
@@ -1,38 +1,39 @@
 #!/bin/sh
 
 start() {
-   if [ -x /usr/bin/nasd ]; then
-        if [ -n "$(pgrep nasd)" ]; then
-            echo "Starting nasd /usr/bin/nasd"
-            /usr/bin/nasd :0 -aa -b 
-        else
-            echo "nasd already running"
-            exit 1
-        fi
-   fi
+	if [ -x /usr/bin/nasd ]; then
+		if [ -n "$(pgrep -x nasd)" ]; then
+			echo "Starting nasd /usr/bin/nasd"
+			/usr/bin/nasd :0 -aa -b
+		else
+			echo "nasd is already running"
+			exit 1
+		fi
+	fi
 }
 
 stop() {
-    killall nasd
+	pkill -x nasd
 }
 
 restart() {
-   stop
-   sleep 1
-   start
+	stop
+	sleep 1
+	start
 }
 
 case "$1" in
-   'start')
-      start
-      ;;
-   'stop')
-      stop
-      ;;
-   'restart')
-      restart
-      ;;
-   *)
-      echo "usage $0 start|stop|restart" ;;
+	'start')
+		start
+		;;
+	'stop')
+		stop
+		;;
+	'restart')
+		restart
+		;;
+	*)
+		echo "usage $0 start|stop|restart"
+		;;
 esac