[SM-Commit] GIT changes to master grimoire by Arjan Bouter (68266f78eed19fc0443a0756660d95cafb803247)

Arjan Bouter scm at sourcemage.org
Wed Apr 13 07:35:24 EDT 2011


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 graphics/brlcad/DEPENDS |   16 ++++++++++++----
 graphics/brlcad/HISTORY |    5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 68266f78eed19fc0443a0756660d95cafb803247
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    brlcad: cleaned up dependencies and added missing optional deps

diff --git a/graphics/brlcad/DEPENDS b/graphics/brlcad/DEPENDS
index 0f48c64..05fdd85 100755
--- a/graphics/brlcad/DEPENDS
+++ b/graphics/brlcad/DEPENDS
@@ -1,8 +1,16 @@
-depends  libpng    &&
-depends  zlib      &&
 depends  bison     &&
 depends  gawk      &&
 depends  flex      &&
 depends  ncurses   &&
-depends  X11-LIBS  &&
-depends  OPENGL
+optional_depends  zlib  '--enable-zlib-build'  '--disable-zlib-build'  'for compression support'  &&
+optional_depends  libpng  '--enable-png-build'  '--disable-png-build'  'for png support'  &&
+optional_depends  X11-LIBS  '--with-x'  '--without-x'  'for X11 support'  &&
+optional_depends  OPENGL  '--with-ogl'  '--without-ogl'  'for OpenGL support'  &&
+optional_depends  JDK  '--with-jdk'  '--without-jdk'  'for rtserver support'  &&
+optional_depends  tcl  '--with-tcl=/usr/lib'  '--without-tcl'  'for tcl support'  &&
+optional_depends  tk  '--with-tk=/usr/lib'  '--without-tk'  'for tk support'  &&
+if is_depends_enabled $SPELL tk; then
+  optional_depends  tkhtml3  '--enable-tkhtml-build'  '--disable-tkhtml-build'  'for tkhtml support'  &&
+  optional_depends  tkimg  '--enable-tkpng-build'  '--disable-tkpng-build'  'for tkpng support'
+fi  &&
+optional_depends  docbook-utils  '--enable-documentation'  '--disable-documentation'  'install docs?'
diff --git a/graphics/brlcad/HISTORY b/graphics/brlcad/HISTORY
index 70135c5..d8082bc 100644
--- a/graphics/brlcad/HISTORY
+++ b/graphics/brlcad/HISTORY
@@ -1,3 +1,8 @@
+2011-04-12 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made zlib, libpng, OPENGL, and X11-LIBS optional.
+	  added missing optional deps on JDK, tcl, tk, tkhtml3, tkimg
+	  and docbook-utils.
+
 2011-04-05 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 7.18.2
 	* PRE_BUILD: removed -Werror from CFLAGS to fix build error



More information about the SM-Commit mailing list