[Lunar-commits] <moonbase> libproxy: Version bump. They have switched to cmake so adjustments to the

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Mon Dec 13 02:47:21 CET 2010


commit 8a277c0a3d004d99effb6bd6f739cc926547558c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Dec 12 20:47:21 2010 -0500

    libproxy: Version bump. They have switched to cmake so adjustments to the
    
    DEPENDS and BUILD are needed.
    
    You will probably want to do at least a lunar fix.
---
 libs/libproxy/BUILD     |   20 ++++++++++----------
 libs/libproxy/CONFIGURE |    1 -
 libs/libproxy/DEPENDS   |   38 ++++++++++++++++++++++++++++++--------
 libs/libproxy/DETAILS   |    6 +++---
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/libs/libproxy/BUILD b/libs/libproxy/BUILD
index 007bcb1..d345c5d 100644
--- a/libs/libproxy/BUILD
+++ b/libs/libproxy/BUILD
@@ -1,14 +1,14 @@
 (
 
-  if in_depends $MODULE xulrunner; then
-    XULRUNNER_VERSION=$(installed_version xulrunner)
-  # This CFLAGS setting fixes unable to find jsapi.h
-    CFLAGS="$CFLAGS -I/usr/include/xulrunner-$XULRUNNER_VERSION/unstable"
-  # This takes care of lunar fix reporting libmozjs.so not found.
-    LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-devel-$XULRUNNER_VERSION/lib"
-  # Done
-  fi &&
-
-  default_build
+  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
 
 ) > $C_FIFO 2>&1
diff --git a/libs/libproxy/CONFIGURE b/libs/libproxy/CONFIGURE
deleted file mode 100644
index bbbdaae..0000000
--- a/libs/libproxy/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery  GNOME  "Enable GNOME support?"  y  "--with-gnome"  "--without-gnome"
diff --git a/libs/libproxy/DEPENDS b/libs/libproxy/DEPENDS
index 74265cc..21c7cce 100644
--- a/libs/libproxy/DEPENDS
+++ b/libs/libproxy/DEPENDS
@@ -1,18 +1,40 @@
+depends cmake
+
 optional_depends  "kdebase4"          \
-                  "--with-kde"        \
-                  "--without-kde"     \
-                  "for KDE support"
+                  "-DWITH_KDE4=ON"    \
+                  "-DWITH_KDE=OFF"    \
+                  "for KDE bindings"
 
 optional_depends  "xulrunner"         \
-                  "--with-mozjs"      \
-                  "--without-mozjs"   \
-                  "for Mozilla/Firefox support"
+                  "-DWITH_MOZJS=ON"   \
+                  "-DWITH_MOZJS=OFF"  \
+                  "for Mozilla javascript bindings"
 
 optional_depends  "Python"            \
-                  "--with-python"     \
-                  "--without-python"  \
+                  "-DWITH_PYTHON=ON"  \
+                  "-DWITH_PYTHON=OFF" \
                   "for the Python bindings"
 
+optional_depends  "perl"              \
+                  "-DWITH_PERL=ON"    \
+                  "-DWITH_PERL=OFF"   \
+                  "for Perl bindings"
+
+optional_depends  "vala"              \
+                  "-DWITH_VALA=ON"    \
+                  "-DWITH_VALA=OFF"   \
+                  "for vala bindings"
+
+optional_depends  "webkit"            \
+                  "-DWITH_WEBKIT=ON"  \
+                  "-DWITH-WEBKIT=OFF" \
+                  "Enable webkit java script engine"
+
+optional_depends  "GConf"             \
+                  "-DWITH_GNOME=ON"   \
+                  "-DWITH_GNOME=OFF"  \
+                  "for Gnome/GConf bindings"
+
 #optional_depends  "mono"              \
 #                  ""                  \
 #                  ""                  \
diff --git a/libs/libproxy/DETAILS b/libs/libproxy/DETAILS
index f789cac..2d18da3 100644
--- a/libs/libproxy/DETAILS
+++ b/libs/libproxy/DETAILS
@@ -1,11 +1,11 @@
           MODULE=libproxy
-         VERSION=0.2.3
+         VERSION=0.4.6
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://libproxy.googlecode.com/files/
-      SOURCE_VFY=sha1:2b2b00a179740548035a1145bbae600db9b0a2ce
+      SOURCE_VFY=sha1:6e9745c87b774f34bf53f07a54284c0d72020e94
         WEB_SITE=http://code.google.com/p/libproxy/
          ENTERED=20090221
-         UPDATED=20090619
+         UPDATED=20101212
            SHORT="automatic proxy configuration management"
 
 cat << EOF


More information about the Lunar-commits mailing list