summaryrefslogtreecommitdiffstats
path: root/misc/jmri
diff options
context:
space:
mode:
Diffstat (limited to 'misc/jmri')
-rw-r--r--misc/jmri/README4
-rw-r--r--misc/jmri/doinst.sh4
-rw-r--r--misc/jmri/jmri.SlackBuild28
-rw-r--r--misc/jmri/jmri.info8
4 files changed, 25 insertions, 19 deletions
diff --git a/misc/jmri/README b/misc/jmri/README
index 8cb37c965c..aef62d8ee7 100644
--- a/misc/jmri/README
+++ b/misc/jmri/README
@@ -1,5 +1,5 @@
JMRI is the Java Model Railroad Interface, a set of tools for model
railroad computer control.
-Please note, to access your controller hardware you will probably need to
-add your username to the 'dialout' group.
+Please note, to access your controller hardware you will probably need
+to add your username to the 'dialout' group.
diff --git a/misc/jmri/doinst.sh b/misc/jmri/doinst.sh
index 50a085e059..85ab62cb4b 100644
--- a/misc/jmri/doinst.sh
+++ b/misc/jmri/doinst.sh
@@ -3,7 +3,3 @@ if [ ! -e var/log/jmri/messages.log ]; then
else
rm -f var/log/jmri/messages.log.new
fi
-
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/misc/jmri/jmri.SlackBuild b/misc/jmri/jmri.SlackBuild
index 9ed2dfdd18..6f35cda70d 100644
--- a/misc/jmri/jmri.SlackBuild
+++ b/misc/jmri/jmri.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for JMRI
# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
-# Copyright 2016-2020 Heiko Rosemann, Germany
+# Copyright 2016-2023 Heiko Rosemann, Germany
# All rights reserved.
#
@@ -24,9 +24,11 @@
# 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=jmri
-VERSION=${VERSION:-4.20}
-REVISION=${REVISION:-Rc7ba8249b}
+VERSION=${VERSION:-5.6}
+REVISION=${REVISION:-R89a87446cb}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -38,10 +40,18 @@ fi
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
TARNAM=JMRI
-CWD=$(pwd)
+# 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"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -63,13 +73,13 @@ find -L . \
mkdir -p $PKG/usr/bin
cp -a \
- DecoderPro PanelPro SoundPro JmriFaceless InstallTest \
+ DecoderPro InstallTest JmriFaceless PanelPro SoundPro \
$PKG/usr/bin
chmod 755 $PKG/usr/bin/*
mkdir -p $PKG/opt/jmri
cp -a \
- default.lcf help/ jmri.jar lib/ resources/ xml/ \
+ CreateJmriApps.sh default_lcf.xml help/ jmri.conf jmri.jar lib/ resources/ web/ xml/ \
$PKG/opt/jmri
# Let's not abuse writability in /opt
@@ -95,7 +105,7 @@ chmod 755 $PKG/etc/profile.d/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- COPYING \
+ COPYING web/ \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -108,4 +118,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $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
diff --git a/misc/jmri/jmri.info b/misc/jmri/jmri.info
index 3ec502b2b4..129361f14d 100644
--- a/misc/jmri/jmri.info
+++ b/misc/jmri/jmri.info
@@ -1,10 +1,10 @@
PRGNAM="jmri"
-VERSION="4.20"
+VERSION="5.6"
HOMEPAGE="http://jmri.org/"
-DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v4.20/JMRI.4.20+Rc7ba8249b.tgz"
-MD5SUM="b0915ad2acd71426c2b3301100cfd5d4"
+DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v5.6/JMRI.5.6+R89a87446cb.tgz"
+MD5SUM="e209cf559d063353e7f86ebe996a188d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk11"
MAINTAINER="Heiko Rosemann"
EMAIL="heiko.rosemann@web.de"