13 files changed, 191 insertions, 161 deletions
diff --git a/games/xu4/README b/games/xu4/README
index 79217a2373..9fe84a50f7 100644
--- a/games/xu4/README
+++ b/games/xu4/README
@@ -1,18 +1,21 @@
-XU4 is a remake of the computer game Ultima IV.  The goal is to make
+xu4 (Ultima IV remake)
+
+XU4 is a remake of the computer game Ultima IV. The goal is to make
 it easy and convenient to play this classic on modern operating
 systems.
 
 XU4 isn't a new game based on the Ultima IV story -- it is a faithful
-recreation of the old game, right up to the crappy graphics.  If you
+recreation of the old game, right up to the crappy graphics. If you
 are looking for a game with modern gameplay and graphics, this is not
-it -- yet.  New features that improve the gameplay and keep with the
+it -- yet. New features that improve the gameplay and keep with the
 spirit of the original game will be added.
 
-Note for users upgrading from Slackware 14.1 to 14.2: if the game won't
-start after the upgrade, see README-SBo.txt for the solution.
+The package includes the Ultima 4 graphics upgrade. To use it, press
+Escape while the game is running to get to the Game Modules menu, then
+select U4 Upgrade, and click "Play".
 
 This package can be built with optional extras. See README-SBo.txt
-for details.
+for details, and also for Slackware-specific notes.
 
 Copyright notice: The file ultima4.zip is included in this package. This
 file and its contents have a proprietary license and MAY NOT be
@@ -22,7 +25,8 @@ SlackBuild, since they include ultima4.zip).
 
 If you have trouble downloading ultima4.zip from the URL listed
 in the .info file, you can instead download UltimaIV.zip from
