summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman2012-03-27 05:35:02 +0200
committer Robby Workman2012-03-27 05:35:02 +0200
commit4e92ed5ec7af89edf92c259c5b7813c2beefd83f (patch)
treecd2004198cd41aaaac9176ef9751d65c36fefe63
parenta12bd209de509a61eaec6030bee5d9b36249e5e0 (diff)
downloadslackbuilds-4e92ed5ec7af89edf92c259c5b7813c2beefd83f.tar.gz
academic/octave-forge: Fixed VERSION strings (s,-,_,g)
Thanks to B. Watson for the report. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--academic/octave-forge/octave-forge.SlackBuild12
-rw-r--r--academic/octave-forge/octave-forge.info2
2 files changed, 8 insertions, 6 deletions
diff --git a/academic/octave-forge/octave-forge.SlackBuild b/academic/octave-forge/octave-forge.SlackBuild
index 358a0939b6..4e04989c62 100644
--- a/academic/octave-forge/octave-forge.SlackBuild
+++ b/academic/octave-forge/octave-forge.SlackBuild
@@ -35,10 +35,12 @@
# - No JOBS support.
PRGNAM=octave-forge
-VERSION=bundle-20090607
+VERSION=bundle_20090607
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+SRCVER=$(printf $VERSION | tr _ -)
+
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -75,9 +77,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -119,7 +121,7 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
( cd $PKG
- /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+ /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
)
# Print a brief compilation report
diff --git a/academic/octave-forge/octave-forge.info b/academic/octave-forge/octave-forge.info
index 414a4b0c24..51d384cc56 100644
--- a/academic/octave-forge/octave-forge.info
+++ b/academic/octave-forge/octave-forge.info
@@ -1,5 +1,5 @@
PRGNAM="octave-forge"
-VERSION="bundle-20090607"
+VERSION="bundle_20090607"
HOMEPAGE="http://octave.sourceforge.net"
DOWNLOAD="http://downloads.sourceforge.net/octave/octave-forge-bundle-20090607.tar.gz"
MD5SUM="faf95ff58884cd29379015b70f57c745"