nas: => 1.9.2

10 files changed, 30 insertions, 18 deletions

diff --git a/audio-drivers/nas/BUILD b/audio-drivers/nas/BUILD
index aae29ce4e6..9e5a5a82d6 100755
--- a/audio-drivers/nas/BUILD
+++ b/audio-drivers/nas/BUILD
@@ -1,6 +1,6 @@
 make World
 
-if [[ "$NAS_STARTSERVER" = 'y' ]] ; then
+if [[ $NAS_STARTSERVER == y ]]; then
   make WORLDOPTS='-k CDEBUGFLAGS="$(CDEBUGFLAGS) -DSTARTSERVER"' World
 else
   make World
diff --git a/audio-drivers/nas/DEPENDS b/audio-drivers/nas/DEPENDS
index 528433aa0c..b9fe0161e1 100755
--- a/audio-drivers/nas/DEPENDS
+++ b/audio-drivers/nas/DEPENDS
@@ -1,5 +1,4 @@
 depends xorg-server &&
-depends rman       &&
 depends gccmakedep &&
 depends libxt &&
 depends libsm &&
diff --git a/audio-drivers/nas/DETAILS b/audio-drivers/nas/DETAILS
index 1ad37a596c..45f9c4946c 100755
--- a/audio-drivers/nas/DETAILS
+++ b/audio-drivers/nas/DETAILS
@@ -1,8 +1,8 @@
            SPELL=nas
-if [[ "$NAS_DEV" = "y" ]]; then
+if [[ $NAS_DEV == y ]]; then
          VERSION=1.9a
 else
-         VERSION=1.9.1
+         VERSION=1.9.2
 fi
           SOURCE=$SPELL-$VERSION.src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -12,9 +12,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          ENTERED=20030315
       LICENSE[0]=GPL
         KEYWORDS="drivers audio"
-      PATCHLEVEL=1
            SHORT='The Network Audio System (NAS)'
 cat << EOF
-The Network Audio System is a network transparent, client/server audio transport system.
+The Network Audio System is a network transparent, client/server audio
+transport system.
 It can be described as the audio equivalent of an X server.
 EOF
diff --git a/audio-drivers/nas/HISTORY b/audio-drivers/nas/HISTORY
index 316ff3c4e9..a3637bf115 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -1,3 +1,12 @@
+2010-06-20 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated stable to 1.9.2; fixed long description wrap
+	* DEPENDS: removed deprecated dependencies
+	* PRE_BUILD: removed dirty unneeded hacks, apply the patch
+	* BUILD: cleaned up
+	* INSTALL: quoting paths
+	* conf.patch: added, to not install extra config
+	* init.d/nasd: fixed program path
+
 2009-01-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* PRE_BUILD: run xmkmf
 	* DEPENDS: check to see if xorg-cf-files is at patchlevel=1
diff --git a/audio-drivers/nas/INSTALL b/audio-drivers/nas/INSTALL
index 8a2241b2e5..7e21383fd5 100755
--- a/audio-drivers/nas/INSTALL
+++ b/audio-drivers/nas/INSTALL
@@ -1,4 +1,4 @@
 make  install      &&
 make  install.man  &&
 
-install_config_file  server/nasd.conf.eg  $INSTALL_ROOT/etc/nasd.conf
+install_config_file  server/nasd.conf.eg  "$INSTALL_ROOT/etc/nasd.conf"
diff --git a/audio-drivers/nas/PRE_BUILD b/audio-drivers/nas/PRE_BUILD
index 7cc582cd8e..28eb134ca5 100755
--- a/audio-drivers/nas/PRE_BUILD
+++ b/audio-drivers/nas/PRE_BUILD
@@ -1,8 +1,6 @@
-default_pre_build       &&
-cd ${SOURCE_DIRECTORY}  &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/conf.patch" &&
 
-for FILE in $(grep -l -R X11R6 *)
-do
-  sed -i "s:/X11R6::g" ${FILE}
-done  &&
 xmkmf
diff --git a/audio-drivers/nas/conf.patch b/audio-drivers/nas/conf.patch
new file mode 100644
index 0000000000..bc6979bf9b
--- /dev/null
+++ b/audio-drivers/nas/conf.patch
@@ -0,0 +1,10 @@
+--- server/Imakefile.orig	2009-02-26 04:16:01.000000000 +0300
++++ server/Imakefile	2010-06-21 00:39:21.898764809 +0400
+@@ -222,7 +222,6 @@
+ #else
+ InstallManPage(nasd.conf,$(FILEMANDIR))
+ #endif
+-InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
+ 
+ #else /* CanBuildAuServer */
+ 
diff --git a/audio-drivers/nas/init.d/nasd b/audio-drivers/nas/init.d/nasd
index baee4b6dfd..482c236e7c 100755
--- a/audio-drivers/nas/init.d/nasd
+++ b/audio-drivers/nas/init.d/nasd
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ -x "/usr/bin/nasd" ]]; then
-	PROGRAM="/usr/bin/nasd"
-elif [[ -x "/usr/X11R6/bin/nasd" ]]; then
-	PROGRAM="/usr/X11R6/bin/nasd"
-fi
+PROGRAM="/usr/bin/nasd"
 RUNLEVEL=3
 NEEDS="+remote_fs alsa"
 
diff --git a/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig b/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig
deleted file mode 100644
index dd43b9cc5d..0000000000
--- a/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig
+++ /dev/null
diff --git a/audio-drivers/nas/nas-1.9.2.src.tar.gz.sig b/audio-drivers/nas/nas-1.9.2.src.tar.gz.sig
new file mode 100644
index 0000000000..0780007cb4
--- /dev/null
+++ b/audio-drivers/nas/nas-1.9.2.src.tar.gz.sig