4 files changed, 31 insertions, 15 deletions
diff --git a/system/sdl-jstest/README b/system/sdl-jstest/README
index 3077a011a5a09..bdbbc2369f4e8 100644
--- a/system/sdl-jstest/README
+++ b/system/sdl-jstest/README
@@ -3,4 +3,7 @@ joysticks SDL detected on your system, how many axes, buttons, hats
 and balls they have each. It also lets you test the joysticks by
 displaying the events they send or by displaying their current button,
 axis, hat or ball state. sdl-jstest is especially useful if you want
-to test your SDL_LINUX_JOYSTICK configuration.
+to test your SDL Linux joystick configuration.
+
+Optional dependency: if SDL2 is installed, the SDL2 version will
+be built and installed as sdl2-jstest.
diff --git a/system/sdl-jstest/sdl-jstest.SlackBuild b/system/sdl-jstest/sdl-jstest.SlackBuild
index 853901e1d56fe..69acb531b0b4f 100644
--- a/system/sdl-jstest/sdl-jstest.SlackBuild
+++ b/system/sdl-jstest/sdl-jstest.SlackBuild
@@ -22,8 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20140828 bkw:
+# - updated for latest git
+# - upstream now supports both sdl1 and sdl2, build for sdl2 only
+#   if installed
+
 PRGNAM=sdl-jstest
-VERSION=${VERSION:-20110416git}
+VERSION=${VERSION:-20140814git}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,6 +61,9 @@ fi
 
 set -e
 
+# if SDL2 is available, this will be built too.
+PRGNAM2=sdl2-jstest
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -69,18 +77,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make CC="gcc $SLKCFLAGS"
+TARGETS="$PRGNAM $PRGNAM.1"
+pkg-config --exists sdl2 && TARGETS="$TARGETS $PRGNAM2 $PRGNAM2.1"
+
+make $TARGETS CC="gcc $SLKCFLAGS"
 
-install -D $PRGNAM $PKG/usr/bin/$PRGNAM
-strip --strip-unneeded $PKG/usr/bin/$PRGNAM 2> /dev/null
+PKGBIN=$PKG/usr/bin/
+mkdir -p $PKGBIN
+install -s -m0755 $PRGNAM $PKGBIN
+[ -e sdl2-jstest ] && install -s -m0755 $PRGNAM2 $PKGBIN
 
-mkdir -p $PKG/usr/man/man1
-cat $PRGNAM.1 | gzip -9 > $PKG/usr/man/man1/$PRGNAM.1.gz
+PKGMAN1=$PKG/usr/man/man1
+mkdir -p $PKGMAN1
+gzip -9c $PRGNAM.1 > $PKGMAN1/$PRGNAM.1.gz
+[ -e sdl2-jstest ] && gzip -9c $PRGNAM2.1 > $PKGMAN1/$PRGNAM2.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info
index ba864aac56024..b4db7d7de7990 100644
--- a/system/sdl-jstest/sdl-jstest.info
+++ b/system/sdl-jstest/sdl-jstest.info
@@ -1,10 +1,10 @@
 PRGNAM="sdl-jstest"
-VERSION="20110416git"
+VERSION="20140814git"
 HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/sdl-jstest-20110416git.tar.xz"
-MD5SUM="516e5ea89fcfd8d4ecac14eda39551ec"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20140814git.tar.gz"
+MD5SUM="af6d7f8325bef39924e680690f9de4d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B Watson"
-EMAIL=" yalhcru@gmail.com"
+EMAIL="yalhcru@gmail.com"
diff --git a/system/sdl-jstest/slack-desc b/system/sdl-jstest/slack-desc
index c80afa9a8f26a..7314bcb79324b 100644
--- a/system/sdl-jstest/slack-desc
+++ b/system/sdl-jstest/slack-desc
@@ -13,7 +13,7 @@ sdl-jstest: joysticks SDL detected on your system, how many axes, buttons, hats
 sdl-jstest: and balls they have each. It also lets you test the joysticks by
 sdl-jstest: displaying the events they send or by displaying their current button,
 sdl-jstest: axis, hat or ball state. sdl-jstest is especially useful if you want
-sdl-jstest: to test your SDL_LINUX_JOYSTICK configuration.
+sdl-jstest: to test your SDL Linux joystick configuration.
 sdl-jstest:
 sdl-jstest: Homepage: https://github.com/Grumbel/sdl-jstest
 sdl-jstest: