[Lunar-commits] <moonbase-other> subversion: simplify&cleanup BUILD

[v4hn]

commit 4729140265a072ad222365ad30f132a24a2e3cf4
Author: v4hn <me at v4hn.de>
Date: Sat, 18 Aug 2012 08:40:26 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/4729140265a072ad222365ad30f132a24a2e3cf4

subversion: simplify&cleanup BUILD
---
  devel/subversion/BUILD                                       +16/-20   
  1 files changed, 16 insertions (+), 20 deletions (-)

--- a/devel/subversion/BUILD
+++ b/devel/subversion/BUILD
@@ -1,36 +1,32 @@
 (
 
   # fixes problems with neon
-  LDFLAGS+=" -lgcrypt"
+  LDFLAGS+=" -lgcrypt" &&
+
+  # fix dependency bug in 1.7.6 (see r1374198)
+  sedit "370 s/install = tools/install = apache-mod/" build.conf &&
 
   if in_depends $MODULE sun-jdk; then
-    . /etc/profile.d/sun-jdk.rc
-    OPTS+=" --with-jdk=$JAVA_HOME"
-    BINDINGS_MAKE+=" javahl"
-    BINDINGS_INSTALL+=" install-javahl"
-  elif in_depends $MODULE j2sdk; then
-    JAVA_HOME=$(expr /usr/lib/j2sdk*)
-    OPTS+=" --with-jdk=$JAVA_HOME"
+    . /etc/profile.d/sun-jdk.rc &&
+    OPTS+=" --with-jdk=$JAVA_HOME" &&
     BINDINGS_MAKE+=" javahl"
-    BINDINGS_INSTALL+=" install-javahl"
   fi
 
-  OPTS+=" --disable-static --with-neon=`neon-config --prefix` --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-apr-util=`which apu-$(installed_version apr-util | cut -d. -f1)-config`"
+  OPTS+=" --disable-static --with-neon=`neon-config --prefix` --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-apr-util=`which apu-$(installed_version apr-util | cut -d. -f1)-config`" &&
 
   if in_depends $MODULE swig ; then
     if module_installed perl; then
-      BINDINGS_MAKE="$BINDINGS_MAKE swig-pl"
-      BINDINGS_INSTALL="$BINDINGS_INSTALL install-swig-pl"
-    fi
+      BINDINGS_MAKE+=" swig-pl"
+    fi &&
+
     if module_installed Python; then
-      BINDINGS_MAKE="$BINDINGS_MAKE swig-py"
-      BINDINGS_INSTALL="$BINDINGS_INSTALL install-swig-py"
-    fi
+      BINDINGS_MAKE+=" swig-py"
+    fi &&
+
     if module_installed ruby; then
-      BINDINGS_MAKE="$BINDINGS_MAKE swig-rb"
-      BINDINGS_INSTALL="$BINDINGS_INSTALL install-swig-rb"
+      BINDINGS_MAKE+=" swig-rb"
     fi
-  fi
+  fi &&
 
   if [ -n "$BINDINGS_MAKE" ]; then
     default_config &&
@@ -38,7 +34,7 @@
     make $BINDINGS_MAKE &&
     prepare_install &&
     make install &&
-    make $BINDINGS_INSTALL &&
+    make ${BINDINGS_MAKE// / install-} &&
     if module_installed Python; then
       ln -sf /usr/lib/svn-python/{svn,libsvn} /usr/lib/python$(installed_version Python | cut -d. -f1,2)/site-packages
     fi