Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

8 files changed, 187 insertions, 67 deletions

diff --git a/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt
new file mode 100644
index 000000000..ffc328866
--- /dev/null
+++ b/source/ap/soma/ChangeLog.txt
@@ -0,0 +1,116 @@
+======================================================
+Version 2.12.3
+Fix scheduler bug.
+======================================================
+Version 2.12.2
+Fixed some options that were zeroing out if 'back' was
+pressed.
+======================================================
+Version 2.12.1
+Fixed missing output devices bug.
+======================================================
+Version 2.12.0
+
+Stations added:
+Kisstory
+ABC Classic FM
+Heart
+Radio X
+Capital
+CapitalXtra
+
+New options:
+New options menu item in main menu. This is to edit
+the config variables and then reread the config.
+'t' shortcut to change theme from status window.
+'o' shortcut to go to options menu.
+The 'Theme' option lists everything in ~/.soma/themes
+Added tfonz's turbo theme.
+
+Removed:
+TERM environment setting. Now soma overrides this.
+Took out the initial typing of device detection because it
+starts up so fast now that you just see a flicker.
+
+Enhancements:
+A vast improvement in loading speed due to new method
+of loading station list.
+======================================================
+Version 2.11.3
+Added:
+ABC Oldies,http://orion.shoutca.st:8569
+ABC 60s,http://149.56.23.7:20314/stream
+ABC 70s,http://149.56.23.7:20258/stream
+ABC 80s,http://cabhs31.sonixcast.com:20168
+Flower Power Radio,http://50.7.129.122:8433/stream
+KZRO,http://war.str3am.com:7930
+Morcegão FM,http://69.64.34.198:8000/morcegao
+Floyd,http://archlinux.uk:9001
+Floyd Too,http://cirrus.turtil.net:9001
+
+Major code overhaul.
+Added more themes + themes directory.
+======================================================
+Version 2.11.2
+Added:
+Radio Swing
+1920s Radio
+Smooth Jazz
+Big Blue
+KCEA
+WITR 89.7
+KKJZ FM
+4625 KHz
+The Buzzer
+======================================================
+Version 2.11.1
+Add 3WK and Krypton stations.
+======================================================
+Version 2.11.0
+Add SAVE_LIST_AT_QUIT option.
+======================================================
+Version 2.10.8
+Set default CACHE is blank..
+======================================================
+Version 2.10.7
+Add CACHE option.
+======================================================
+Version 2.10.6
+Add HD BBC stations.
+Support for .m3u8 URLs.
+======================================================
+Version 2.10.5
+Add function to add SETVOL to config.
+======================================================
+Version 2.10.4
+Clean up Name finding code.
+======================================================
+Version 2.10.3
+Fix Names containing colons.
+=======================================================
+Version 2.10.2
+Tidy menu.
+=======================================================
+Version 2.10.1
+Fix bug in mixer selection.
+========================================================
+Version 2.10.0
+Changed dialog theme back to original way.
+Added a 'greenrc' theme.
+========================================================
+Version 2.9.2
+Update stations URLS. Remove dead.
+========================================================
+Version 2.9.1
+Better station parsing.
+========================================================
+Version 2.9.0
+Add keyboard sortcuts for volume:
+keys 1-0 = 10% 20% ... 100%
+This volume is saved and reapplied on startup.
+Added a few new somafm stations and a couple of talk radio stations
+=========================================================
+Version 2.8.9
+Use ~/.soma/dialogrc-$VERSION.
+Some fixes to the station 'tuner' function.
+=========================================================
diff --git a/source/ap/soma/doinst.sh b/source/ap/soma/doinst.sh
index 7ddbdb96c..a64607329 100644
--- a/source/ap/soma/doinst.sh
+++ b/source/ap/soma/doinst.sh
@@ -11,7 +11,6 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/soma/dialogrc.new
 config etc/soma/stations.conf.new
 config etc/soma/options.conf.new
 
diff --git a/source/ap/soma/slack-desc b/source/ap/soma/slack-desc
index 433f71963..1130b4403 100644
--- a/source/ap/soma/slack-desc
+++ b/source/ap/soma/slack-desc
@@ -1,15 +1,15 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-soma: Soma (a command line/dialog internet radio player)
+soma: Soma - a command line/dialog internet radio player
 soma:
-soma: Soma is a frontend for mplayer to play radio playlists pls, m3ui, and 
-soma: ram.  More will be added as it progresses.
+soma: Soma is a frontend for mplayer to play radio playlists pls,m3u and 
+soma: ram. More will be added as it progresses.
 soma:
 soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma
 soma:
diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild
index 7f837d5d4..09d3be2d7 100755
--- a/source/ap/soma/soma.SlackBuild
+++ b/source/ap/soma/soma.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for soma
-# Copyright 2010-2011 David Woodfall <dave@dawoodfall.net>
-# Copyright 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# (C) 2010 David Woodfall <dave@dawoodfall.net>
+# TMPROOT modification (C) Patrick Volkerding with thanks
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,22 +22,33 @@
 # 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)
+
 PKGNAM=soma
-VERSION=${VERSION:-2.10.4}
+VERSION=${VERSION:-2.12.3}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+#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}"
+  exit 0
+fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
+TMP=${TMP:-/tmp/daw}
 PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.gz
