From f29328247a0d3283386c11eb0265270024c67c65 Mon Sep 17 00:00:00 2001
From: Richard Narron <richard@aaazen.com>
Date: Fri, 1 Nov 2019 06:18:25 +0700
Subject: development/regina-rexx: Update script.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/regina-rexx/README                 | 16 ++++++++++++----
 development/regina-rexx/regina-rexx.SlackBuild |  9 +++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'development')

diff --git a/development/regina-rexx/README b/development/regina-rexx/README
index 018d4f7a9e..5fbfb1271e 100644
--- a/development/regina-rexx/README
+++ b/development/regina-rexx/README
@@ -8,11 +8,19 @@ inexperienced programmers yet powerful enough for experienced users.
 It is also a language ideally suited as a macro language for other
 applications.
 
-To create a static version of the rexx binary executable do this:
-  FLAVOR=static ./regina-rexx.SlackBuild
+To create the normal dynamic version just do this:
+  sh regina-rexx.SlackBuild
 
-Otherwise to create the normal dynamic version just do this:
-  ./regina-rexx.SlackBuild
+Or to create a static version of the rexx binary executable do this:
+
+  1) The Slackware 14.2 ncurses package is built without static libraries.
+     This prevents the static build of regina-rexx from loading properly.
+     In this case:
+    a) Modify the ncurses.SlackBuild and change the "--without-normal"
+                                          option to "--with-normal"
+    b) Rebuild and reinstall the ncurses package.
+
+   2) FLAVOR=static sh regina-rexx.SlackBuild
 
 After installation of the package, a startup script for the rxstack is created:
   /etc/rc.d/rc.rxstack
diff --git a/development/regina-rexx/regina-rexx.SlackBuild b/development/regina-rexx/regina-rexx.SlackBuild
index 289dad4bf6..b97b9cb5d7 100644
--- a/development/regina-rexx/regina-rexx.SlackBuild
+++ b/development/regina-rexx/regina-rexx.SlackBuild
@@ -6,7 +6,7 @@
 PRGNAM=regina-rexx
 VERSION=${VERSION:-3.9.1}
 DOCVERSION=${DOCVERSION:-3.9.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 FLAVOR=${FLAVOR:-dynamic}  # set FLAVOR=static for a rexx static binary.
 
@@ -25,8 +25,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,7 +70,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make -j1
-make install DESTDIR=$PKG
+make -j1 install DESTDIR=$PKG
 
 mkdir -p $PKG/etc/rc.d/
 install -m0644 $CWD/rc.rxstack $PKG/etc/rc.d/rc.rxstack.new
@@ -83,6 +83,7 @@ mkdir -p                                $PKG/usr/doc/$PRGNAM-$VERSION
 install -m0644 $CWD/regutil.pdf         $PKG/usr/doc/$PRGNAM-$VERSION/regutil-$DOCVERSION.pdf
 install -m0644 $CWD/regina.pdf          $PKG/usr/doc/$PRGNAM-$VERSION/regina-$DOCVERSION.pdf
 install -m0644 README* HACKERS.txt      $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 $CWD/README              $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware
 install -m0644 $CWD/$PRGNAM.SlackBuild  $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3