1 files changed, 40 insertions, 15 deletions
diff --git a/misc/jmri/jmri.SlackBuild b/misc/jmri/jmri.SlackBuild
index 785db9007b..d48e7f14fe 100644
--- a/misc/jmri/jmri.SlackBuild
+++ b/misc/jmri/jmri.SlackBuild
@@ -1,26 +1,38 @@
 #!/bin/sh
 
 # Slackware build script for JMRI
-# Written by David Spencer <nobbutl@yahoo.co.uk>
-# This script is dedicated to the public domain
+
+# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jmri
-VERSION=2.4A
+VERSION=${VERSION:-2.14}
+REVISION=${REVISION:-r19563}
+
+ARCH=i486   # some embedded libraries are 32 bit only, see lib/linux/*
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 TARNAM=JMRI
 
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -32,7 +44,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TARNAM
-tar xvf $CWD/$TARNAM.$VERSION.tgz
+tar xvf $CWD/$TARNAM.$VERSION-$REVISION.tgz
 cd $TARNAM
 chown -R root:root .
 find . \
@@ -43,7 +55,8 @@ find . \
 
 mkdir -p $PKG/usr/bin
 cp -a \
-  DecoderPro InstallTest JmriDemo LocoTools PanelPro cornwall \
+  DecoderPro DispatcherPro PanelPro SignalPro SoundPro \
+  InstallTest JmriDemo LocoTools cornwall \
   $PKG/usr/bin
 chmod 755 $PKG/usr/bin/*
 
@@ -79,6 +92,18 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mkdir -p $PKG/usr/share/applications
+install -m 0644 -t $PKG/usr/share/applications \
+  $CWD/DecoderPro.desktop \
+  $CWD/DispatcherPro.desktop \
+  $CWD/PanelPro.desktop \
+  $CWD/SignalPro.desktop \
+  $CWD/SoundPro.desktop
+
+mkdir -p $PKG/usr/share/pixmaps
+install -m 0644 -t $PKG/usr/share/pixmaps \
+  $CWD/jmri.png
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh