8 files changed, 53 insertions, 53 deletions
diff --git a/games/UrbanTerror/README b/games/UrbanTerror/README
index b9cd2eab1c..fd79bb1bef 100644
--- a/games/UrbanTerror/README
+++ b/games/UrbanTerror/README
@@ -3,3 +3,17 @@ Urban Terror started as a realism based "total conversion" mod for
 Quake III Arena. Nowadays, Urban Terror is played using the free, 
 stand-alone, ioquake3 engine modified, which doesn't require 
 Quake III Arena, in addition to being an add-on to id Software's.
+
+UPDATING SLACKWARE 12.2 TO 13.0
+If you had a previous installation under Slackware 12.2 and are using the 
+same user profile, you will not be able to download maps from servers.
+You will receive a message about the game not finding libcurl.so.3.
+This message is received because Slackware 13.0 is using libcurl.so.4, 
+the solution to this issue is to run the following command in the terminal:
+sed -i 's/libcurl.so.3/libcurl.so.4/g' $HOME/.q3a/q3ut4/q3config.cfg
+
+This command will replace the reference in your game confguration file
+with a reference to the newer libraries.
+
+Any new profiles will automatically have the correct reference because the
+primary configuration has already been altered.
diff --git a/games/UrbanTerror/UrbanTerror.SlackBuild b/games/UrbanTerror/UrbanTerror.SlackBuild
index 5947c1fe0c..4cf3998323 100644
--- a/games/UrbanTerror/UrbanTerror.SlackBuild
+++ b/games/UrbanTerror/UrbanTerror.SlackBuild
@@ -10,20 +10,12 @@
 #  GPL license - ioUrbanTerror uses the GPL license and its source code
 #   is openly available
 #
-# Full copies of the licenses wil lbe installed in /usr/doc/urbanterror-4.1
-
-# TODO LIST:
-#   Move binaries from /usr/libexec to /usr/games
-#   setup symlinks in /usr/bin to the execs
-#
-# DATA FILES - /usr/share/games X
-# BIN - /usr/games/
-# exec - symlinks in /usr/bin
+# Full copies of the licenses will be installed in /usr/doc/urbanterror-4.1
 
 PRGNAM=UrbanTerror
 VERSION=${VERSION:-4.1}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -31,74 +23,66 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCVER=$(echo $VERSION|tr -d ".")
+ZIP_VERS=$(echo $VERSION|tr -d ".")
 
 if [ "$ARCH" = "i486" ]; then
   EXEC="i386"
+  LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
 elif [ "$ARCH" = "i686" ]; then
   EXEC="i386"
+  LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
 elif [ "$ARCH" = "x86_64" ]; then
   EXEC="x86_64"
+  LIBDIRSUFFIX=${LIBDIRSUFFIX:-"64"}
+else
+  echo "Unrecognized architecture type! Check the script: $0"
+  exit 1
 fi
 
+CLIENT_EXEC=${CLIENT_EXEC:-ioUrbanTerror.${EXEC}}
+SERVER_EXEC=${SERVER_EXEC:-ioUrTded.${EXEC}}
+
 set -e # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT 
-cd $PKG
-unzip $CWD/${PRGNAM}_${SRCVER}_FULL.zip -d $PKG
 
-mkdir -p $PKG/usr/share/games/$PRGNAM-$VERSION
-mv $PRGNAM $PKG/usr/share/games/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+unzip $CWD/${PRGNAM}_${ZIP_VERS}_FULL.zip -d $PKG/usr/lib${LIBDIRSUFFIX}
 
 # Make the current arch execs executable
-chmod a+x $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/ioUrbanTerror.${EXEC}
-chmod a+x $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/ioUrTded.${EXEC}
-
-# Move the executables
-mkdir -p $PKG/usr/games/$PRGNAM
-mv $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/ioUrbanTerror.${EXEC} \
-   $PKG/usr/games/$PRGNAM/urbanterror
-mv $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/ioUrTded.${EXEC} \
-   $PKG/usr/games/$PRGNAM/ioUrTded.${EXEC}
-
-# Make symlinks to allow the executables to use the data files
-cd $PKG/usr/games/$PRGNAM
-  ln -s ../../share/games/$PRGNAM-$VERSION/$PRGNAM/ioUrbanTerror.app .
-  ln -s ../../share/games/$PRGNAM-$VERSION/$PRGNAM/q3ut4 .
-cd -
+chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{${CLIENT_EXEC},${SERVER_EXEC}}
 
