[SM-Commit] GIT changes to master grimoire by George Sherwood (34343a9820900fc29bb2c882612eff986c935fe2)

George Sherwood scm at sourcemage.org
Tue Sep 30 19:27:00 EDT 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 graphics/brlcad/BUILD          |    2 ++
 graphics/brlcad/DETAILS        |    7 +++----
 graphics/brlcad/HISTORY        |    8 ++++++++
 graphics/brlcad/PRE_BUILD      |    3 ---
 graphics/brlcad/brlcad_WARNING |   19 +++++++++++++++++++
 graphics/brlcad/config.patch   |   20 --------------------
 6 files changed, 32 insertions(+), 27 deletions(-)

New commits:
commit 34343a9820900fc29bb2c882612eff986c935fe2
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    brlcad: Updated to version 7.12.4.  Patch not needed for system libpng.
    DO NOT INSTALL this spell into /usr.  Bad things happen.

diff --git a/graphics/brlcad/BUILD b/graphics/brlcad/BUILD
new file mode 100755
index 0000000..8ae0c10
--- /dev/null
+++ b/graphics/brlcad/BUILD
@@ -0,0 +1,2 @@
+./configure  --prefix=${INSTALL_ROOT}/opt/brlcad $OPTS            &&
+make
diff --git a/graphics/brlcad/DETAILS b/graphics/brlcad/DETAILS
index 440171b..c2995f6 100755
--- a/graphics/brlcad/DETAILS
+++ b/graphics/brlcad/DETAILS
@@ -1,13 +1,12 @@
            SPELL=brlcad
-         VERSION=7.0.2
+         VERSION=7.12.4
           SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:3}
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-          MD5[0]=f1a4070e9c495c59c09eecf440450da5
+     SOURCE_HASH=sha512:da2c39a64759ee5c5ed3fcc3f48283dac2079575fa4076a8d499369d7f81999fb0ffb5ac1169cf4ea6e367eb27026b1fa23c6761db68888dcc815fe45cdba772          
         WEB_SITE=http://brlcad.org/
          ENTERED=20050109
       LICENSE[0]="GPL"
-       BUILD_API=2
            SHORT="a constructive solid geometry solid modeling system (CAD)"
 cat << EOF
 BRL-CAD is a powerful constructive solid geometry solid modeling system
diff --git a/graphics/brlcad/HISTORY b/graphics/brlcad/HISTORY
index 4834941..c6b10ba 100644
--- a/graphics/brlcad/HISTORY
+++ b/graphics/brlcad/HISTORY
@@ -1,3 +1,11 @@
+2008-09-30 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 7.12.4. Removed BUILD_API=2.
+	  Switched to SOURCE_HASH. Updated SOURCE_DIRECTORY
+	* brlcad_WARNING: Added.  Do not install this with prefix=/usr
+	* BUILD: Added to install in /opt/brlcad
+	* PRE_BUILD: Removed.
+	* config.patch: Removed.  Not needed.
+
 2008-08-22 Robert Figura <template at sourcemage.org>
 	* DETAILS: fixed license
 
diff --git a/graphics/brlcad/PRE_BUILD b/graphics/brlcad/PRE_BUILD
deleted file mode 100755
index 5a02116..0000000
--- a/graphics/brlcad/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build  &&
-cd  ${SOURCE_DIRECTORY}  &&
-patch -p0 < ${SCRIPT_DIRECTORY}/config.patch
diff --git a/graphics/brlcad/brlcad_WARNING b/graphics/brlcad/brlcad_WARNING
new file mode 100644
index 0000000..bcc818f
--- /dev/null
+++ b/graphics/brlcad/brlcad_WARNING
@@ -0,0 +1,19 @@
+Below is the warning when configuring brlcad with prefix=/usr.  Do not update
+this spell to use that prefix.  It will break your system badly
+since it uses library names from glibc.
+
+ }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+WARNING: It is STRONGLY recommended that you DO NOT install BRL-CAD into /usr
+WARNING: as BRL-CAD provides several libraries that may conflict with other
+WARNING: libraries (e.g. librt, libbu, libbn) on certain system configurations.
+WARNING: 
+WARNING: Since our libraries predate all those that we're known to conflict with
+WARNING: and are at the very core of our geometry services and project heritage,
+WARNING: we have no plans to change the names of our libraries at this time.
+WARNING: 
+WARNING: If you choose to continue installing into /usr, you do so entirely at
+WARNING: your own risk.  You have been warned.
+ 
+Consider using a different --prefix value.
+ 
+
diff --git a/graphics/brlcad/config.patch b/graphics/brlcad/config.patch
deleted file mode 100644
index ac8afb8..0000000
--- a/graphics/brlcad/config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2005-01-08 04:46:39.000000000 +1300
-+++ configure	2005-01-15 16:26:10.820173621 +1300
-@@ -11822,7 +11822,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpng  $LIBS"
-+LIBS="-lpng -lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -20894,7 +20894,7 @@
- echo $ECHO_N "checking for portable network graphics functionality... $ECHO_C" >&6
- if test "x$png_link_works" = "xyes" ; then
-   PRELDFLAGS="$LDFLAGS"
--  LDFLAGS="$LDFLAGS -lpng"
-+  LDFLAGS="$LDFLAGS -lpng -lz"
- fi
- if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling



More information about the SM-Commit mailing list