5 files changed, 149 insertions, 25 deletions
diff --git a/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt
index ffc328866..53e0860e8 100644
--- a/source/ap/soma/ChangeLog.txt
+++ b/source/ap/soma/ChangeLog.txt
@@ -1,4 +1,34 @@
 ======================================================
+Version 3.0.3
+Add check for empty input in text input box.
+======================================================
+Version 3.0.2
+Edit purge files function slightly.
+======================================================
+Version 3.0.1
+Add new theme.
+Edit purge files function slightly to make it safer.
+======================================================
+Version 3.0.0
+Fixed BBC Radio 4 and BBC Radio 4 Extra URLs.
+Add menu options for genres, bookmarks and themes.
+Add schedules and volume indicators.
+Add more options for timeformat, caret etc.
+======================================================
+Version 2.13.2
+Fixes for new dialog in -current.
+======================================================
+Version 2.13.1
+Bugfix where sometimes station list is broken.
+======================================================
+Version 2.13.0
+Fix another scheduler bug.
+Add genre support.
+Move Theme option to main menu.
+Add time format option.
+Updated all broken BBC URLs.
+Removed some broken URLs.
+======================================================
 Version 2.12.3
 Fix scheduler bug.
 ======================================================
diff --git a/source/ap/soma/README b/source/ap/soma/README
new file mode 100644
index 000000000..d63eb8d36
--- /dev/null
+++ b/source/ap/soma/README
@@ -0,0 +1,74 @@
+Soma - a dialog internet radio player
+
+For help/usage see soma -h
+
+Soma started off as a way to play .pls playlists from SomaFM but can
+also play .ram playlists too. In fact any url playable by mplayer
+using the -playlist option should work. Extra stations can be added
+in ~/.soma/stations.conf (up to 200).
+
+Soma uses mplayer to play the streams and aplay to detect cards for
+mixer so mplayer and alsa-utils need to be installed.
+
+Key commands supported in status window:
+
+(       Volume -5
+)       Volume +5
+1 - 0   Volume 10%, 20%, ... 100% (saved)
+Space   Pause/Play
+d       Disconnect/Reconnect
+a       Add schedule
+b       Station browser
+m       Mute toggle
+s       Scheduler
+q       Quit
+
+There are 3 config files:
+
+~/.soma/themes/*rcrc		Specify the dialog colours.
+~/.soma/options.conf		A few extra options.
+~/.soma/stations.conf		User station list.
+
+There are also:
+
+/etc/soma/options.conf          Default options.
+/etc/soma/themes/*rc            Dialog configs.
+/etc/soma/stations.conf         Default station list.
+
+Stations should be added to the user list like this:
+
+Name,URL
+
+You cannot use a comma , in the name or URL
+
+I would be glad of any exra radio urls emailed to me so I can add to
+the default list.
+
+NOTES:
+
+The Jack and NAS options for output device will only work if MPlayer is
+built against them.
+
+When changing/selecting soundcard output device you must press space on
+the option. Just scrolling down and hitting Enter does nothing.
+
+BUGS:
+
+Soma may induce the side effects of general well-being and profound 
+spiritual satisfaction.
+
+http://en.wikipedia.org/wiki/Soma
+http://en.wikipedia.org/wiki/Soma_(Brave_New_World)
+
+REAL BUGS:
+
+Some people might find screen messes up the dialog colours. If you
+have this line in ~/.screenrc:
+
+attrcolor b ".I"
+
+You might want to comment it out and try again as it seems to turn off
+the bold attribute.
+
+Please mail me at dave@dawoodfall.net for new radio urls or bug
+reports etc.
diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild
index 09d3be2d7..d8c6e961e 100755
--- a/source/ap/soma/soma.SlackBuild
+++ b/source/ap/soma/soma.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Slackware build script for soma
 # (C) 2010 David Woodfall <dave@dawoodfall.net>
@@ -24,22 +24,22 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PKGNAM=soma
-VERSION=${VERSION:-2.12.3}
+PRGNAM=soma
+VERSION=${VERSION:-3.0.4}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 #TAG=${TAG:-daw}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}"
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}"
   exit 0
 fi
 
 TMP=${TMP:-/tmp/daw}
-PKG=$TMP/package-$PKGNAM
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -47,9 +47,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xfv $CWD/$PKGNAM-$VERSION.tar.gz
-cd $PKGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xfv $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -57,19 +57,22 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/bin $PKG/etc/soma/themes $PKG/install $PKG/usr/doc/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/bin $PKG/etc/soma/themes \
+	$PKG/etc/soma/genres \
+	$PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
 
 install -m 755 soma $PKG/usr/bin/soma
 install -m 644 options.conf $PKG/etc/soma/options.conf.new
 install -m 644 stations.conf $PKG/etc/soma/stations.conf.new
 install -m 644 themes/* $PKG/etc/soma/themes
+install -m 644 genres/* $PKG/etc/soma/genres
 
 cp -a \
-  README $CWD/ChangeLog.txt \
-  $PKG/usr/doc/$PKGNAM-$VERSION
+  $CWD/README $CWD/ChangeLog.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
diff --git a/source/ap/soma/soma.SlackBuild.slack.diff b/source/ap/soma/soma.SlackBuild.slack.diff
index 6f1273d73..71dfbcd0d 100644
--- a/source/ap/soma/soma.SlackBuild.slack.diff
+++ b/source/ap/soma/soma.SlackBuild.slack.diff
@@ -1,16 +1,32 @@
---- soma.SlackBuild.orig	2017-12-02 11:26:26.000000000 -0600
-+++ soma.SlackBuild	2017-12-02 11:48:00.554981067 -0600
-@@ -26,7 +26,7 @@
- VERSION=${VERSION:-2.12.3}
+--- soma.SlackBuild.orig	2018-03-05 23:58:06.000000000 -0600
++++ soma.SlackBuild	2018-06-04 23:45:17.325657453 -0500
+@@ -22,13 +22,22 @@
+ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
++cd $(dirname $0) ; CWD=$(pwd)
++
+ PRGNAM=soma
+ VERSION=${VERSION:-3.0.4}
  ARCH=noarch
  BUILD=${BUILD:-1}
 -TAG=${TAG:-daw}
 +#TAG=${TAG:-daw}
++
++# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
++# the name of the created package would be, and then exit. This information
++# could be useful to other scripts.
++if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
++  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}"
++  exit 0
++fi
  
- CWD=$(pwd)
+-CWD=$(pwd)
  TMP=${TMP:-/tmp/daw}
-@@ -51,16 +51,16 @@
- mkdir -p $PKG/usr/bin $PKG/etc/soma/themes $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
+ PKG=$TMP/package-$PRGNAM
+ OUTPUT=${OUTPUT:-/tmp}
+@@ -53,8 +62,8 @@
+ 	$PKG/install $PKG/usr/doc/$PRGNAM-$VERSION
  
  install -m 755 soma $PKG/usr/bin/soma
 -install -m 644 options.conf $PKG/etc/soma
@@ -18,9 +34,10 @@
 +install -m 644 options.conf $PKG/etc/soma/options.conf.new
 +install -m 644 stations.conf $PKG/etc/soma/stations.conf.new
  install -m 644 themes/* $PKG/etc/soma/themes
+ install -m 644 genres/* $PKG/etc/soma/genres
  
- cp -a \
-   README $CWD/ChangeLog.txt \
+@@ -62,8 +71,8 @@
+   $CWD/README $CWD/ChangeLog.txt \
    $PKG/usr/doc/$PRGNAM-$VERSION
  
 -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info
index 6452f00da..82cd97821 100644
--- a/source/ap/soma/soma.info
+++ b/source/ap/soma/soma.info
@@ -1,8 +1,8 @@
 PRGNAM="soma"
-VERSION="2.12.3"
+VERSION="3.0.4"
 HOMEPAGE="http://www.dawoodfall.net/slackbuilds/noversion/soma/"
-DOWNLOAD="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/soma-2.12.3.tar.gz"
-MD5SUM="f454d93cc8431cb9b2097eea720d8c6b"
+DOWNLOAD="http://www.dawoodfall.net/slackbuilds/noversion/soma/soma-3.0.4.tar.gz"
+MD5SUM="f99857601879ab2a651f298304069716"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""