Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b2be88ddadfa03c5fa53350e5f614b875ddc4a3b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b2be88ddadfa03c5fa53350e5f614b875ddc4a3b)
  • Date: Mon, 24 Nov 2014 13:20:30 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

antivirus/clamav/DETAILS | 2 +-
antivirus/clamav/HISTORY | 3 +++
audio-drivers/nas/DETAILS | 22 +++++++++++++++-------
audio-drivers/nas/HISTORY | 5 +++++
audio-drivers/nas/PREPARE | 3 ++-
audio-drivers/nas/PRE_BUILD | 4 +++-
dev/null |binary
7 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit b2be88ddadfa03c5fa53350e5f614b875ddc4a3b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

nas: Add proper branch selection, and replace dev version with scm

commit 1f15d37610f15684c9b933eec2d4b476716a487c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

clamav 0.98.5

commit 5f060e801a99336eaeaf4332d9494f68f77ce645
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

nas 1.9.4

diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 0e0065b..f9fad6d 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.98.4
+ VERSION=0.98.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index d232973..f28ce3b 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,6 @@
+2014-11-24 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.98.5
+
2014-08-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.98.3
* DEPENDS: add SSL
diff --git a/audio-drivers/nas/DETAILS b/audio-drivers/nas/DETAILS
index 4bd8a72..067120e 100755
--- a/audio-drivers/nas/DETAILS
+++ b/audio-drivers/nas/DETAILS
@@ -1,14 +1,21 @@
+. "$GRIMOIRE/FUNCTIONS"
SPELL=nas
-if [[ $NAS_DEV == y ]]; then
- VERSION=1.9a
-else
- VERSION=1.9.2
-fi
- PATCHLEVEL=1
+case "$NAS_BRANCH" in
+stable)
+ VERSION=1.9.4
+
SOURCE_HASH=sha512:3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+;;
+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
@@ -17,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 187c929..05c379f 100644
--- a/audio-drivers/nas/HISTORY
+++ b/audio-drivers/nas/HISTORY
@@ -1,3 +1,8 @@
+2014-11-24 Ismael Luceno <ismael AT 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 AT sourcemage.org>
* INSTALL: fixed man installation dir; install init config
* DETAILS: PATCHLEVEL=1
diff --git a/audio-drivers/nas/PREPARE b/audio-drivers/nas/PREPARE
index 742e9fb..ba63470 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 28eb134..1d81810 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
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
deleted file mode 100644
index 0780007..0000000
Binary files a/audio-drivers/nas/nas-1.9.2.src.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b2be88ddadfa03c5fa53350e5f614b875ddc4a3b), Ismael Luceno, 11/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page