games/larn: Updated for version 14.0.2.

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

5 files changed, 27 insertions, 87 deletions

diff --git a/games/larn/larn-fixups.patch b/games/larn/larn-fixups.patch
deleted file mode 100644
index 3f9d6a26d8..0000000000
--- a/games/larn/larn-fixups.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -u -r larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.old/larn.sh larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.new/larn.sh
---- larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.old/larn.sh	2014-06-09 18:11:59.000000000 +0100
-+++ larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.new/larn.sh	2017-05-04 11:28:35.200638538 +0100
-@@ -1,5 +1,5 @@
- #!/bin/bash
--LARNDIR="/usr/local/share/games/larn/lib/file/"
-+LARNDIR="/usr/share/games/larn/lib/file/"
- SAVEDIR="$HOME/.larn/save/"
- SCOREDIR="$HOME/.larn/score/"
- TMPDIR="/tmp/larn"
-diff -u -r larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.old/src/makefile larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.new/src/makefile
---- larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.old/src/makefile	2014-06-09 18:11:59.000000000 +0100
-+++ larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.new/src/makefile	2017-05-04 11:27:48.542897675 +0100
-@@ -58,13 +58,14 @@
- 
- else
- 
--CFLAGS=-Os -Wall -fomit-frame-pointer 
--LDFLAGS=-Wl,-O1 -lncurses
-+CFLAGS := -Os -Wall -fomit-frame-pointer $(CFLAGS)
-+LDFLAGS := -Wl,-O1 -lncurses $(LDLAGS)
- 
- STRIP_BINARY=yes
- 
- endif
- 
-+PREFIX=/usr
- 
- OBJ=$(SRC:.c=.o)
- EXE=larn
-@@ -79,8 +80,7 @@
- 	@echo Build complete!
- 
- ifeq ($(STRIP_BINARY),yes)
--	@echo Stripping binary..
--	@strip $(EXE)
-+	strip $(EXE)
- endif
- 
- .PHONY: debug
-@@ -96,10 +96,11 @@
- 
- .PHONY : install
- install: 
--	mkdir -p /usr/local/share/games/larn/lib/file
--	cp -R ../lib/file/* /usr/local/share/games/larn/lib/file/
--	cp larn /usr/local/share/games/larn/lib/file/
--	cp ../larn.sh /usr/local/games/
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/games/larn/lib/file
-+	cp -R ../lib/file/* $(DESTDIR)$(PREFIX)/share/games/larn/lib/file/
-+	cp larn $(DESTDIR)$(PREFIX)/share/games/larn/lib/file/
-+	mkdir -p $(DESTDIR)$(PREFIX)/games/
-+	cp ../larn.sh $(DESTDIR)$(PREFIX)/games/
- 
- #.PHONY : distro
- #distro:
-@@ -112,8 +113,7 @@
- #	@$(CP) larn.* ..\\distro\\bin
- 
- %.o: %.c
--	@echo Building $<
--	@$(CC) $(CFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) -o $@ -c $<
- 
- $(EXE): $(OBJ)
--	@$(CC) $(OBJ) $(LDFLAGS) -o $@
-+	$(CC) $(OBJ) $(LDFLAGS) -o $@
diff --git a/games/larn/larn.SlackBuild b/games/larn/larn.SlackBuild
index cdd184e837..43563a7bdb 100644
--- a/games/larn/larn.SlackBuild
+++ b/games/larn/larn.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for larn
 
-# Copyright 2017 SlackBuilds.org Project, David Melik, Spokane, WA, USA
+# Copyright 2017 David Melik, Spokane, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=larn
-VERSION=${VERSION:-3621914}
+VERSION=${VERSION:-14.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=larn-linux
-COMMIT=${COMMIT:-36219143703cced4961fdc2a435106c0aa1e0a55}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -62,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$COMMIT
-tar xvf $CWD/$SRCNAM-$COMMIT.tar.gz
-cd $SRCNAM-$COMMIT
+rm -rf RL_M-$VERSION
+tar xvf $CWD/RL_M-$VERSION.tar.gz
+cd RL_M-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -72,19 +69,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Handle CFLAGS, DESTDIR and PREFIX in src/makefile and larn.sh
-patch -p1 < $CWD/larn-fixups.patch
-
-cd src
-  CFLAGS="$SLKCFLAGS" make
-  make install DESTDIR=$PKG
+cd build
+  cmake larn.sln -DCMAKE_BUILD_TYPE=Debug '.'
+  make
+  mv larn ..
 cd ..
+mkdir -p $PKG/usr/share/games/larn
+cp -a larn data $PKG/usr/share/games/larn
+cp $CWD/larn.sh $PKG/usr/share/games/larn
+mkdir -p $PKG/usr/games
+cd $PKG/usr/games
+ln -fs /usr/share/games/larn/larn larn
+cd $TMP/RL_M-$VERSION
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md history.txt readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a MANUAL.txt README.md docs $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/larn/larn.info b/games/larn/larn.info
index 815e00da2b..fed4a82a91 100644
--- a/games/larn/larn.info
+++ b/games/larn/larn.info
@@ -1,8 +1,8 @@
 PRGNAM="larn"
-VERSION="3621914"
-HOMEPAGE="https://github.com/Nebula-Mechanica/larn-linux"
-DOWNLOAD="https://github.com/Nebula-Mechanica/larn-linux/archive/3621914/larn-linux-36219143703cced4961fdc2a435106c0aa1e0a55.tar.gz"
-MD5SUM="fd2be902e73fd8b608034511dd9536ae"
+VERSION="14.0.2"
+HOMEPAGE="https://github.com/atsb/RL_M"
+DOWNLOAD="https://github.com/atsb/RL_M/archive/14.0.2/RL_M-14.0.2.tar.gz"
+MD5SUM="481f03f6642aea0aeef7eb9d38fff881"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/larn/larn.sh b/games/larn/larn.sh
new file mode 100644
index 0000000000..2d667455f7
--- /dev/null
+++ b/games/larn/larn.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+USERDIR=$(pwd)
+cd /usr/share/games/larn
+./larn
+cd $USERDIR
diff --git a/games/larn/slack-desc b/games/larn/slack-desc
index 864d31423e..5759fb80e0 100644
--- a/games/larn/slack-desc
+++ b/games/larn/slack-desc
@@ -14,6 +14,6 @@ larn: released for the UNIX environment in 1986 by Noah Morgan.  It was
 larn: subsequently ported to the MS-DOS environment by Don Kneller.  Kevin
 larn: Routley worked on enhancements to LARN.
 larn:
-larn: homepage: https://github.com/Nebula-Mechanica/larn-linux
+larn: homepage: https://github.com/atsb/RL_M
 larn:
 larn: