Updated to 5.7.13

5 files changed, 67 insertions, 264 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23ec342b9e64..a54b7d84c674 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = umoria
 	pkgdesc = Rogue-like dungeon crawler
-	pkgver = 5.6
-	pkgrel = 5
-	url = http://free-moria.sourceforge.net/
+	pkgver = 5.7.13
+	pkgrel = 1
+	url = https://umoria.org
 	install = umoria.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = gzip
+	makedepends = cmake
 	depends = ncurses
-	depends = termcap
 	backup = usr/share/umoria/files/scores
-	source = umoria-5.6-aur.patch
-	source = umoria-5.6.tar.gz::https://github.com/HunterZ/umoria/archive/5.6.tar.gz
-	sha512sums = 0a24d506ca6316f498f69fe8996fa7bf73110d99350137bb50b56f53c3eef3bc0379c2d04bc986cc28b50377684f90c0f402923e5283bae6c244d42d521192bd
-	sha512sums = d73fa55bc8609d1bb6727b59affb8f1461e6439d2f97de0b45e8f56e01d95a2b500ed4d86ac2690d831ff7e9492e604bcd3dcc47c253b44ab70d3f5da5457067
+	source = umoria-5.7.13-aur.patch
+	source = umoria-5.7.13.tar.gz::https://github.com/dungeons-of-moria/umoria/archive/v5.7.13.tar.gz
+	sha512sums = 281275858ce39b5fe07f856e4e126f80fa6a864ada259d1d30c8d97e4dc853ffa6efa805bc1950ab2abd49d1cf0b4f54d60384ffa67f70fa93845628ece145e8
+	sha512sums = 3a577d9dded3e9a1d6e13e3ab4f87afc38549603e3510e4d778eef65d9251b2feb3f9718709e5f0b19a589259c1de6cc10f6d5eeeee057651fa920393d9ac985
 
 pkgname = umoria
 
diff --git a/PKGBUILD b/PKGBUILD
index 156e0475bc86..f9e02949a65d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,49 @@
-# Maintainer: Beej Jorgensen <beej@beej.us>
+# Maintainer: Rojikku <RojikkuNoKami at gmail dot com>
+# Contributor: Beej Jorgensen <beej@beej.us>
 pkgname=umoria
-pkgver=5.6
-pkgrel=5
+pkgver=5.7.13
+pkgrel=1
 pkgdesc="Rogue-like dungeon crawler"
 arch=('i686' 'x86_64')
-url="http://free-moria.sourceforge.net/"
+url="https://umoria.org"
 license=('GPL')
-depends=('ncurses' 'termcap')
-makedepends=('gzip')
+depends=('ncurses')
+makedepends=('gzip' 'cmake')
 backup=("usr/share/${pkgname}/files/scores")
 source=(
   "${pkgname}-${pkgver}-aur.patch"
-  ${pkgname}-${pkgver}.tar.gz::https://github.com/HunterZ/${pkgname}/archive/${pkgver}.tar.gz
+  ${pkgname}-${pkgver}.tar.gz::https://github.com/dungeons-of-moria/${pkgname}/archive/v${pkgver}.tar.gz
 )
 install=${pkgname}.install
