audio/snd: Script cleanup.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 81 insertions, 25 deletions

diff --git a/audio/snd/README b/audio/snd/README
index 9c78c06155..3b0cf106dd 100644
--- a/audio/snd/README
+++ b/audio/snd/README
@@ -1,11 +1,12 @@
 Snd is a sound editor modelled loosely after Emacs.  It is highly
-programmable, supports a variety of audio and sample file formats,
-includes a complete implementation of Common Lisp Music (CLM), and
-can be run sans GUI as a scripting engine.
+programmable, supports a variety of audio and sample file formats, includes a
+complete implementation of Common Lisp Music (CLM), can be run sans GUI as a
+scripting engine, and more.
 
-This script build against the Motif toolkit primarily because
-Snd's GTK+ interface doesn't seem as well-tested (tending to crash
-unexpectedly on this maintainer's x86_64 machines), but also because
-it supports OpenGL rendering of spectrograms.
+This SlackBuild configures Snd to use Scheme (s7), ALSA, and the Motif, as
+these are currently the best supported (and tested) options for Snd.  Slackare
+14.2 includes Motif and the GNU Scientific Library (gsl), so these
+dependencies can now be the preferred defaults for Snd.
 
-Comment out the "--with-gl" line in snd.SlackBuild if you don't want this.
+OpenGL rendering of spectrograms under Motif can also enabled by passing
+"--with-gl" to configure in snd.SlackBuild.
diff --git a/audio/snd/slack-desc b/audio/snd/slack-desc
index 48c86780d6..daf34dd10d 100644
--- a/audio/snd/slack-desc
+++ b/audio/snd/slack-desc
@@ -10,8 +10,8 @@ snd: snd (A sound editor)
 snd:
 snd: Snd is a sound editor modelled loosely after Emacs.  It is highly
 snd: programmable, supports a variety of audio and sample file formats,
-snd: includes a complete implementation of Common Lisp Music (CLM), and
-snd: can be run sans GUI as a scripting engine.
+snd: includes a complete implementation of Common Lisp Music (CLM), can
+snd: be run sans GUI as a scripting engine, and more.
 snd:
 snd: https://ccrma.stanford.edu/software/snd/
 snd:
diff --git a/audio/snd/snd.SlackBuild b/audio/snd/snd.SlackBuild
index 7b6aeeec70..ec7ab3fef0 100644
--- a/audio/snd/snd.SlackBuild
+++ b/audio/snd/snd.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SlackBuild for Snd, rev. 2 March 2016
+# SlackBuild for Snd, 10 March 2016
 # Arthur W. Green <lynx@panix.com>
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 
 PRGNAM=snd
 VERSION=${VERSION:-16.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,11 +65,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -exec chmod -R u+w,go-w,a+rX-st {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,12 +75,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --with-s7 \
   --with-alsa \
   --with-motif \
-  --with-gl \
-  --with-s7 \
-  --with-gsl \
   --with-fftw \
+  --with-gsl \
+  --with-doc-dir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
@@ -96,13 +92,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.Snd $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION/pix
+cp -a COPYING README.Snd *.html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a pix/*.png $PKG/usr/doc/$PRGNAM-$VERSION/pix
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Add desktop file and menu icon.
+# emacs support.
+install -D -m 0644 inf-snd.el $PKG/usr/share/emacs/site-lisp/inf-snd.el
+# desktop file and menu icon.
 install -D -m 0644 $CWD/snd.desktop $PKG/usr/share/applications/snd.desktop
-install -D -m 0644 $CWD/snd-icon48x48.xpm $PKG/usr/share/pixmaps/snd.xpm
+install -D -m 0644 $CWD/snd_48x48.xpm $PKG/usr/share/pixmaps/snd_48x48.xpm
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/audio/snd/snd.desktop b/audio/snd/snd.desktop
index 5c6300c877..e1c44d8983 100644
--- a/audio/snd/snd.desktop
+++ b/audio/snd/snd.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=/usr/bin/snd
-Icon=snd
+Icon=snd_48x48
 Name=Snd
 GenericName=Snd Editor
 GenericName[fr]=Snd Éditeur
diff --git a/audio/snd/snd_48x48.xpm b/audio/snd/snd_48x48.xpm
new file mode 100644
index 0000000000..79f8665e0a
--- /dev/null
+++ b/audio/snd/snd_48x48.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char * snd_48x48_xpm[] = {
+"48 48 5 1",
+". c white m white",
+"B c black m black",
+"a c white m white s basiccolor",
+"r c red m black s cursorcolor",
+"g c lightblue m black s listenercolor",
+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB............BBBB.........................a",
+"aaBBBB..........BB....BB.......................a",
+"aaBBBB........BB.......BB......................a",
+"aaBBBB......BB..........BB.....................a",
+"aaBBBB.....BB............BB....................a",
+"aaBBBB....BB.............BB....................a",
+"aaBBBB...BB..............BB....................a",
+"aaBBBB..BB................BB...................a",
+"aaBBBBBB..................BB...................a",
+"aaBBBB.....................BB..................a",
+"aaBBBB.....................BB.................Ba",
+"aaBBBB......................BB...............BBa",
+"aaBBBB.......................BB.............BB.a",
+"aaBBBB.........................BB..........BB..a",
+"aaBBBB..........................BB.......BB....a",
+"aaBBBB...........................BB....BB......a",
+"aaBBBB.............................BBB.........a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBB.........................................a",
+"aaBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBaa",
+"aaBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBaa",
+"aaaaaa.........................................a",
+"aaaaaa.........................................a",
+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"aggggggggggggggggggggggggggggggggggggggggggggggg",
+"aggggggggggggggggggggggggggggggggggggggggggggggg",
+"aggggggggggggggggggggggggggggggggggggggggggggggg",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"agggggggggggggggggggggggggggggggggggggggggggggga",
+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"};