[Lunar-commits] <moonbase> libproxy: Adjusting BUILD to use default_cMake_build. Also uncommenting

[Dennis `stumbles` Veatch]

commit 2de313744a2f662845a872df6260a9e2f451051d
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Aug 23 19:00:50 2011 -0400

    libproxy: Adjusting BUILD to use default_cMake_build. Also uncommenting
    
    those optional_depends and noting the circular depends and what the user
    should do.
---
 libs/libproxy/BUILD   |   11 +----------
 libs/libproxy/DEPENDS |   29 ++++++++++++-----------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/libs/libproxy/BUILD b/libs/libproxy/BUILD
index b0fef0a..f30e57a 100644
--- a/libs/libproxy/BUILD
+++ b/libs/libproxy/BUILD
@@ -5,15 +5,6 @@
     OPTS+=" -DPX_PERL_ARCH=$PERL_ARCH"
   fi &&
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
-
-  mkdir $OOSB_DIR  &&
-  cd $OOSB_DIR     &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE             \
-                           $OPTS                                 &&
-
-  default_make
+  default_cmake_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/libproxy/DEPENDS b/libs/libproxy/DEPENDS
index 70bd46c..e08fc7d 100644
--- a/libs/libproxy/DEPENDS
+++ b/libs/libproxy/DEPENDS
@@ -1,10 +1,9 @@
 depends cmake
 
-# Circular dependency: webkit->libsoup->libproxy->kde-baseapps->kde-baseapps
-#optional_depends  "kde-baseapps"          \
-#                  "-DWITH_KDE4=ON"    \
-#                  "-DWITH_KDE=OFF"    \
-#                  "for KDE bindings"
+optional_depends  "kde-baseapps"      \
+                  "-DWITH_KDE4=ON"    \
+                  "-DWITH_KDE=OFF"    \
+                  "for KDE bindings. Circular dependency, compile without first."
 
 optional_depends  "xulrunner"         \
                   "-DWITH_MOZJS=ON"   \
@@ -26,21 +25,17 @@ optional_depends  "vala"              \
                   "-DWITH_VALA=OFF"   \
                   "for vala bindings"
 
-# Circular dependency:  libproxy -> webkit (optional) -> libsoup -> libproxy
-# To fix:  compile libproxy without webkit, then with webkit
-# Show difference:  strings /usr/lib/libproxy.so.1.0.0 | grep webkit
-# [[ $(strings /usr/lib/libproxy.so.1.0.0 | grep webkit) ]] && echo "yes"
-#optional_depends  "webkit"            \
-#                  "-DWITH_WEBKIT=ON"  \
-#                  "-DWITH_WEBKIT=OFF" \
-#                  "webkit (circular dependency - compile without webkit first)"
+optional_depends  "webkit"            \
+                  "-DWITH_WEBKIT=ON"  \
+                  "-DWITH_WEBKIT=OFF" \
+                  "webkit (circular dependency - compile without webkit first)"
 
 optional_depends  "GConf"             \
                   "-DWITH_GNOME=ON"   \
                   "-DWITH_GNOME=OFF"  \
                   "for Gnome/GConf bindings"
 
-#optional_depends  "mono"              \
-#                  ""                  \
-#                  ""                  \
-
+optional_depends  "mono"              \
+                  "-DWITH_DOTNET=ON"  \
+                  "-DWITH_DOTNET=off" \
+                  "for dot net support"