+tar xfv $CWD/$PKGNAM-$VERSION.tar.gz
 cd $PKGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -46,20 +57,19 @@ 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 $PKG/install $PKG/usr/doc/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/bin $PKG/etc/soma/themes $PKG/install $PKG/usr/doc/$PKGNAM-$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 dialogrc $PKG/etc/soma/dialogrc.new
+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
 
 cp -a \
-   README  \
+  README $CWD/ChangeLog.txt \
   $PKG/usr/doc/$PKGNAM-$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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
diff --git a/source/ap/soma/soma.SlackBuild.slack.diff b/source/ap/soma/soma.SlackBuild.slack.diff
new file mode 100644
index 000000000..6f1273d73
--- /dev/null
+++ b/source/ap/soma/soma.SlackBuild.slack.diff
@@ -0,0 +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}
+ ARCH=noarch
+ BUILD=${BUILD:-1}
+-TAG=${TAG:-daw}
++#TAG=${TAG:-daw}
+ 
+ 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
+ 
+ install -m 755 soma $PKG/usr/bin/soma
+-install -m 644 options.conf $PKG/etc/soma
+-install -m 644 stations.conf $PKG/etc/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
+ 
+ cp -a \
+   README $CWD/ChangeLog.txt \
+   $PKG/usr/doc/$PRGNAM-$VERSION
+ 
+-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+ 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/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
++/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info
index 0255d3d6e..6452f00da 100644
--- a/source/ap/soma/soma.info
+++ b/source/ap/soma/soma.info
@@ -1,10 +1,11 @@
 PRGNAM="soma"
-VERSION="2.8.5"
-HOMEPAGE="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/"
-DOWNLOAD="http://www.dawoodfall.net/files/slackbuilds/noversion/soma/soma-2.8.5.tar.gz"
-MD5SUM="193112a1dc8de8781b83d3a1bceedee6"
+VERSION="2.12.3"
+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_x86_64=""
 MD5SUM_x86_64=""
+REQUIRES=""
 MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
-APPROVED=""
+MAIL="dave@dawoodfall.net"
+APPROVED="Me!"
diff --git a/source/ap/soma/soma.png b/source/ap/soma/soma.png
deleted file mode 100644
index 1e545a938..000000000
--- a/source/ap/soma/soma.png
+++ /dev/null
diff --git a/source/ap/soma/stations.conf b/source/ap/soma/stations.conf
deleted file mode 100644
index 4a2c43083..000000000
--- a/source/ap/soma/stations.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-Groove Salad,http://somafm.com/groovesalad130.pls
-Lush,http://somafm.com/lush.pls
-Suburbs of Goa,http://somafm.com/suburbsofgoa.pls
-Drone Zone,http://somafm.com/dronezone.pls
-Indie Pop Rocks,http://somafm.com/indiepop.pls
-Digitalis,http://somafm.com/digitalis.pls
-PopTron,http://somafm.com/poptron.pls
-Covers,http://somafm.com/covers.pls
-Secret Agent,http://somafm.com/secretagent.pls
-Boot Liquor,http://somafm.com/bootliquor.pls
-Illinois Street Lounge,http://somafm.com/illstreet.pls
-Cliqhop IDM,http://somafm.com/cliqhop.pls
-Sonic Universe,http://somafm.com/sonicuniverse.pls
-Beat Blender,http://somafm.com/beatblender.pls
-Tag's Trip,http://somafm.com/tags.pls
-Space Station Soma,http://somafm.com/spacestation.pls
-Mission Control,http://somafm.com/missioncontrol.pls
-Doomed,http://somafm.com/doomed.pls
-BBC Radio 1,http://www.bbc.co.uk/radio/listen/live/r1.asx
-BBC Radio 2,http://www.bbc.co.uk/radio/listen/live/r2.asx
-BBC Radio 3,http://www.bbc.co.uk/radio/listen/live/r3.asx
-BBC Radio 4,http://www.bbc.co.uk/radio/listen/live/r4.asx
-BBC Radio 7,http://www.bbc.co.uk/radio/listen/live/r7.asx
-BBC World Service,http://www.bbc.co.uk/worldservice/meta/tx/nb/live/eneuk.asx
-BBC WS News,http://www.bbc.co.uk/worldservice/meta/tx/nb/live/ennws.asx
-Classic FM,http://mediaweb.musicradio.com/V1/Playlist.asx?StreamID=2
-InterGalacticFM1,http://radio.intergalacticfm.com/1.m3u
-InterGalacticFM2,http://radio.intergalacticfm.com/2.m3u
-InterGalacticFM3,http://radio.intergalacticfm.com/3.m3u
-InterGalacticFM4,http://radio.intergalacticfm.com/4.m3u
-DarkWave Gothic,http://yp.shoutcast.com/sbin/tunein-station.pls?id=392221
-Meridian FM,http://www.meridianfm.com/listen2meridianfm.m3uj
-kpfa,http://www.kpfa.org/streams/kpfa_64k.m3u
-wcbn,http://floyd.wcbn.org/wcbn-hi.m3u
-Pyrolitical,http://broadcast.pyrolitical.com:8000/Pyrolitical_Radio.m3u
-Dissident,http://radio.indybay.org:8000/dissidentisland.m3u
-GFMONLINE,http://www.gfmradio.com/GFMONLINE.wvx
-Celtic Music Radio,http://www.celticmusicradio.net/celtic_live.m3u