-http://www.ultimaforever.com/ (registration required, JavaScript browser
-required, no direct download URL). It's a different packaging of the
-same content; the script is smart enough to build a package from either
-release of Ultima 4.
+http://www.ultimaforever.com/ (registration required, JavaScript
+browser required, no direct download URL). It's a different packaging
+of the same content; the script is smart enough to build a package
+from either release of Ultima 4. You might also be able to download it
+from GoG.com, but the SlackBuild author hasn't tested this.
diff --git a/games/xu4/README-SBo.txt b/games/xu4/README-SBo.txt
index 0554d13278..b131265ca6 100644
--- a/games/xu4/README-SBo.txt
+++ b/games/xu4/README-SBo.txt
@@ -1,4 +1,16 @@
-Notes and optional stuff: Music, enhanced graphics, and PDF manuals.
+Notes and optional stuff.
+
+XU4 Upgrade Note
+----------------
+If you upgraded from xu4-20130612_svn to 1.2.1 or later, your old
+settings from ~/.xu4 will no longer be read. You can try:
+
+mkdir -p ~/.config/xu4
+cp -a ~/.xu4/* ~/.config/xu4
+
+...but there's no guarantee the new engine will read the old config or
+savegames (not tested, YMMV).
+
 
 Slackware Upgrade Note
 ----------------------
@@ -6,36 +18,13 @@ If you upgraded from 14.1 to 14.2, your old ~/.xu4/xu4rc needs to be
 edited, to disable XML validation (otherwise the game won't start).
 Edit the file manually, or use this:
 
-sed -i '/validateXml/s,1,0,' ~/.xu4/xu4rc
-
-Music
------
-To hear the in-game music, you'll need a set of MIDI patches, either the
-eawpats or freepats package from slackbuilds.org (make sure you set up
-timidity.cfg correctly). These can be installed after the fact (no need
-to rebuild xu4 after installing them). The timidity package itself isn't
-required (xu4 uses SDL_mixer to play back the music).
+sed -i '/validateXml/s,1,0,' ~/.config/xu4/xu4rc
 
-Enhanced Graphics
------------------
-By default, the script will build a package that uses the graphics from
-the original PC/DOS version of the game. If you'd like to use the
-upgraded graphics from the Ultima IV Upgrade Project, download the file
-u4upgrad.zip and place it in the same directory as the SlackBuild script,
-before running it. The upgrade can be downloaded here:
-
-URL: http://www.moongates.com/u4/upgrade/files/u4upgrad.zip
-md5sum: 4ce9c9cd9dab111275e0ebfde7a482c4
-Homepage: http://www.moongates.com/u4/upgrade/Upgrade.htm
-
-The graphics upgrade isn't listed in the .info file because it isn't
-required to play the game, and also because some users will prefer the
-original CGA-style graphics.
 
 PDF Manuals
 -----------
 Some of the documentation in this package is in Microsoft Word format. To
-read it, you can use KWord... or just live with the text-only versions
+read it, you can use calligra... or just live with the text-only versions
 (also included in this package). These are the manuals for the original
 game, and unlike most modern games, you really do need to read them to
 have any chance of completing Ultima IV. The text files and Word docs
@@ -53,3 +42,12 @@ md5sum: c6be37b7028d6f7b56843a73517a5c31
 
 The PDF docs aren't listed in the .info file because they're fairly large,
 and not needed just to play the game.
+
+
+Running without PulseAudio
+--------------------------
+Some of us still prefer not to use PulseAudio. For xu4, there's no
+option for ALSA or SDL audio. To get sound without PulseAudio, install
+apulse, then run xu4 as "apulse xu4" from a terminal. If you like,
+you can edit the .desktop file to make it launch this way from the
+GUI, too.
diff --git a/games/xu4/doinst.sh b/games/xu4/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/xu4/doinst.sh
+++ b/games/xu4/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/xu4/icons/128.png b/games/xu4/icons/128.png
new file mode 100644
index 0000000000..40d12d1bb7
--- /dev/null
+++ b/games/xu4/icons/128.png
diff --git a/games/xu4/icons/16.png b/games/xu4/icons/16.png
new file mode 100644
index 0000000000..eaf6639060
--- /dev/null
+++ b/games/xu4/icons/16.png
diff --git a/games/xu4/icons/22.png b/games/xu4/icons/22.png
new file mode 100644
index 0000000000..26b94812f7
--- /dev/null
+++ b/games/xu4/icons/22.png
diff --git a/games/xu4/icons/32.png b/games/xu4/icons/32.png
new file mode 100644
index 0000000000..460a88a8d3
--- /dev/null
+++ b/games/xu4/icons/32.png
diff --git a/games/xu4/profile_path.diff b/games/xu4/profile_path.diff
index b436ac55d9..0c5f206062 100644
--- a/games/xu4/profile_path.diff
+++ b/games/xu4/profile_path.diff
@@ -1,29 +1,34 @@
-diff -Naur xu4-20111026_svn/src/settings.cpp xu4-20111026_svn.patched//src/settings.cpp
---- xu4-20111026_svn/src/settings.cpp	2011-06-23 13:36:06.000000000 -0400
-+++ xu4-20111026_svn.patched//src/settings.cpp	2011-10-27 17:27:02.000000000 -0400
-@@ -81,12 +81,6 @@
+diff -Naur xu4-1.2.1/src/settings.cpp xu4-1.2.1.patched/src/settings.cpp
+--- xu4-1.2.1/src/settings.cpp	2022-12-06 13:21:00.000000000 -0500
++++ xu4-1.2.1.patched/src/settings.cpp	2023-01-13 03:37:36.452626171 -0500
+@@ -55,15 +55,6 @@
   * Initialize the settings.
   */
