[Lunar-commits] <moonbase> doxygen: Adjusting the BUILD/DEPENDS.

[Dennis 'stumbles' Veatch]

commit 09ec1649eb95244563c0dd661da0e2f765042966
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sun Apr 26 12:49:34 2009 -0400

    doxygen: Adjusting the BUILD/DEPENDS.
    
    You need qt3 or qt4 to provide qmake, pick your poision. Added PSAFE
    just because I got tired of seeing disabling job server messages.
---
 doc-tools/doxygen/BUILD   |   14 ++++++++------
 doc-tools/doxygen/DEPENDS |    6 ++++--
 doc-tools/doxygen/DETAILS |    1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/doc-tools/doxygen/BUILD b/doc-tools/doxygen/BUILD
index a95d69f..caa5322 100644
--- a/doc-tools/doxygen/BUILD
+++ b/doc-tools/doxygen/BUILD
@@ -1,17 +1,19 @@
 (
-  if in_depends doxygen qt3; then
+  if in_depends qt3; then
     . /etc/profile.d/qt3.rc
-  fi
+  fi &&
+
+  if in_depends qt4; then
+    . /etc/profile.d/qt4.rc
+  fi &&
 
   if [ -f src/Makefile ]; then
     message "${MESSAGE_COLOR}Makefile's detected, doing make distclean before compiling${DEFAULT_COLOR}" &&
-    ./configure &&
+    ./configure 
     make distclean
   fi &&
 
-  ./configure --platform linux-g++        \
-              --prefix /usr               \
-              --install /usr/bin/install  \
+  ./configure --prefix /usr               \
               $OPTS                      &&
 
   make             &&
diff --git a/doc-tools/doxygen/DEPENDS b/doc-tools/doxygen/DEPENDS
index f1fe018..4c9e82c 100644
--- a/doc-tools/doxygen/DEPENDS
+++ b/doc-tools/doxygen/DEPENDS
@@ -2,6 +2,8 @@ depends  sed
 depends  ghostscript
 depends  teTeX
 
-optional_depends "Python"   ""                  "" "Build the doc files     "
-optional_depends "qt3"      "--with-doxywizard" "" "Graphical wizard support"
+optional_depends "Python"   ""                  "" "Build the doc files"
 optional_depends "graphviz" ""                  "" "Dot support" 
+
+optional_depends "qt3"      "--with-doxywizard" "" "Graphical wizard support"
+optional_depends "qt4"      ""                  "" "Needs qmake to make"
diff --git a/doc-tools/doxygen/DETAILS b/doc-tools/doxygen/DETAILS
index 7fd5916..5c81f81 100644
--- a/doc-tools/doxygen/DETAILS
+++ b/doc-tools/doxygen/DETAILS
@@ -8,6 +8,7 @@
          UPDATED=20090213
            SHORT="Documentation system for C++, Java, IDL (Corba, Microsoft and KDE-DCOP flavors) and C"
 
+PSAFE=no
 cat << EOF
 Doxygen is a documentation system for C++, Java, IDL (Corba, Microsoft and
 KDE-DCOP flavors) and C.