Version 5.6-2

4 files changed, 178 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..33b2da9d0203
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,20 @@
+pkgbase = umoria
+	pkgdesc = Rogue-like dungeon crawler
+	pkgver = 5.6
+	pkgrel = 2
+	url = http://www-math.bgsu.edu/~grabine/moria.html
+	install = umoria.install
+	arch = i686
+	arch = x86_64
+	license = GPL3
+	makedepends = gzip
+	depends = ncurses
+	depends = termcap
+	backup = usr/share/umoria/files/scores
+	source = umoria-5.6-aur.patch
+	source = http://beej.us/moria/files/source/moria_5.6.tar.gz
+	md5sums = 66beb16532261ce7967680bb205944d8
+	md5sums = 09fd637948e3486730c88e8e15eb42fa
+
+pkgname = umoria
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..3fbb773fa1c6
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer: Beej Jorgensen <beej@beej.us>
+# Contributor: Beej Jorgensen <beej@beej.us>
+
+# I'm not sure what the canonical URL for Umoria 5.6 is.
+# This source was originally from this URL:
+# http://ftp.de.debian.org/debian/pool/main/m/moria/moria_5.6.orig.tar.gz
+# but that has been mirrored at the location below for safe keeping.
+
+pkgname=umoria
+pkgver=5.6
+pkgrel=2
+pkgdesc="Rogue-like dungeon crawler"
+arch=('i686' 'x86_64')
+url="http://www-math.bgsu.edu/~grabine/moria.html"
+license=('GPL3')
+depends=('ncurses' 'termcap')
+makedepends=('gzip')
+backup=("usr/share/${pkgname}/files/scores")
+source=(
+  "${pkgname}-${pkgver}-aur.patch"
+  "http://beej.us/moria/files/source/moria_${pkgver}.tar.gz"
+)
+install=${pkgname}.install
+md5sums=('66beb16532261ce7967680bb205944d8'
+         '09fd637948e3486730c88e8e15eb42fa')
+
+prepare() {
+  cd "$srcdir/moria-$pkgver"
+  patch -Np1 < ../${pkgname}-${pkgver}-aur.patch
+
+  cd source
+  cp ../unix/* .
+}
+
+build() {
+  cd "$srcdir/moria-$pkgver/source"
+  make -f Makefile.unix
+}
+
+package() {
+  cd "$srcdir/moria-$pkgver"
+
+  # binary
+  install -D -m0755 source/moria "${pkgdir}/usr/bin/moria"
+
+  # 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"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/umoria-5.6-aur.patch b/umoria-5.6-aur.patch
new file mode 100644
index 000000000000..4fac5c93bfd6
--- /dev/null
+++ b/umoria-5.6-aur.patch
@@ -0,0 +1,81 @@
+diff -Naur moria-5.6/source/config.h moria-5.6-aur/source/config.h
+--- moria-5.6/source/config.h	2008-10-13 16:44:36.000000000 -0700
++++ moria-5.6-aur/source/config.h	2014-10-14 00:22:12.121012390 -0700
+@@ -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 moria-5.6/source/files.c moria-5.6-aur/source/files.c
+--- moria-5.6/source/files.c	2008-10-13 16:44:36.000000000 -0700
++++ moria-5.6-aur/source/files.c	2014-10-14 00:22:16.457384250 -0700
+@@ -126,19 +126,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 moria-5.6/source/io.c moria-5.6-aur/source/io.c
+--- moria-5.6/source/io.c	2008-10-13 16:44:36.000000000 -0700
++++ moria-5.6-aur/source/io.c	2014-10-14 00:22:21.280389695 -0700
+@@ -1569,6 +1569,8 @@
+ 
+ void bell()
+ {
++  int dummy;
++
+   put_qio();
+ 
+   /* The player can turn off beeps if he/she finds them annoying.  */
+@@ -1578,7 +1580,7 @@
+ #ifdef MAC
+   mac_beep();
+ #else
+-  (void) write(1, "\007", 1);
++  dummy = write(1, "\007", 1);
+ #endif
+ }
+ 
diff --git a/umoria.install b/umoria.install
new file mode 100644
index 000000000000..60a0b90773cf
--- /dev/null
+++ b/umoria.install
@@ -0,0 +1,9 @@
+post_install() {
+	echo '>>> Add yourself to the "games" group to use the high scores file.'
+}
+
+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.'
+}