- void Settings::init(const bool useProfile, const string profileName) {
--	if (useProfile) {
--		userPath = "./profiles/";
--		userPath += profileName.c_str();
--		userPath += "/";
--	} else {
+ void Settings::init(const char* profileName) {
+-    if (profileName && profileName[0]) {
+-        userPath = "./profiles/";
+-        userPath += profileName;
+-        userPath += "/";
 -
- #if defined(MACOSX)
-             FSRef folder;
-             OSErr err = FSFindFolder(kUserDomain, kApplicationSupportFolderType, kCreateFolder, &folder);
-@@ -150,7 +144,12 @@
+-        profile = profileName;
+-        if (profile.length() > 20)
+-            errorFatal("Profile name must be no more than 20 characters.");
+-    } else {
+         profile.clear();
+ 
+ #if defined(ANDROID)
+@@ -123,6 +114,14 @@
          userPath = "./";
  #endif
  
-+	if (useProfile) {
-+		userPath += "profiles/";
-+		userPath += profileName.c_str();
-+		userPath += "/";
- 	}
++    if (profileName && profileName[0]) {
++        userPath += "profiles/";
++        userPath += profileName;
++        userPath += "/";
 +
-     FileSystem::createDirectory(userPath);
++        profile = profileName;
++        if (profile.length() > 20)
++            errorFatal("Profile name must be no more than 20 characters.");
+     }
  
-     filename = userPath + SETTINGS_BASE_FILENAME;
+ #ifndef ANDROID
diff --git a/games/xu4/slack-desc b/games/xu4/slack-desc
index 992d9f91e2..3a8e1dfd4a 100644
--- a/games/xu4/slack-desc
+++ b/games/xu4/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 xu4: xu4 (Ultima IV remake)
 xu4:
-xu4: XU4 is a remake of the computer game Ultima IV.  The goal is to make
+xu4: XU4 is a remake of the computer game Ultima IV. The goal is to make
 xu4: it easy and convenient to play this classic on modern operating
 xu4: systems.
 xu4:
 xu4: XU4 isn't a new game based on the Ultima IV story -- it is a faithful
-xu4: recreation of the old game, right up to the crappy graphics.  If you
+xu4: recreation of the old game, right up to the crappy graphics. If you
 xu4: are looking for a game with modern gameplay and graphics, this is not
-xu4: it -- yet.  New features that improve the gameplay and keep with the
+xu4: it -- yet. New features that improve the gameplay and keep with the
 xu4: spirit of the original game will be added.
diff --git a/games/xu4/u4.1 b/games/xu4/xu4.6
index 0fc8fe2376..b406722ab1 100644
--- a/games/xu4/u4.1
+++ b/games/xu4/xu4.6
@@ -1,10 +1,10 @@
-.TH u4 1 "26 Oct 2011" "Version 1.1+svn" "XU4 Manual"
+.TH xu4 6 "January 13 2023" "Version 1.2.1" "SlackBuilds.org"
 
 .SH NAME
-\fBu4\fR \- A modern reimplementation of the classic Ultima IV role\-playing game.
+\fBxu4\fR \- A modern reimplementation of the classic Ultima IV role\-playing game.
 
 .SH SYNOPSIS
-.B u4
+.B xu4
 .RI [ options ]
 
 .SH DESCRIPTION
@@ -14,12 +14,12 @@ it easy and convenient to play this classic on modern operating
 systems. 
 .PP
 This man page only describes the command\-line options and keyboard commands
-supported by \fBu4\fR.
+supported by \fBxu4\fR.
 For full documentation, see the files in \fI/usr/doc/xu4\-@VERSION@/\fR. The
 README is a good place to start. Also the "History of Britannia" and the "Book
 of Mystic Wisdom" are found there (you should read them before playing).
 .SH OPTIONS
-\fBu4\fR accepts the following options:
+\fBxu4\fR accepts the following options:
 .TP
 .B "\-f, \-\-fullscreen"
 Run in fullscreen mode.
@@ -29,13 +29,15 @@ Apply a filter on the scaled images. The <filt>
 parameter must be set to one of the following
 case\-sensitive options:
 .I point
-.I 2xBi
-.I 2xSaI
-.I Scale2x
+.I HQX
+.I xBR-lv2
 .TP
 .B "\-i, \-skipintro"
 Skip the intro, and go directly into the game.
-This option requires the existance of a valid saved game.
+This option requires the existence of a valid saved game.
+.TP
+.B "\-m, \-module <file>"
+Specify game module (default is Ultima-IV).
 .TP
 .B "\-p <profname>, \-profile <profname>"
 Activate a specific save game profile.  Using this
@@ -46,13 +48,13 @@ have e.g. different screen resolutions.
 Use quotation marks around profile names that
 include spaces.
 All profiles are stored in the
-.I ~/.xu4/profiles
+.I ~/.config/xu4/profiles
 sub\-directory.
 The active profile name is shown on the
 introduction map view off the main menu.
 .TP
 .B "\-q, \-quiet"
-Quiet mode \- no music.
+Disable audio.
 .TP
 .B \-scale <n>
 Scale the original graphics by a factor of <n>.
@@ -62,7 +64,7 @@ Factor <n> must be 1, 2, 3, 4, or 5.
 Verbose output; prints out information useful for
 trouble\-shooting.
 .SH KEYBOARD CONTROLS
-XU4 is played entirely with the keyboard. To make choices from menus,
+XU4 is played mainly with the keyboard (though mouse input is supported). To make choices from menus,
 press the first letter of the menu choice (e.g. \fBJ\fR for "Journey Onward"
 at the main menu). The Config menu also supports navigation with the arrow
 keys and Enter.
@@ -177,13 +179,13 @@ ARROW KEYS
 Control movement. North/South/East/West
 .SH FILES
 .TP
-.B ~/.xu4/
+.B ~/.config/xu4/
 Configuration and saved games are stored here, when \fB\-p\fR is not in use. The config file is
 \fBxu4rc\fR. It is human\-readable and editable, but normally is
 created and updated by the in\-game configuration menu. The savegames
 are in a binary format.
 .TP
-.B ~/.xu4/profiles/<profname>/
+.B ~/.config/xu4/profiles/<profname>/
 When using the \fB\-p <profname>\fR option, config and savegame data are
 stored here instead.
 .SH AUTHORS
diff --git a/games/xu4/xu4.SlackBuild b/games/xu4/xu4.SlackBuild
index d4439ca2cc..d336245419 100644
--- a/games/xu4/xu4.SlackBuild
+++ b/games/xu4/xu4.SlackBuild
@@ -1,15 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xu4
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230712 bkw: update for v1.3.
+
+# 20230112 bkw: update for v1.2.1, after ~9 years there's a release!
+# - no more disable_alt_x.diff, it works properly now.
+# - always include the upgrade (u4upgrad.zip), since upstream does.
+# - new dependencies boron and faun.
+# - update man page and rename it u4 => xu4.
+# - rework profile_path.diff.
+# - update README and README-SBo.txt (remove obsolete info, add section
+#   on running without pulse).
+# - TODO: test with the GoG release (someone has to create a GoG account,
+#   even though it's free-of-charge, and I'm not able to).
+
+# 20211012 bkw: BUILD=3,
+# - new-style icon.
+# - binary in /usr/games.
+# - man page in section 6.
+# - disable Alt-x keystroke (it crashes the game).
+# - "Press Alt-x to quit" => "Close window to quit".
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xu4
-VERSION=${VERSION:-20130612_svn}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,23 +42,24 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
 
+# LIBDIRSUFFIX isn't actually used for 1.2.1
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -44,41 +68,31 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# There actually are some executables in the lib dir. If there hadn't
-# been, I would have left it as /usr/lib even on 64-bit, or better yet
-# change to /usr/share. As it is, it has to be /usr/lib64 on 64-bit.
-LIBDIR=/usr/lib$LIBDIRSUFFIX
-PKGLIBDIR=$PKG/$LIBDIR
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# If we didn't supply this file, 'make install' would try to download it.
+cat $CWD/u4upgrad.zip > u4upgrad.zip
 
 # Fix path to "profiles/" dir used by -p option. Patch makes it use
-# ~/.xu4/profiles/ rather than ./profiles off the current dir.
+# ~/.config/xu4/profiles/ rather than ./profiles off the current dir.
 patch -p1 < $CWD/profile_path.diff
 
-# Fix hard-coded libdir. Ugh.
-sed -i -e "s,/usr/lib,$LIBDIR," src/u4file.cpp
+# Use our flags, plus install to /usr/games (not /usr/bin).
+sed -i -e "s,-O3,$SLKCFLAGS," src/Makefile
+sed -i -e "/DESTDIR/s,/bin,/games,g" Makefile
 
-# Stop u4 from writing border.png in the current dir (it never *reads* it!)
-sed -i -e '/border\.png/s,^,//,' src/imagemgr.cpp
-
-# The libxml2 in Slack 14.2 is pickier than the one in 14.1, and fails to
-# validate the game's XML files. So:
-sed -i '/#define *DEFAULT_VALIDATE_XML/s,1,0,' src/settings.h
-
-# The -DNPERF stops u4 from creating a debug/ in the current dir.
-make -C src DEBUGCXXFLAGS="-DNPERF $SLKCFLAGS" prefix=/usr libdir=$PKGLIBDIR
-make -C src install prefix=$PKG/usr libdir=$PKGLIBDIR
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# The configure script isn't autoconf (doesn't support the standard
+# options) and the Makefile uses DESTDIR to mean PREFIX, more-or-less.
+# We don't have to strip the binary (make install does it for us).
+# Since we're not building from a git tree, we have to explicitly
+# set VERSION (it only shows up in --help and the 'About' in the game).
+./configure --prefix /usr
+make DESTDIR=/usr VERSION=$VERSION
+make install DESTDIR=$PKG/usr VERSION=$VERSION
 
 # If we have the official release rather than the "dragon" one, repackage
 # it with the same layout as the dragon release. Note that the official
@@ -90,42 +104,45 @@ fi
 
 # The game data. This is the zip file, not the self-extracting exe (the
 # exe lacks the documentation, for one thing).
-cat $CWD/ultima4.zip > $PKGLIBDIR/u4/ultima4.zip
+cat $CWD/ultima4.zip > $PKG/usr/share/xu4/ultima4.zip
 
 # Replace stock .desktop file with one that validates.
-cat $CWD/u4.desktop > $PKG/usr/share/applications/u4.desktop
-
-# These files should be (but aren't) installed by "make install". Without
-# them, we get no music!
-install -m0644 mid/*.it $PKGLIBDIR/u4/music/
-
-# Remove execute permission from data files. Grr.
-chmod 644 $PKG/usr/share/pixmaps/* $PKG/usr/share/applications/*
-find $PKGLIBDIR \
-  -type f -a \
-  \( -name \*.mid -o -name \*.vga -o -name \*.png -o \
-     -name \*.xml -o -name \*.dtd -o -name \*.ogg \) \
-  -print0 | xargs -0 chmod 644
-
-# Docs. N.B. we don't need border.png.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/developers
-cp -a *.html AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION/developers
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# Include the upgrade (and extract its docs) if we have it.
-if [ -e $CWD/u4upgrad.zip ]; then
-  cat $CWD/u4upgrad.zip > $PKGLIBDIR/u4/u4upgrad.zip
-  cd $PKG/usr/doc/$PRGNAM-$VERSION
-  unzip $CWD/u4upgrad.zip Readme.txt
-  mv Readme.txt Readme-Upgrade.txt
-  cd -
-fi
+cat $CWD/xu4.desktop > $PKG/usr/share/applications/xu4.desktop
+
+# New-style icons, made by downsizing icons/u4.png, except 128x128 was
+# extracted from icons/xu4.icns in the source. I didn't downsize the
+# Mac icon because it has a checkerboard background that looks good
+# at 128x128, but horrid when downscaled.
+# 48x48 was already installed, above.
+HICOLOR=$PKG/usr/share/icons/hicolor/
+mkdir -p $HICOLOR/64x64/apps
+cat icons/u4.png > $HICOLOR/64x64/apps/$PRGNAM.png
+
+for i in $CWD/icons/*.png; do
+  px=$( basename $i | cut -d. -f1 )
+  size=${px}x${px}
+  dir=$HICOLOR/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/u4.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/xu4.png $PKG/usr/share/pixmaps/xu4.png
+
+# Docs.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/developers
+cp -a AUTHORS COPYING ChangeLog README* $PKGDOC
+cp -a doc/* $PKGDOC/developers
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# Include the upgrade's docs.
+unzip -p $CWD/u4upgrad.zip Readme.txt > $PKGDOC/Readme-Upgrade.txt
 
 # Include the PDF docs, if we have them.
 if [ -e $CWD/ultima4_scanned_docs.zip ]; then
-  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pdf
-  cd $PKG/usr/doc/$PRGNAM-$VERSION/pdf
+  mkdir -p $PKGDOC/pdf
+  cd $PKGDOC/pdf
   unzip $CWD/ultima4_scanned_docs.zip '*.pdf'
   mv ultima4_scanned_docs/Ultima_IV_-_Cluebook_-_PC.pdf Hints.pdf
   mv ultima4_scanned_docs/Ultima_IV_-_Manual_-_PC.pdf History.pdf
@@ -135,7 +152,7 @@ if [ -e $CWD/ultima4_scanned_docs.zip ]; then
 fi
 
 # Include the original Ultima IV docs.
-cd $PKG/usr/doc/$PRGNAM-$VERSION
+cd $PKGDOC
 unzip $CWD/ultima4.zip '*.txt' '*.doc' '*.bmp' '*.jpg' || true
 
 # These docs only apply to running the original game on DOS or Windows. Bye.
@@ -153,18 +170,14 @@ chmod 644 *.txt ms_word_docs/*.doc
 sed -i 's/\r//' *.txt
 cd -
 
-# I hate packages called "xfoo" whose binaries are called "foo".
-ln -s u4 $PKG/usr/bin/$PRGNAM
-
 # I also hate binaries that take options but have no man pages, so here's
-# the one I made. Enjoy.
-mkdir -p $PKG/usr/man/man1
-sed "s/@VERSION@/$VERSION/" $CWD/u4.1 | gzip -9c - > $PKG/usr/man/man1/u4.1.gz
-ln -s u4.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
+# the one I made. Enjoy. I wish I'd used rst or pod for it...
+mkdir -p $PKG/usr/man/man6
+sed "s/@VERSION@/$VERSION/" $CWD/xu4.6 | gzip -9c - > $PKG/usr/man/man6/xu4.6.gz
 
 mkdir -p $PKG/install
 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/games/xu4/u4.desktop b/games/xu4/xu4.desktop
index 6674892a97..ce36a0b610 100644
--- a/games/xu4/u4.desktop
+++ b/games/xu4/xu4.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Ultima 4
 Comment=Ultima 4 (xu4)
-Exec=u4
-Icon=u4
+Exec=xu4
+Icon=xu4
 Terminal=false
 Type=Application
 Categories=Game;RolePlaying;
diff --git a/games/xu4/xu4.info b/games/xu4/xu4.info
index 7c0e1d4661..bfba477b74 100644
--- a/games/xu4/xu4.info
+++ b/games/xu4/xu4.info
@@ -1,12 +1,14 @@
 PRGNAM="xu4"
-VERSION="20130612_svn"
-HOMEPAGE="http://xu4.sourceforge.net/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/xu4-20130612_svn.tar.xz \
-          http://www.thatfleminggent.com/ultima/ultima4.zip"
-MD5SUM="a0c013bf91458b2b4c5ad8c729990d62 \
-        f2006a5dbf175571912ef2594b6eb900"
+VERSION="1.3"
+HOMEPAGE="https://xu4.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/xu4/xu4/1.3/xu4-1.3.tar.gz \
+          https://web.archive.org/web/20091209235819/http://www.thatfleminggent.com/ultima/ultima4.zip \
+          https://downloads.sourceforge.net/project/xu4/Ultima%204%20VGA%20Upgrade/1.3/u4upgrad.zip"
+MD5SUM="4f853f18029b6bcb7022525e0831d68a \
+        f2006a5dbf175571912ef2594b6eb900 \
+        4ce9c9cd9dab111275e0ebfde7a482c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="boron faun"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"