-sha512sums=('0a24d506ca6316f498f69fe8996fa7bf73110d99350137bb50b56f53c3eef3bc0379c2d04bc986cc28b50377684f90c0f402923e5283bae6c244d42d521192bd'
-            'd73fa55bc8609d1bb6727b59affb8f1461e6439d2f97de0b45e8f56e01d95a2b500ed4d86ac2690d831ff7e9492e604bcd3dcc47c253b44ab70d3f5da5457067')
+sha512sums=('281275858ce39b5fe07f856e4e126f80fa6a864ada259d1d30c8d97e4dc853ffa6efa805bc1950ab2abd49d1cf0b4f54d60384ffa67f70fa93845628ece145e8'
+            '3a577d9dded3e9a1d6e13e3ab4f87afc38549603e3510e4d778eef65d9251b2feb3f9718709e5f0b19a589259c1de6cc10f6d5eeeee057651fa920393d9ac985')
 
 prepare() {
   cd "$srcdir/${pkgname}-$pkgver"
   patch -Np1 < ../${pkgname}-${pkgver}-aur.patch
-
-  cd source
-  cp ../unix/* .
 }
 
 build() {
-  cd "$srcdir/${pkgname}-$pkgver/source"
-  make -f Makefile.unix
+  cd "$srcdir/${pkgname}-$pkgver"
+  cmake .
+  make
 }
 
 package() {
-  cd "$srcdir/${pkgname}-$pkgver"
+  cd "$srcdir/${pkgname}-$pkgver/umoria"
 
   # binary
-  install -D -m0755 source/moria "${pkgdir}/usr/bin/moria"
+  install -D -m0755 umoria "${pkgdir}/usr/bin/umoria"
 
   # support files
-  install -d -m0755 "${pkgdir}/usr/share/${pkgname}/files"
-  install -m0644 files/* "${pkgdir}/usr/share/${pkgname}/files"
-
-  # set permissions on scores file (must be in games group to use)
-  chgrp games "${pkgdir}/usr/share/${pkgname}/files/scores"
-  chmod 664 "${pkgdir}/usr/share/${pkgname}/files/scores"
-
-  # documentation
-  install -d -m0755 "${pkgdir}/usr/share/doc/${pkgname}/doc"
-  install -m0644 doc/* "${pkgdir}/usr/share/doc/${pkgname}/doc"
-  install -m0644 ChangeLog* "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m0644 ERRORS "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m0644 INSTALL "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m0644 README "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m0644 files/COPYING "${pkgdir}/usr/share/doc/${pkgname}"
-
-  # man page
-  install -d -m0755 "${pkgdir}/usr/share/man/man6"
-  install -m0644 doc/moria.6 "${pkgdir}/usr/share/man/man6"
+  install -d -m0755 "${pkgdir}/usr/share/${pkgname}/data"
+  install -m0644 data/* "${pkgdir}/usr/share/${pkgname}/data"
+  install -m0664 scores.dat "${pkgdir}/usr/share/${pkgname}/data"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  # set permissions on scores file (Uncomment below and change 666 > 664 to make games group exclusive)
+  # chgrp games "${pkgdir}/usr/share/${pkgname}/data/scores.dat"
+  chmod 666 "${pkgdir}/usr/share/${pkgname}/data/scores.dat"
+
 }
 
-# vim:set ts=2 sw=2 et:
diff --git a/umoria-5.6-aur.patch b/umoria-5.6-aur.patch
deleted file mode 100644
index cf2a1e4c6d6f..000000000000
--- a/umoria-5.6-aur.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -Naur umoria-5.6/source/config.h umoria-5.6-aur/source/config.h
---- umoria-5.6/source/config.h	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/config.h	2019-02-03 14:15:12.669986292 -0800
-@@ -240,6 +240,7 @@
- 
- /* Generic UNIX */
- /* This must be unix; change file names as appropriate.  */
-+/*
- #define MORIA_SAV	"moria-save"
- #define MORIA_HOU	"/home/dgrabiner/moria-5.6/files/hours"
- #define MORIA_MOR	"/home/dgrabiner/moria-5.6/files/news"
-@@ -251,6 +252,18 @@
- #define MORIA_OWIZ_HELP	"/home/dgrabiner/moria-5.6/files/owizcmds.hlp"
- #define MORIA_WELCOME	"/home/dgrabiner/moria-5.6/files/welcome.hlp"
- #define MORIA_VER	"/home/dgrabiner/moria-5.6/files/version.hlp"
-+*/
-+#define MORIA_SAV	"moria-save"
-+#define MORIA_HOU	"/usr/share/umoria/files/hours"
-+#define MORIA_MOR	"/usr/share/umoria/files/news"
-+#define MORIA_GPL	"/usr/share/umoria/files/COPYING"
-+#define MORIA_TOP	"/usr/share/umoria/files/scores"
-+#define MORIA_HELP	"/usr/share/umoria/files/roglcmds.hlp"
-+#define MORIA_ORIG_HELP	"/usr/share/umoria/files/origcmds.hlp"
-+#define MORIA_WIZ_HELP	"/usr/share/umoria/files/rwizcmds.hlp"
-+#define MORIA_OWIZ_HELP	"/usr/share/umoria/files/owizcmds.hlp"
-+#define MORIA_WELCOME	"/usr/share/umoria/files/welcome.hlp"
-+#define MORIA_VER	"/usr/share/umoria/files/version.hlp"
- 
- #endif
- #endif
-diff -Naur umoria-5.6/source/death.c umoria-5.6-aur/source/death.c
---- umoria-5.6/source/death.c	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/death.c	2019-02-03 14:28:26.730764222 -0800
-@@ -20,6 +20,7 @@
- 
- /* Must read this before externs.h, as some global declarations use FILE. */
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include "config.h"
- #include "constant.h"
-@@ -63,7 +64,7 @@
- #else
- #ifdef unix
- #ifdef USG
--unsigned short getuid(), getgid();
-+//unsigned short getuid(), getgid();
- #else
- #ifndef SECURE
- #ifdef BSD4_3
-diff -Naur umoria-5.6/source/externs.h umoria-5.6-aur/source/externs.h
---- umoria-5.6/source/externs.h	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/externs.h	2019-02-03 14:27:25.080958861 -0800
-@@ -342,7 +342,7 @@
- 
- /* io.c */
- #ifdef SIGTSTP
--int suspend(void);
-+void suspend(int);
- #endif
- void init_curses(void);
- void moriaterm(void);
-@@ -848,7 +848,7 @@
- 
- /* io.c */
- #ifdef SIGTSTP
--int suspend();
-+void suspend(int);
- #endif
- void init_curses();
- void moriaterm();
-diff -Naur umoria-5.6/source/files.c umoria-5.6-aur/source/files.c
---- umoria-5.6/source/files.c	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/files.c	2019-02-03 14:21:45.638705566 -0800
-@@ -7,6 +7,8 @@
-    included in all such copies. */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
- 
- #if 0
- /* moved to externs.h to avoid VMS 'psect' problem */
-@@ -126,19 +128,19 @@
- 	if (strlen(in_line) > 3)
- 	  {
- 	    if (!strncmp(in_line, "SUN:", 4))
--	      (void) strcpy(days[0], in_line);
-+	      (void) strncpy(days[0], in_line, 29);
- 	    else if (!strncmp(in_line, "MON:", 4))
--	      (void) strcpy(days[1], in_line);
-+	      (void) strncpy(days[1], in_line, 29);
- 	    else if (!strncmp(in_line, "TUE:", 4))
--	      (void) strcpy(days[2], in_line);
-+	      (void) strncpy(days[2], in_line, 29);
- 	    else if (!strncmp(in_line, "WED:", 4))
--	      (void) strcpy(days[3], in_line);
-+	      (void) strncpy(days[3], in_line, 29);
- 	    else if (!strncmp(in_line, "THU:", 4))
--	      (void) strcpy(days[4], in_line);
-+	      (void) strncpy(days[4], in_line, 29);
- 	    else if (!strncmp(in_line, "FRI:", 4))
--	      (void) strcpy(days[5], in_line);
-+	      (void) strncpy(days[5], in_line, 29);
- 	    else if (!strncmp(in_line, "SAT:", 4))
--	      (void) strcpy(days[6], in_line);
-+	      (void) strncpy(days[6], in_line, 29);
- 	  }
-       (void) fclose(file1);
-     }
-diff -Naur umoria-5.6/source/io.c umoria-5.6-aur/source/io.c
---- umoria-5.6/source/io.c	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/io.c	2019-02-03 14:26:29.717800645 -0800
-@@ -19,6 +19,10 @@
-    along with Umoria.  If not, see <http://www.gnu.org/licenses/>. */
- 
- #include <stdio.h>
-+#include <sys/wait.h>
-+
-+typedef void (*sighandler_t)(int);
-+sighandler_t sysv_signal(int signum, sighandler_t handler);
- 
- #include "config.h"
- 
-@@ -249,7 +253,7 @@
-    Handle the stop and start signals. This ensures that the log
-    is up to date, and that the terminal is fully reset and
-    restored.  */
--int suspend()
-+void suspend(int s)
- {
- #ifdef USG
-   /* for USG systems with BSDisms that have SIGTSTP defined, but don't
-@@ -280,7 +284,6 @@
-   (void) wrefresh(curscr);
-   py.misc.male &= ~2;
- #endif
--  return 0;
- }
- #endif
- #endif
-@@ -1569,6 +1572,8 @@
- 
- void bell()
- {
-+  int dummy;
-+
-   put_qio();
- 
-   /* The player can turn off beeps if he/she finds them annoying.  */
-@@ -1578,7 +1583,7 @@
- #ifdef MAC
-   mac_beep();
- #else
--  (void) write(1, "\007", 1);
-+  dummy = write(1, "\007", 1);
- #endif
- }
- 
-diff -Naur umoria-5.6/source/main.c umoria-5.6-aur/source/main.c
---- umoria-5.6/source/main.c	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/main.c	2019-02-03 14:20:13.572335190 -0800
-@@ -67,6 +67,7 @@
- 
- #include	<stdio.h>
- #include	<stdlib.h>
-+#include  <unistd.h>
-  
- #include "config.h"
- #include "constant.h"
-@@ -111,7 +112,7 @@
- #ifndef AMIGA
- #ifdef USG
- #if !defined(MSDOS) && !defined(ATARIST_TC)
--unsigned short getuid(), getgid();
-+//unsigned short getuid(), getgid();
- #endif
- #else
- #ifndef SECURE
-diff -Naur umoria-5.6/source/save.c umoria-5.6-aur/source/save.c
---- umoria-5.6/source/save.c	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/save.c	2019-02-03 14:32:12.460054172 -0800
-@@ -26,6 +26,9 @@
- #endif
- 
- #include <stdio.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
- 
- #ifdef __TURBOC__
- #include	<io.h>
-diff -Naur umoria-5.6/source/signals.c umoria-5.6-aur/source/signals.c
---- umoria-5.6/source/signals.c	2015-02-13 20:12:51.000000000 -0800
-+++ umoria-5.6-aur/source/signals.c	2019-02-03 14:31:16.010231408 -0800
-@@ -24,6 +24,10 @@
- /* To find out what system we're on.  */
- 
- #include <stdio.h>
-+#include <unistd.h>
-+
-+typedef void (*sighandler_t)(int);
-+sighandler_t sysv_signal(int signum, sighandler_t handler);
- 
- #include "config.h"
- #include "constant.h"
-@@ -126,9 +130,8 @@
- #if defined(__TURBOC__) || defined(AMIGA)
- static void signal_handler(sig)
- #else
--static int signal_handler(sig)
-+static void signal_handler(int sig)
- #endif
--int sig;
- {
- #endif
- 
diff --git a/umoria-5.7.13-aur.patch b/umoria-5.7.13-aur.patch
new file mode 100644
index 000000000000..30ad2695c502
--- /dev/null
+++ b/umoria-5.7.13-aur.patch
@@ -0,0 +1,33 @@
+--- umoria/src/config.cpp	2021-02-11 14:59:45.144360084 -0500
++++ umoria-aur/src/config.cpp	2021-02-11 16:18:20.813930047 -0500
+@@ -13,18 +13,18 @@
+     // Data files used by Umoria
+     // NOTE: use relative paths to the executable binary.
+     namespace files {
+-        const std::string splash_screen = "data/splash.txt";
+-        const std::string welcome_screen = "data/welcome.txt";
+-        const std::string license = "LICENSE";
+-        const std::string versions_history = "data/versions.txt";
+-        const std::string help = "data/help.txt";
+-        const std::string help_wizard = "data/help_wizard.txt";
+-        const std::string help_roguelike = "data/rl_help.txt";
+-        const std::string help_roguelike_wizard = "data/rl_help_wizard.txt";
+-        const std::string death_tomb = "data/death_tomb.txt";
+-        const std::string death_royal = "data/death_royal.txt";
+-        const std::string scores = "scores.dat";
+-        std::string save_game = "game.sav";
++        const std::string splash_screen = "/usr/share/umoria/data/splash.txt";
++        const std::string welcome_screen = "/usr/share/umoria/data/welcome.txt";
++        const std::string license = "/usr/share/licenses/umoria/LICENSE";
++        const std::string versions_history = "/usr/share/umoria/data/versions.txt";
++        const std::string help = "/usr/share/umoria/data/help.txt";
++        const std::string help_wizard = "/usr/share/umoria/data/help_wizard.txt";
++        const std::string help_roguelike = "/usr/share/umoria/data/rl_help.txt";
++        const std::string help_roguelike_wizard = "/usr/share/umoria/data/rl_help_wizard.txt";
++        const std::string death_tomb = "/usr/share/umoria/data/death_tomb.txt";
++        const std::string death_royal = "/usr/share/umoria/data/death_royal.txt";
++        const std::string scores = "/usr/share/umoria/data/scores.dat";
++        std::string save_game = "moria-save";
+     } // namespace files
+ 
+     // Game options as set on startup and with `=` set options command -CJS-
diff --git a/umoria.install b/umoria.install
index 60a0b90773cf..722f00ae947b 100644
--- a/umoria.install
+++ b/umoria.install
@@ -3,7 +3,6 @@ post_install() {
 }
 
 post_upgrade() {
-	echo '>>> NOTE: the default save file name has changed from "moria.save"'
-	echo '>>> to "moria-save". Rename the file in your home directory if'
-	echo '>>> necessary.'
+	echo '>>> NOTE: You can change settings with ='
+	echo '>>> Save is still in $PWD/moria-save'
 }