3 files changed, 22 insertions, 29 deletions
diff --git a/graphics/VariCAD/VariCAD.SlackBuild b/graphics/VariCAD/VariCAD.SlackBuild
index 1444f2961b17..b1d937366111 100644
--- a/graphics/VariCAD/VariCAD.SlackBuild
+++ b/graphics/VariCAD/VariCAD.SlackBuild
@@ -5,10 +5,10 @@
 
 # Written by Niels Horn <niels.horn@gmail.com>
 # with inspiration from the OpenOffice.org SlackBuild, so thanks to Robby Workman :)
-# Revision date: 2010/04/23
+# Revision date: 2010/06/20
 
 PRGNAM=VariCAD
-VERSION=${VERSION:-2010_2.06}
+VERSION=${VERSION:-2010_2.08}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -18,33 +18,28 @@ SRCLANG=en
 # The versioning of the 'source' RPM is a bit different:
 SRCVERSION=$(echo $VERSION | sed "s/_/-$SRCLANG-/")
 
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+case "$( uname -m )" in
+  i?86) ARCH=i486 ;;
+  arm*) ARCH=arm ;;
+     *) ARCH=$( uname -m ) ;;
+esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" -o "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i486" ]; then
   SRCARCH="i586"
   PKGARCH="i586"
 elif [ "$ARCH" = "x86_64" ]; then
-  SRCARCH="x86_64"
+  SRCARCH="$ARCH"
   PKGARCH="$ARCH"
+else
+  printf "$ARCH is not supported...\n"
+  exit 1
 fi
 
-echo "SRCVERSION $SRCVERSION"
-echo "SRCARCH $SRCARCH"
-echo "PKGARCH $PKGARCH"
-
 set -e
 
 rm -rf $PKG
@@ -75,4 +70,3 @@ chmod a+w $PKG/opt/$PRGNAM/lib
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/graphics/VariCAD/VariCAD.desktop b/graphics/VariCAD/VariCAD.desktop
index da2e67eca235..cbca039fb406 100644
--- a/graphics/VariCAD/VariCAD.desktop
+++ b/graphics/VariCAD/VariCAD.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=FreeCAD
-Comment=General purpose 3D CAD modeler
+Name=VariCAD
+Comment=CAD system for mechanical engineering
 Categories=Graphics;
-Exec=/opt/FreeCAD/bin/FreeCAD
-Icon=FCIcon.xpm
+Exec=varicad
+Icon=varicad
 Terminal=false
 StartupNotify=false
-
diff --git a/graphics/VariCAD/VariCAD.info b/graphics/VariCAD/VariCAD.info
index 5d8b0a9d5fb5..51e0b7472aee 100644
--- a/graphics/VariCAD/VariCAD.info
+++ b/graphics/VariCAD/VariCAD.info
@@ -1,10 +1,10 @@
 PRGNAM="VariCAD"
-VERSION="2010_2.06"
+VERSION="2010_2.08"
 HOMEPAGE="http://www.varicad.com"
-DOWNLOAD="http://www.varicad.com/userdata/files/release/en/VariCAD_2010-en-2.06-1.i586.rpm"
-MD5SUM="f9f49ec1ab74d008a3f2ca040c6db762"
-DOWNLOAD_x86_64="http://www.varicad.com/userdata/files/release/en/VariCAD_2010-en-2.06-1.x86_64.rpm"
-MD5SUM_x86_64="12197ba79a5acafc215e215f3b90f361"
+DOWNLOAD="http://www.varicad.com/userdata/files/release/en/VariCAD_2010-en-2.08-1.i586.rpm"
+MD5SUM="4ab6c9af7d2c5ad2cccf2bc8a7c03c92"
+DOWNLOAD_x86_64="http://www.varicad.com/userdata/files/release/en/VariCAD_2010-en-2.08-1.x86_64.rpm"
+MD5SUM_x86_64="c339e566e04218005efd8c1b30d5b8c5"
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"