graphics/brlcad: Updated for version 7.16.8.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

7 files changed, 16 insertions, 135 deletions

diff --git a/graphics/brlcad/README b/graphics/brlcad/README
index a02fe5c4c772..e5b0051109c8 100644
--- a/graphics/brlcad/README
+++ b/graphics/brlcad/README
@@ -4,5 +4,5 @@ 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.1GB of space to build, so adapt your OUTPUT / 
-TMP variables if necessary.
+NOTE: This package needs about 3.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 3fc3fd4532ed..734276654991 100644
--- a/graphics/brlcad/brlcad.SlackBuild
+++ b/graphics/brlcad/brlcad.SlackBuild
@@ -6,12 +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/05/02
-
-# TODO: Investigate adding pkgconfig path in profile scripts  -RW
+# Revision date: 2010/06/05
 
 PRGNAM=brlcad
-VERSION=${VERSION:-7.16.6}
+VERSION=${VERSION:-7.16.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,16 +57,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch to resolve a bug in gcc 4.3.3 (as in Slackware 13.0)
-# Not needed for gcc 4.4.x (but it won't harm)
-patch -p1 < $CWD/patches/gcc433.patch
-
-# Patch for libpng 1.4.x (as in Slackware -current as of 2010/03/01)
-# Do not use in 13.0 stable versions (won't work).
-# Newer svn snapshots of brlcad won't need this any longer, but the stable
-#   7.16.6 version still does.
-patch -p1 < $CWD/patches/libpng14x.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -80,7 +68,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-tk=/usr/lib${LIBDIRSUFFIX} \
   --disable-tcl-build \
   --disable-tk-build \
-  --disable-tkhtml3-build \
   --disable-jove-build \
   --build=$ARCH-slackware-linux
 
@@ -90,10 +77,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/opt/$PRGNAM/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/opt/$PRGNAM/share/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/opt/$PRGNAM/share/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/etc/profile.d/
 cat $CWD/profile.d/$PRGNAM.sh  > $PKG/etc/profile.d/$PRGNAM.sh
@@ -109,7 +94,9 @@ 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
-  ln -s ../../../opt/$PRGNAM/share/$PRGNAM/$VERSION/doc doc
+  for sub in doc html; do
+    ln -s ../../../opt/$PRGNAM/share/$sub
+  done
 )
 
 mkdir -p $PKG/install
diff --git a/graphics/brlcad/brlcad.info b/graphics/brlcad/brlcad.info
index b805b1585822..7a2597714e46 100644
--- a/graphics/brlcad/brlcad.info
+++ b/graphics/brlcad/brlcad.info
@@ -1,8 +1,8 @@
 PRGNAM="brlcad"
-VERSION="7.16.6"
+VERSION="7.16.8"
 HOMEPAGE="http://brlcad.org"
-DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.16.6.tar.bz2"
-MD5SUM="1a1313435e37b00da521bfb4425cb274"
+DOWNLOAD="http://downloads.sourceforge.net/brlcad/brlcad-7.16.8.tar.bz2"
+MD5SUM="8ccbc692d84854c9b0599b6d1255f916"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
diff --git a/graphics/brlcad/patches/gcc433.patch b/graphics/brlcad/patches/gcc433.patch
deleted file mode 100644
index 853fd97e5e2f..000000000000
--- a/graphics/brlcad/patches/gcc433.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- brlcad-7.16.6/src/other/openNURBS/opennurbs_system.h	2010-01-19 00:27:03.000000000 -0200
-+++ brlcad-7.16.6_patches/src/other/openNURBS/opennurbs_system.h	2010-04-28 22:58:03.712951143 -0300
-@@ -194,6 +194,7 @@
- extern "C" {
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <memory.h>
- #include <string.h>
diff --git a/graphics/brlcad/patches/libpng14x.patch b/graphics/brlcad/patches/libpng14x.patch
deleted file mode 100644
index 7ab4e4d70359..000000000000
--- a/graphics/brlcad/patches/libpng14x.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- brlcad-7.16.6/src/other/tkimg/pngtcl/pngtclDecls.h	2010-01-19 00:27:35.000000000 -0200
-+++ brlcad-7.16.6_patched/src/other/tkimg/pngtcl/pngtclDecls.h	2010-04-23 17:58:07.000000000 -0300
-@@ -46,11 +46,11 @@
- 				png_voidp error_ptr, png_error_ptr error_fn,
- 				png_error_ptr warn_fn));
- /* 6 */
--EXTERN png_uint_32	png_get_compression_buffer_size _ANSI_ARGS_((
-+EXTERN png_size_t	png_get_compression_buffer_size _ANSI_ARGS_((
- 				png_structp png_ptr));
- /* 7 */
- EXTERN void		png_set_compression_buffer_size _ANSI_ARGS_((
--				png_structp png_ptr, png_uint_32 size));
-+				png_structp png_ptr, png_size_t size));
- /* 8 */
- EXTERN int		png_reset_zstream _ANSI_ARGS_((png_structp png_ptr));
- /* 9 */
-@@ -337,7 +337,7 @@
- 				png_bytep new_row));
- /* 94 */
- EXTERN png_voidp	png_malloc _ANSI_ARGS_((png_structp png_ptr,
--				png_uint_32 size));
-+				png_size_t size));
- /* 95 */
- EXTERN void		png_free _ANSI_ARGS_((png_structp png_ptr,
- 				png_voidp ptr));
-@@ -351,7 +351,7 @@
- 				png_uint_32 mask));
- /* 98 */
- EXTERN png_voidp	png_malloc_default _ANSI_ARGS_((png_structp png_ptr,
--				png_uint_32 size));
-+				png_size_t size));
- /* 99 */
- EXTERN void		png_free_default _ANSI_ARGS_((png_structp png_ptr,
- 				png_voidp ptr));
-@@ -380,7 +380,7 @@
- EXTERN png_uint_32	png_get_valid _ANSI_ARGS_((png_structp png_ptr,
- 				png_infop info_ptr, png_uint_32 flag));
- /* 108 */
--EXTERN png_uint_32	png_get_rowbytes _ANSI_ARGS_((png_structp png_ptr,
-+EXTERN png_size_t	png_get_rowbytes _ANSI_ARGS_((png_structp png_ptr,
- 				png_infop info_ptr));
- /* 109 */
- EXTERN png_bytepp	png_get_rows _ANSI_ARGS_((png_structp png_ptr,
---- brlcad-7.16.6/src/fb/png-fb.c	2010-01-19 00:29:40.000000000 -0200
-+++ brlcad-7.16.6_patched/src/fb/png-fb.c	2010-04-23 18:28:14.000000000 -0300
-@@ -189,7 +189,7 @@
- 	bu_exit(EXIT_FAILURE,  "ERROR: Failed while reading file header!!!\n" );
-     }
- 
--    if (!png_check_sig((png_bytep)header, 8)) {
-+    if (png_sig_cmp((png_bytep)header, 0, 8)) {
- 	bu_exit(EXIT_FAILURE,  "This is not a PNG file!!!\n" );
-     }
- 
---- brlcad-7.16.6/src/util/png-bw.c	2010-01-19 00:33:04.000000000 -0200
-+++ brlcad-7.16.6_patched/src/util/png-bw.c	2010-04-23 19:08:46.000000000 -0300
-@@ -139,7 +139,7 @@
-     if ( fread( header, 8, 1, fp_in ) != 1 )
- 	bu_exit( EXIT_FAILURE, "ERROR: Failed while reading file header!!!\n" );
- 
--    if ( !png_check_sig( (png_bytep)header, 8 ) )
-+    if ( png_sig_cmp((png_bytep)header, 0, 8))
- 	bu_exit( EXIT_FAILURE, "This is not a PNG file!!!\n" );
- 
-     png_p = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
---- brlcad-7.16.6/src/util/png-pix.c	2010-01-19 00:33:02.000000000 -0200
-+++ brlcad-7.16.6_patched/src/util/png-pix.c	2010-04-23 19:10:30.000000000 -0300
-@@ -95,7 +95,7 @@
-     if ( fread( header, 8, 1, fp_in ) != 1 )
- 	bu_exit( EXIT_FAILURE, "ERROR: Failed while reading file header!!!\n" );
- 
--    if ( !png_check_sig( (png_bytep)header, 8 ) )
-+    if (png_sig_cmp( (png_bytep)header, 0, 8))
- 	bu_exit( EXIT_FAILURE, "This is not a PNG file!!!\n" );
- 
-     png_p = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
---- brlcad-7.16.6/src/util/png_info.c	2010-01-19 00:33:05.000000000 -0200
-+++ brlcad-7.16.6_patched/src/util/png_info.c	2010-04-23 19:12:00.000000000 -0300
-@@ -76,7 +76,7 @@
-     if ( fread( header, 8, 1, fp_in ) != 1 )
- 	bu_exit( EXIT_FAILURE, "ERROR: Failed while reading file header!!!\n" );
- 
--    if ( !png_check_sig( (png_bytep)header, 8 ) )
-+    if (png_sig_cmp((png_bytep)header, 0, 8))
- 	bu_exit( EXIT_FAILURE, "This is not a PNG file!!!\n" );
- 
-     png_p = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
---- brlcad-7.16.6/src/canon/png-ipu.c	2010-01-19 00:30:24.000000000 -0200
-+++ brlcad-7.16.6_patched/src/canon/png-ipu.c	2010-04-23 19:13:10.000000000 -0300
-@@ -125,7 +125,7 @@
-     if ( fread( header, 8, 1, stdin ) != 1 )
- 	bu_exit(1, "png-ipu: ERROR: Failed while reading file header!");
- 
--    if ( !png_check_sig( (png_bytep)header, 8 ) )
-+    if (png_sig_cmp((png_bytep)header, 0, 8))
- 	bu_exit(2, "png-ipu: This is not a valid PNG file\n");
- 
-     png_p = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
diff --git a/graphics/brlcad/profile.d/brlcad.csh b/graphics/brlcad/profile.d/brlcad.csh
index fd94ce573aef..bf01dd0ba7de 100644
--- a/graphics/brlcad/profile.d/brlcad.csh
+++ b/graphics/brlcad/profile.d/brlcad.csh
@@ -1,4 +1,5 @@
 #!/bin/csh
 # Add path for brlcad:
 setenv PATH ${PATH}:/opt/brlcad/bin
-
+# Add brlcad's pkgconfig to PKG_CONFIG_PATH
+setenv PKG_CONFIG_PATH /opt/brlcad/lib/pkgconfig:${PKG_CONFIG_PATH}
diff --git a/graphics/brlcad/profile.d/brlcad.sh b/graphics/brlcad/profile.d/brlcad.sh
index 080b4cf149a3..e3a2c19a995f 100644
--- a/graphics/brlcad/profile.d/brlcad.sh
+++ b/graphics/brlcad/profile.d/brlcad.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 # Add PATH for brlcad:
 export PATH="$PATH:/opt/brlcad/bin"
-
+# Add brlcad's pkgconfig to PKG_CONFIG_PATH 
+PKG_CONFIG_PATH="/opt/brlcad/lib/pkgconfig:$PKG_CONFIG_PATH"