4 files changed, 52 insertions, 22 deletions
diff --git a/games/eduke32_hires_pack/README b/games/eduke32_hires_pack/README
index ac71ec5a55b8e..11ce0fcda5f22 100644
--- a/games/eduke32_hires_pack/README
+++ b/games/eduke32_hires_pack/README
@@ -9,6 +9,13 @@ original episodes once again.
 This package is intended for use with the eduke32 package from
 slackbuilds.org, but may also be used with other Duke3D source ports.
 
+Optionally, this package can include the EDuke32 Music Pack, which
+provides better-sounding music than the default MIDI soundtrack. To
+include the music pack, download the file from:
+
+http://www.duke4.org/files/nightfright/eduke32_mus.zip
+
+...and save it in the same directory as the SlackBuild.
+
 If you've installed this package, but for some reason want to run eduke32
-without it, remove the ~/.eduke32/autoload symlink and create an empty
-~/.eduke32/autoload directory.
+without it, run "eduke32 -noautoload".
diff --git a/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild b/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild
index e13fe0a7d08f2..21a0d58db68f0 100644
--- a/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild
+++ b/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild
@@ -5,9 +5,8 @@
 # Written by B. Watson (yalhcru@gmail.com)
 
 PRGNAM=eduke32_hires_pack
-VERSION=${VERSION:-20070427}
-ZIPFILE=dn3d_hrp-27-04-2007.zip
-ARCH=${ARCH:-noarch}
+VERSION=${VERSION:-4.0_321}
+ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -16,29 +15,45 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+VERMAJOR=$( echo $VERSION | cut -d_ -f1 )
+VERMINOR=$( echo $VERSION | cut -d_ -f2 )
+ZIPFILE="dn3d_hrp-${VERMAJOR}(${VERMINOR}).zip"
+
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr/share/games/eduke32 $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip $CWD/$ZIPFILE
-chmod 644 *.*
-chmod 755 autoload autoload/duke3d.grp
-
-# 20080810 bkw: sd_duke stuff doesn't seem to work
-rm -f sd_duke.*
-
 chown -R root:root .
+find . -type d | xargs chmod 755
+find . -type f | xargs chmod 644
+
+mkdir -p $PKG/usr/share/games/eduke32 
 mv autoload $PKG/usr/share/games/eduke32/autoload
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt *.TXT $PKG/usr/doc/$PRGNAM-$VERSION
+# If they have the music pack, include that too
+if [ -r $CWD/eduke32_mus.zip ]; then
+  unzip $CWD/eduke32_mus.zip music_readme.txt
+  cat music_readme.txt > $PKG/usr/doc/$PRGNAM-$VERSION/music_readme.txt
+  cat $CWD/eduke32_mus.zip > \
+    $PKG/usr/share/games/eduke32/autoload/duke3d.grp/eduke32_mus.zip
+fi
+
+cp *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 
+# De-windows-ize the docs
+sed -i -s -e "s/\\x92/'/g" \
+          -e 's/\x96/-/g' \
+          -e 's/\r//g' \
+          $PKG/usr/doc/$PRGNAM-$VERSION/*.txt
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/games/eduke32_hires_pack/eduke32_hires_pack.info b/games/eduke32_hires_pack/eduke32_hires_pack.info
index c6331a3a8e792..368f80d1cc6bb 100644
--- a/games/eduke32_hires_pack/eduke32_hires_pack.info
+++ b/games/eduke32_hires_pack/eduke32_hires_pack.info
@@ -1,8 +1,8 @@
 PRGNAM="eduke32_hires_pack"
-VERSION="20070427"
+VERSION="4.0_321"
 HOMEPAGE="http://hrp.duke4.net/"
-DOWNLOAD="http://moreplease.free.fr/HRP/Parkar/dn3d_hrp-27-04-2007.zip"
-MD5SUM="007542782217d08a7da4c063935708eb"
+DOWNLOAD="http://www.duke4.org/files/hrp/dn3d_hrp-4.0(321).zip"
+MD5SUM="01ec2c1d9be94bcb556c910814f2b85f"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="dsomero"
diff --git a/games/eduke32_hires_pack/slack-desc b/games/eduke32_hires_pack/slack-desc
index dcdb6c2f15b27..eb963fad14de4 100644
--- a/games/eduke32_hires_pack/slack-desc
+++ b/games/eduke32_hires_pack/slack-desc
@@ -1,11 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                  |-----handy-ruler------------------------------------------------------|
 eduke32_hires_pack: eduke32_hires_pack (Duke3D High Resolution Pack)
 eduke32_hires_pack: The Duke3D High Resolution Pack allows you to use much better looking
 eduke32_hires_pack: textures than the original game (released back in 1996) had to offer
-eduke32_hires_pack: in the first place. It also introduces 3D model replacements for the
-eduke32_hires_pack: old enemies/weapons/items sprites. In combination with an OpenGL port
-eduke32_hires_pack: like JFDuke3D or EDuke32, this gives Duke Nukem 3D a modernized, more
-eduke32_hires_pack: appealing look and even motivates Duke veterans to play through the
-eduke32_hires_pack: original episodes once again.
+eduke32_hires_pack: in the first place. It also introduces 3D model replacements for
+eduke32_hires_pack: the old enemies/weapons/items sprites. In combination with an OpenGL
+eduke32_hires_pack: port like JFDuke3D or EDuke32, this gives Duke Nukem 3D a modernized,
+eduke32_hires_pack: more appealing look and even motivates Duke veterans to play through
+eduke32_hires_pack: the original episodes once again.
 eduke32_hires_pack:
 eduke32_hires_pack: This package is intended for use with the eduke32 package from
 eduke32_hires_pack: slackbuilds.org, but may also be used with other Duke3D source ports.