summaryrefslogtreecommitdiffstats
path: root/audio-drivers/nas
diff options
context:
space:
mode:
authorIsmael Luceno2014-11-24 16:19:45 -0300
committerIsmael Luceno2014-11-24 16:19:45 -0300
commitb2be88ddadfa03c5fa53350e5f614b875ddc4a3b (patch)
tree7476b00a39fe6f4552fca7dd11d2dbfb6a6a6298 /audio-drivers/nas
parent1f15d37610f15684c9b933eec2d4b476716a487c (diff)
nas: Add proper branch selection, and replace dev version with scm
Diffstat (limited to 'audio-drivers/nas')
-rwxr-xr-xaudio-drivers/nas/DETAILS17
-rw-r--r--audio-drivers/nas/HISTORY2
-rwxr-xr-xaudio-drivers/nas/PREPARE3
-rwxr-xr-xaudio-drivers/nas/PRE_BUILD4
4 files changed, 20 insertions, 6 deletions
diff --git a/audio-drivers/nas/DETAILS b/audio-drivers/nas/DETAILS
index 201ad7bb0f..067120ead6 100755
--- a/audio-drivers/nas/DETAILS
+++ b/audio-drivers/nas/DETAILS
@@ -1,13 +1,21 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=nas
-if [[ $NAS_DEV == y ]]; then
- VERSION=1.9a
-else
+case "$NAS_BRANCH" in
+stable)
VERSION=1.9.4
SOURCE_HASH=sha512:3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
-fi
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+;;
+scm)
+ VERSION=$(get_scm_version)
+ SOURCE=$SPELL-git.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://git.code.sf.net/p/$SPELL/$SPELL.git
+ SOURCE_IGNORE=volatile
+;;
+esac
WEB_SITE=http://radscan.com/nas.html
ENTERED=20030315
LICENSE[0]=GPL
@@ -16,5 +24,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
cat << EOF
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 77bee8e44e..05c379fa93 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -1,5 +1,7 @@
2014-11-24 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated NAS_DEV=n to 1.9.4
+ * DETAILS, PREPARE, PRE_BUILD: Added proper branch selection, and
+ replace dev version with scm
2010-06-26 Vlad Glagolev <stealth@sourcemage.org>
* INSTALL: fixed man installation dir; install init config
diff --git a/audio-drivers/nas/PREPARE b/audio-drivers/nas/PREPARE
index 742e9fb41c..ba634708fe 100755
--- a/audio-drivers/nas/PREPARE
+++ b/audio-drivers/nas/PREPARE
@@ -1 +1,2 @@
-config_query NAS_DEV "Do you want to use the development version of NAS?" n
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/nas/PRE_BUILD b/audio-drivers/nas/PRE_BUILD
index 28eb134ca5..1d81810aba 100755
--- a/audio-drivers/nas/PRE_BUILD
+++ b/audio-drivers/nas/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SPELL_DIRECTORY/conf.patch" &&
+if [[ "$NAS_BRANCH" != scm ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/conf.patch"
+fi &&
xmkmf