5 files changed, 33 insertions, 15 deletions
diff --git a/graphics/brlcad/README b/graphics/brlcad/README
index e5b0051109..912b351a52 100644
--- a/graphics/brlcad/README
+++ b/graphics/brlcad/README
@@ -1,8 +1,8 @@
-BRL-CAD is a powerful cross-platform open source solid modeling system that 
-includes interactive geometry editing, high-performance ray-tracing for 
-rendering and geometric analysis, image and signal-processing tools, a 
-system performance analysis benchmark suite, libraries for robust geometric 
+BRL-CAD is a powerful cross-platform open source solid modeling system that
+includes interactive geometry editing, high-performance ray-tracing for
+rendering and geometric analysis, image and signal-processing tools, a
+system performance analysis benchmark suite, libraries for robust geometric
 representation, with more than 20 years of active development.
 
-NOTE: This package needs about 3.7GB of space to build, so adapt your OUTPUT 
-and TMP variables if necessary.
+NOTE: This package needs about 7GB of space to build, so adapt your
+OUTPUT and TMP variables if necessary.
diff --git a/graphics/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild
index 044504a454..2e8ecc9f77 100644
--- a/graphics/brlcad/brlcad.SlackBuild
+++ b/graphics/brlcad/brlcad.SlackBuild
@@ -6,10 +6,10 @@
 # Released under the WTFPL - http://sam.zoy.org/wtfpl/
 
 # Maintained as of version 7.16.6 by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/08/26
+# Revision date: 2011/03/29
 
 PRGNAM=brlcad
-VERSION=${VERSION:-7.16.10}
+VERSION=${VERSION:-7.18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,6 +55,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Don't be too "strict" with src/conv/patch/patch-g.c
+#   This is a "known issue" according to the guys on #brlcad so let's try
+#   to remove this with the next release.
+#   Another solution is to completely disable "strict building" with the
+#   configure flag "-disable-strict-build"
+sed -i "/patch_g_CFLAGS/s|\${STRICT_FLAGS}||" src/conv/Makefile.in
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,17 +92,18 @@ chmod 0755 $PKG/etc/profile.d/*
 
 # Copy icon & desktop file to package
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat $CWD/${PRGNAM}_mged.desktop > $PKG/usr/share/applications/${PRGNAM}_mged.desktop
+cat $CWD/${PRGNAM}_archer.desktop > $PKG/usr/share/applications/${PRGNAM}_archer.desktop
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
+cd $PKG/usr/doc/$PRGNAM-$VERSION
   for sub in doc html; do
     ln -s ../../../opt/$PRGNAM/share/$PRGNAM/$VERSION/$sub
   done
-)
+cd -
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/brlcad/brlcad.info b/graphics/brlcad/brlcad.info
index 8288dcd920..3ec1f26703 100644
--- a/graphics/brlcad/brlcad.info
+++ b/graphics/brlcad/brlcad.info
@@ -1,8 +1,8 @@
 PRGNAM="brlcad"
-VERSION="7.16.10"
+VERSION="7.18.2"
 HOMEPAGE="http://brlcad.org"
-DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.16.10.tar.bz2"
-MD5SUM="3473ecbb99317fdfbbed0caea979d824"
+DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.18.2.tar.bz2"
+MD5SUM="04bf0bd8d7a774d368856f2332779797"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
diff --git a/graphics/brlcad/brlcad_archer.desktop b/graphics/brlcad/brlcad_archer.desktop
new file mode 100644
index 0000000000..83ae0bd0ad
--- /dev/null
+++ b/graphics/brlcad/brlcad_archer.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=BRL-CAD Archer
+Comment=Constructive Solid Geometry modeling system
+Categories=Graphics;
+Exec=archer
+Icon=brlcad
+StartupNotify=false
+
diff --git a/graphics/brlcad/brlcad.desktop b/graphics/brlcad/brlcad_mged.desktop
index 4ada730742..696c531915 100644
--- a/graphics/brlcad/brlcad.desktop
+++ b/graphics/brlcad/brlcad_mged.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=BRL-CAD
+Name=BRL-CAD MGED
 Comment=Constructive Solid Geometry modeling system
 Categories=Graphics;
 Exec=xterm -iconic -e /opt/brlcad/bin/mged