[Lunar-commits] <moonbase> apache-log4cxx: Needs a patch here for unixODBC and added an optional_depends.

[Dennis `stumbles` Veatch]

commit fec0923a97eda412beaa3e0207aa87e773be7ce5
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Sep 8 06:35:47 2010 -0400

    apache-log4cxx: Needs a patch here for unixODBC and added an optional_depends.
---
 web/apache-log4cxx/BUILD   |   10 +++++++++-
 web/apache-log4cxx/DEPENDS |    7 ++++---
 web/apache-log4cxx/DETAILS |    3 +++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/web/apache-log4cxx/BUILD b/web/apache-log4cxx/BUILD
index 662227d..44773e8 100644
--- a/web/apache-log4cxx/BUILD
+++ b/web/apache-log4cxx/BUILD
@@ -1,9 +1,17 @@
 (
 
+  patch_it $SOURCE_CCACHE/$SOURCE1 0 &&
+
   sed -i "22i #include <cstring>" src/main/cpp/socketoutputstream.cpp src/examples/cpp/console.cpp &&
   sed -i "22i #include <cstdio>" src/examples/cpp/console.cpp &&
-  sed -i "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp &&
+  sed -i "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp src/main/cpp/socketoutputstream.cpp &&
 
+  if in_depends $MODULE libiodbc; then
+      LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
+   else
+      LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/"
+  fi &&
+  
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/web/apache-log4cxx/DEPENDS b/web/apache-log4cxx/DEPENDS
index a28e4bb..0ab127c 100644
--- a/web/apache-log4cxx/DEPENDS
+++ b/web/apache-log4cxx/DEPENDS
@@ -1,6 +1,7 @@
 depends  apr
 
+optional_depends doxygen  "--enable-doxygen" "--disable-doxygen"  "for documentation support"
+optional_depends libiodbc "--with-ODBC=iODBC"    ""               "for iodbc database support, If yes here say no to unixODBC"
+optional_depends unixODBC "--with-ODBC=unixODBC" ""               "for unixODBC database connectivity support"
+optional_depends libesmtp "--with-SMTP=libesmtp" "--with-SMTP=no" "for libesmtp support"
 
-optional_depends doxygen "--enable-doxygen" "--disable-doxygen" "for documentation support"
-optional_depends libiodbc "--with-ODBC=iODBC"    ""             "for iodbc database support, If yes here say no to unixODBC"
-optional_depends unixODBC "--with-ODBC=unixODBC" ""             "for unixODBC database connectivity support"
diff --git a/web/apache-log4cxx/DETAILS b/web/apache-log4cxx/DETAILS
index f0226ea..3f7648e 100644
--- a/web/apache-log4cxx/DETAILS
+++ b/web/apache-log4cxx/DETAILS
@@ -1,8 +1,11 @@
           MODULE=apache-log4cxx
          VERSION=0.10.0
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE1=log4cxx-$VERSION-unixODBC.patch
       SOURCE_URL=http://mirror.candidhosting.com/pub/apache/logging/log4cxx/$VERSION/
+     SOURCE1_URL=$PATCH_URL
       SOURCE_VFY=sha1:d79c053e8ac90f66c5e873b712bb359fd42b648d
+     SOUREE1_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
         WEB_SITE=http://logging.apache.org/log4cxx/index.html
          ENTERED=20100321
          UPDATED=20100321