-# Setup symlinks to binaries in /usr/bin
-mkdir -p $PKG/usr/bin
-cd $PKG/usr/bin
-  ln -s ../games/$PRGNAM/urbanterror .
-  ln -s ../games/$PRGNAM/ioUrTded.${EXEC} .
+# Create symlinks in /usr/games
+mkdir -p $PKG/usr/games
+cd $PKG/usr/games
+  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/${CLIENT_EXEC} urbanterror
+  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/${SERVER_EXEC} .
 cd -
 
-# Place the icon and .desktop files
-mkdir $PKG/usr/share/{applications,pixmaps}
+# Correct the curl dependancy
+echo -e "seta cl_cURLLib \"libcurl.so.4.1.1\"" >> \
+  $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/q3ut4/autoexec.cfg
+
+# Add a menu entry and icon
+mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop 
 cat $CWD/q3ut.png > $PKG/usr/share/pixmaps/q3ut.png
 
-# Remove unused files
-rm -f $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/*.exe \
-   $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/*.url
-if [ $EXEC = i386 ]; then
-  rm -f $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/*.x86_64
-elif [ $EXEC = x86_64 ]; then
-  rm -f $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/*.i386
-fi
-rm -rf $PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/ioUrbanTerror.app/Contents/MacOS
-rm -rf "$PKG/usr/share/games/$PRGNAM-$VERSION/$PRGNAM/q3ut4/Urban Terror on the Web.url"
+# Remove unused files from the package
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{,q3ut4/}*.{doc,exe,url}
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/ioUrbanTerror.app/Contents/MacOS
+[ "$EXEC" != "i386" ] && rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/*.i386
+[ "$EXEC" != "x86_64" ] && rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/*.x86_64
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/games/$PRGNAM-$VERSION/${PRGNAM}/*.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/ioUrbanTerror_* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp $CWD/docs/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir $PKG/install  
-cat $CWD/slack-desc > $PKG/install/slack-desc
+cp -p $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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/UrbanTerror/UrbanTerror.info b/games/UrbanTerror/UrbanTerror.info
index de5644731e..fe449f70f8 100644
--- a/games/UrbanTerror/UrbanTerror.info
+++ b/games/UrbanTerror/UrbanTerror.info
@@ -3,6 +3,8 @@ VERSION="4.1"
 HOMEPAGE="http://www.urbanterror.net"
 DOWNLOAD="http://dls.urt.voxel.net/q3ut4/UrbanTerror_41_FULL.zip"
 MD5SUM="1370306ea236f65f595e7ca70765e469"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Matthew Fillpot"
 EMAIL="mfilpot@gmail.com"
-APPROVED="dsomero,rworkman"
+APPROVED="rworkman"
diff --git a/games/UrbanTerror/QIIIA Game Source License.txt b/games/UrbanTerror/docs/QIIIA Game Source License.txt
index b391fe95db..b391fe95db 100644
--- a/games/UrbanTerror/QIIIA Game Source License.txt
+++ b/games/UrbanTerror/docs/QIIIA Game Source License.txt
diff --git a/games/UrbanTerror/ioUrbanTerror_COPYING.txt b/games/UrbanTerror/docs/ioUrbanTerror_COPYING.txt
index 98443f353f..98443f353f 100644
--- a/games/UrbanTerror/ioUrbanTerror_COPYING.txt
+++ b/games/UrbanTerror/docs/ioUrbanTerror_COPYING.txt
diff --git a/games/UrbanTerror/ioUrbanTerror_README.txt b/games/UrbanTerror/docs/ioUrbanTerror_README.txt
index b3736a0dd0..b3736a0dd0 100644
--- a/games/UrbanTerror/ioUrbanTerror_README.txt
+++ b/games/UrbanTerror/docs/ioUrbanTerror_README.txt
diff --git a/games/UrbanTerror/ioUrbanTerror_id-readme.txt b/games/UrbanTerror/docs/ioUrbanTerror_id-readme.txt
index 55b00f33d7..55b00f33d7 100644
--- a/games/UrbanTerror/ioUrbanTerror_id-readme.txt
+++ b/games/UrbanTerror/docs/ioUrbanTerror_id-readme.txt
diff --git a/games/UrbanTerror/slack-desc b/games/UrbanTerror/slack-desc
index 6c409f25d7..f9b0649c85 100644
--- a/games/UrbanTerror/slack-desc
+++ b/games/UrbanTerror/slack-desc
@@ -7,7 +7,7 @@
 
           |-----handy-ruler------------------------------------------------------|
 UrbanTerror: UrbanTerror (An urban combat themed First Person Shooter)
-UrbanTerror:     
+UrbanTerror:
 UrbanTerror: Urban Terror started as a realism based "total conversion" mod for 
 UrbanTerror: Quake III Arena. Nowadays, Urban Terror is played using the free, 
 UrbanTerror: stand-alone, modified ioquake3 engine, which doesn't require