audio/amSynth: Updated for version 1.2.2

4 files changed, 28 insertions, 24 deletions

diff --git a/audio/amSynth/README b/audio/amSynth/README
index 7800ae948e..56a599cfcf 100644
--- a/audio/amSynth/README
+++ b/audio/amSynth/README
@@ -4,10 +4,4 @@ It provides virtual analogue synthesis in the style of the classic
 Moog Minimoog/Roland Junos. It offers an easy-to-use interface and
 synth engine, while still creating varied sounds.
 
-This package requires gtkmm, which is available from SlackBuilds.org.
-An optional requirement is libsndfile, which is also available at
-  SlackBuilds.org.
-
-Note: If you want to use this package with jack, then jack
-  needs to be installed when you build this package.
-  The configure step will include jack if its available.
+This requires gtkmm.  Optional dependencies are libsndfile and jack.
diff --git a/audio/amSynth/amSynth.SlackBuild b/audio/amSynth/amSynth.SlackBuild
index f0bceed0b9..c66b565c24 100644
--- a/audio/amSynth/amSynth.SlackBuild
+++ b/audio/amSynth/amSynth.SlackBuild
@@ -25,10 +25,11 @@
 # Modified by the SlackBuilds.org project
 
 PKGNAME=amSynth
-VERSION=1.2.0
-ARCH=${ARCH:-i486}
+VERSION=1.2.2
+ARCH=${ARCH:-x86_64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)		
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PKGNAME
@@ -36,16 +37,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PKGNAME-$VERSION
-tar -xvzf $CWD/$PKGNAME-$VERSION.tar.gz || exit 1
-cd $PKGNAME-$VERSION || exit 1
+tar xvf $CWD/$PKGNAME-$VERSION.tar.gz
+cd $PKGNAME-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 
@@ -53,14 +61,14 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --datarootdir=/usr/share/$PKGNAME \
   --enable-static=no \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
@@ -71,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/amSynth/amSynth.info b/audio/amSynth/amSynth.info
index 7cc5a7f3c9..2b72dee50f 100644
--- a/audio/amSynth/amSynth.info
+++ b/audio/amSynth/amSynth.info
@@ -1,8 +1,10 @@
 PRGNAM="amSynth"
-VERSION="1.2.0"
+VERSION="1.2.2"
 HOMEPAGE="http://amsynthe.sourceforge.net/amSynth/"
-DOWNLOAD="http://downloads.sourceforge.net/amsynthe/amSynth-1.2.0.tar.gz"
-MD5SUM="2ba9a0560945c6ac914a15bb243146e2"
-MAINTAINER="paul wisehart"
-EMAIL="wise@lupulin.net"
+DOWNLOAD="http://downloads.sourceforge.net/amsynthe/amSynth-1.2.2.tar.gz"
+MD5SUM="5f86c903ce21368b1e54c31cbc2b041d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Christopher Forrest"
+EMAIL="nyrednek@gmx.com"
 APPROVED="rworkman"
diff --git a/audio/amSynth/slack-desc b/audio/amSynth/slack-desc
index f2c02aa30a..cedc954936 100644
--- a/audio/amSynth/slack-desc
+++ b/audio/amSynth/slack-desc
@@ -7,11 +7,11 @@
 
        |-----handy-ruler------------------------------------------------------|
 amSynth: amSynth (Analogue Modeling SYNTHesizer)
-amSynth: 
+amSynth:
 amSynth: AMSynth provides virtual analogue synthesis in the style of the 
 amSynth: classic Moog Minimoog/Roland Junos. It offers an easy-to-use
 amSynth: interface and synth engine, while still creating varied sounds.
-amSynth: 
+amSynth:
 amSynth:
 amSynth:
 amSynth: