Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5c28395ad43c14490bf1de91d20a9687fe9ca64e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5c28395ad43c14490bf1de91d20a9687fe9ca64e)
  • Date: Sun, 20 Jun 2010 15:54:06 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-drivers/nas/BUILD | 2 +-
audio-drivers/nas/DEPENDS | 1 -
audio-drivers/nas/DETAILS | 8 ++++----
audio-drivers/nas/HISTORY | 9 +++++++++
audio-drivers/nas/INSTALL | 2 +-
audio-drivers/nas/PRE_BUILD | 10 ++++------
audio-drivers/nas/conf.patch | 10 ++++++++++
audio-drivers/nas/init.d/nasd | 6 +-----
audio-drivers/nas/nas-1.9.1.src.tar.gz.sig | 0
audio-drivers/nas/nas-1.9.2.src.tar.gz.sig |binary
dev/null |binary
11 files changed, 30 insertions(+), 18 deletions(-)

New commits:
commit 5c28395ad43c14490bf1de91d20a9687fe9ca64e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nas: => 1.9.2

diff --git a/audio-drivers/nas/BUILD b/audio-drivers/nas/BUILD
index aae29ce..9e5a5a8 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 528433a..b9fe016 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 1ad37a5..45f9c49 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 316ff3c..a3637bf 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -1,3 +1,12 @@
+2010-06-20 Vlad Glagolev <stealth AT 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 AT 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 8a2241b..7e21383 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 7cc582c..28eb134 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 0000000..bc6979b
--- /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 baee4b6..482c236 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 dd43b9c..0000000
Binary files a/audio-drivers/nas/nas-1.9.1.src.tar.gz.sig and /dev/null differ
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 0000000..0780007
Binary files /dev/null and b/audio-drivers/nas/nas-1.9.2.src.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5c28395ad43c14490bf1de91d20a9687fe9ca64e), Vlad Glagolev, 06/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page