[Lunar-commits] r17600 - moonbase/trunk/devel/subversion

[Jerry Lundström]

Author: prox
Date: 2005-12-08 14:35:41 +0000 (Thu, 08 Dec 2005)
New Revision: 17600

Modified:
   moonbase/trunk/devel/subversion/BUILD
   moonbase/trunk/devel/subversion/DEPENDS
   moonbase/trunk/devel/subversion/DETAILS
Log:
fixed apr depend and swig bindings

Modified: moonbase/trunk/devel/subversion/BUILD
===================================================================
--- moonbase/trunk/devel/subversion/BUILD	2005-12-08 13:39:15 UTC (rev 17599)
+++ moonbase/trunk/devel/subversion/BUILD	2005-12-08 14:35:41 UTC (rev 17600)
@@ -1,14 +1,33 @@
 (
-
-  OPTS="$OPTS --with-ssl --with-neon=`neon-config --prefix`"
-  if module_installed apache2 ; then
-    OPTS="$OPTS --with-apr=/usr/bin/apr-1-config --with-apu=/usr/bin/apu-1-config"
-	rm -rf apr apr-util
-  fi
-  default_build  &&
   if in_depends $MODULE swig ; then
-    make swig-py install-swig-py
-    ln -sf /usr/lib/svn-python/{svn,libsvn} /usr/lib/python$(installed_version Python | cut -d. -f1,2)/site-packages
+    if module_installed perl; then
+      BINDINGS_MAKE="$BINDINGS_MAKE swig-pl"
+      BINDINGS_INSTALL="$BINDINGS_INSTALL install-swig-pl"
+    fi
+    if module_installed Python; then
+      BINDINGS_MAKE="$BINDINGS_MAKE swig-py"
+      BINDINGS_INSTALL="$BINDINGS_INSTALL install-swig-py"
+    fi
+    if module_installed ruby; then
+      BINDINGS_MAKE="$BINDINGS_MAKE swig-rb"
+      BINDINGS_INSTALL="$BINDINGS_INSTALL install-swig-rb"
+    fi
   fi
 
+  if [ -n "$BINDINGS_MAKE" ]; then
+    patch_it $SOURCE2 1 &&
+    patch_it $SOURCE3 1 &&
+    default_config &&
+    make &&
+    make $BINDINGS_MAKE &&
+    prepare_install &&
+    make install &&
+    make $BINDINGS_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
+  else
+    default_build
+  fi
+
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/devel/subversion/DEPENDS
===================================================================
--- moonbase/trunk/devel/subversion/DEPENDS	2005-12-08 13:39:15 UTC (rev 17599)
+++ moonbase/trunk/devel/subversion/DEPENDS	2005-12-08 14:35:41 UTC (rev 17600)
@@ -1,5 +1,7 @@
-depends  neon  &&
-depends  zlib  &&
-depends  db    &&
+depends  neon      "--with-neon=`neon-config --prefix`" &&
+depends  zlib      &&
+depends  db        &&
+depends  apr       "--with-apr=/usr/bin/apr-1-config" &&
+depends  apr-util  "--with-apr-util=/usr/bin/apu-1-config" &&
 
-optional_depends "swig" "" "" "for swig support (Requires Python)"
+optional_depends "swig" "" "--without-swig" "for Perl/Python and Ruby Swig Bindings"

Modified: moonbase/trunk/devel/subversion/DETAILS
===================================================================
--- moonbase/trunk/devel/subversion/DETAILS	2005-12-08 13:39:15 UTC (rev 17599)
+++ moonbase/trunk/devel/subversion/DETAILS	2005-12-08 14:35:41 UTC (rev 17600)
@@ -1,8 +1,14 @@
           MODULE=subversion
          VERSION=1.2.3
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=$MODULE-$VERSION-swig_fix.patch.gz
+         SOURCE3=$MODULE-$VERSION-swig_ruby_fix.patch.gz
       SOURCE_URL=http://subversion.tigris.org/tarballs/
       SOURCE_VFY=sha1:513a217ba4a8045ea3daba5c3b0816f80ce0041b
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE2_VFY=sha1:a4224e33fce319326f9dc026aa0f2d1fd58bde75
+     SOURCE3_URL=$PATCH_URL/
+     SOURCE3_VFY=sha1:52fc56e20244eb1ec97b8c6c49a6c29b8ef3d30e
         WEB_SITE=http://subversion.tigris.org/
          ENTERED=20030126
          UPDATED=20050827