[Lunar-commits] <moonbase-other> apache-log4cxx: Removed SOURCE1 from DETAILS.

[Peter de Ridder]

commit 1dfac2e1d492de2253f5a74c11a6c289596eff93
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Tue, 24 Sep 2013 14:17:11 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/1dfac2e1d492de2253f5a74c11a6c289596eff93

apache-log4cxx: Removed SOURCE1 from DETAILS.

Future releases of lunar will drop support for SOURCE1.
---
  web/apache-log4cxx/BUILD     | +6/-16    
  web/apache-log4cxx/DETAILS   | +3/-3     
  web/apache-log4cxx/PRE_BUILD | +7/-0     
  3 files changed, 16 insertions(+), 19 deletions(-)

--- a/web/apache-log4cxx/BUILD
+++ b/web/apache-log4cxx/BUILD
@@ -1,17 +1,7 @@
-(
+if in_depends $MODULE libiodbc; then
+    LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
+ else
+    LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/"
+fi &&
 
-  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 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
+default_build
--- a/web/apache-log4cxx/DETAILS
+++ b/web/apache-log4cxx/DETAILS
@@ -1,12 +1,12 @@
           MODULE=apache-log4cxx
          VERSION=0.10.0
           SOURCE=$MODULE-$VERSION.tar.gz
-         SOURCE1=log4cxx-$VERSION-unixODBC.patch
+         SOURCE2=log4cxx-$VERSION-unixODBC.patch
 #      SOURCE_URL=http://mirror.candidhosting.com/pub/apache/logging/log4cxx/$VERSION/
       SOURCE_URL=http://apache.cs.utah.edu/logging/log4cxx/$VERSION/
-     SOURCE1_URL=$PATCH_URL
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:d79c053e8ac90f66c5e873b712bb359fd42b648d
-     SOURCE1_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
+     SOURCE2_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
         WEB_SITE=http://logging.apache.org/log4cxx/index.html
          ENTERED=20100321
          UPDATED=20100321
--- /dev/null
+++ b/web/apache-log4cxx/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+patch_it $SOURCE2 0 &&
+
+sedit "22i #include <cstring>" src/main/cpp/socketoutputstream.cpp src/examples/cpp/console.cpp &&
+sedit "22i #include <cstdio>" src/examples/cpp/console.cpp &&
+sedit "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp src/main/cpp/socketoutputstream.cpp