4 files changed, 31 insertions, 29 deletions
diff --git a/graphics/xtrkcad/README b/graphics/xtrkcad/README
index 5bdf17ba13..d2e088035f 100644
--- a/graphics/xtrkcad/README
+++ b/graphics/xtrkcad/README
@@ -7,3 +7,5 @@ the printout can be used as a template for track laying.
 
 Beginner's Tutorial: http://www.xtrkcad.org/Wikka/BeginnerTutorial
 User Guide:          http://www.xtrkcad.org/Wikka/UserGuide
+
+graphviz is an optional dependency.
diff --git a/graphics/xtrkcad/slack-desc b/graphics/xtrkcad/slack-desc
index a46850212f..428b1f100b 100644
--- a/graphics/xtrkcad/slack-desc
+++ b/graphics/xtrkcad/slack-desc
@@ -14,6 +14,6 @@ xtrkcad: predefined libraries for many popular brands of track.  You
 xtrkcad: can test your design by running trains, and you can print the 
 xtrkcad: design in a scale of your choice.  When printed in 1:1 scale 
 xtrkcad: the printout can be used as a template for track laying.
-xtrkcad: 
+xtrkcad:
 xtrkcad: Homepage: http://www.xtrkcad.org/
-xtrkcad: 
+xtrkcad:
diff --git a/graphics/xtrkcad/xtrkcad.SlackBuild b/graphics/xtrkcad/xtrkcad.SlackBuild
index fdb4ff6108..34b3f6b0c9 100644
--- a/graphics/xtrkcad/xtrkcad.SlackBuild
+++ b/graphics/xtrkcad/xtrkcad.SlackBuild
@@ -7,7 +7,8 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=xtrkcad
-VERSION=4.0.2
+SRCNAM=xtrkcad-source
+VERSION=4.0.3a
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,8 +20,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -28,39 +34,31 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM/app
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make product VERBOSE=1 COPTS="$SLKCFLAGS"
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DXTRKCAD_USE_GTK=ON \
+  -DXTRKCAD_USE_GTK_CAIRO=ON \
+  .
 
-mkdir -p $PKG/usr/lib/xtrkcad/params
-cp -a lib/params/*.xtp $PKG/usr/lib/xtrkcad/params
-cp -a lib/xtrkcad.{bug,enh,fix,upd,xtq} lib/logo.bmp bin/xtc64.xpm \
-  help/xtrkcad.tip  $PKG/usr/lib/xtrkcad
+make
+make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/bin
-cp -a bin/xtrkcad $PKG/usr/bin
 strip --strip-unneeded $PKG/usr/bin/xtrkcad
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{examples,html,demos}
-cp -a COPYING README bin/ChangeLog lib/aareadme.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a lib/demos/*.xtr $PKG/usr/doc/$PRGNAM-$VERSION/demos
-cp -a lib/examples/*.xtc $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a doc/*.html doc/png.d/ doc/xtrkcad_lin.css $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a app/COPYING app/doc/ChangeLog app/lib/Readme.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# The package expects docs to be in /usr/lib/xtrkcad/$dir
-cd $PKG/usr/lib/xtrkcad
-  ln -s /usr/doc/$PRGNAM-$VERSION/examples .
-  ln -s /usr/doc/$PRGNAM-$VERSION/html .
-  ln -s /usr/doc/$PRGNAM-$VERSION/demos .
-cd -
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/graphics/xtrkcad/xtrkcad.info b/graphics/xtrkcad/xtrkcad.info
index 84e4dca9aa..1bf44070ec 100644
--- a/graphics/xtrkcad/xtrkcad.info
+++ b/graphics/xtrkcad/xtrkcad.info
@@ -1,8 +1,10 @@
 PRGNAM="xtrkcad"
-VERSION="4.0.2"
+VERSION="4.0.3a"
 HOMEPAGE="http://www.xtrkcad.org/"
-DOWNLOAD="http://downloads.sourceforge.net/xtrkcad-fork/xtrkcad-4.0.2.tar.gz"
-MD5SUM="b33407bd5046185b5938fee0bdb8c897"
+DOWNLOAD="http://downloads.sourceforge.net/xtrkcad-fork/xtrkcad-source-4.0.3a.tar.gz"
+MD5SUM="d4e281781b9695f96f48ce0dde98ec9e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="nobbutl@yahoo.co.uk"
 APPROVED="rworkman"