# HG changeset patch
# User Jon Tibble <meths@btinternet.com>
# Date 1385121824 0
# Node ID 516a30af90e812685f096616420d88d55d04fc29
# Parent  2907cc8807f47b8cd4528efb68cbadc95f27e5e5
Fix subversion build weirdness

diff -r 2907cc8807f4 -r 516a30af90e8 usr/src/cmd/subversion/Makefile.sfw
--- a/usr/src/cmd/subversion/Makefile.sfw	Mon Nov 18 20:14:16 2013 +0000
+++ b/usr/src/cmd/subversion/Makefile.sfw	Fri Nov 22 12:03:44 2013 +0000
@@ -216,7 +216,8 @@
 $(VER)/configure: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
 	( cd $(VER) ; \
-	    gpatch -p0 <../$(VER).patch )
+	    gpatch -p0 <../Patches/$(VER).patch; \
+	    gpatch -p1 <../Patches/configure.patch )
 	touch $(VER)/configure
 	chmod 0755 $(VER)/configure
 	chmod 0755 $(VER)
diff -r 2907cc8807f4 -r 516a30af90e8 usr/src/cmd/subversion/Patches/configure.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/subversion/Patches/configure.patch	Fri Nov 22 12:03:44 2013 +0000
@@ -0,0 +1,11 @@
+--- subversion-1.6.5/configure.orig	Thu Nov 21 21:14:02 2013
++++ subversion-1.6.5/configure	Thu Nov 21 21:15:14 2013
+@@ -7182,7 +7182,7 @@
+ apache_minor_version=AP_SERVER_MINORVERSION
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "[apache_minor_version= *"$apache_minor_version_wanted_regex"]" >/dev/null 2>&1; then
++  $EGREP "apache_minor_version= *\"$apache_minor_version_wanted_regex\"" >/dev/null 2>&1; then
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
diff -r 2907cc8807f4 -r 516a30af90e8 usr/src/cmd/subversion/Patches/subversion-1.6.5.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/subversion/Patches/subversion-1.6.5.patch	Fri Nov 22 12:03:44 2013 +0000
@@ -0,0 +1,13 @@
+--- Makefile.in	2009-02-16 08:10:48.000000000 -0800
++++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
+@@ -76,8 +76,8 @@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
++swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
+ swig_pldir = @libdir@/svn-perl
+ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ contribdir = @bindir@/svn-contrib
diff -r 2907cc8807f4 -r 516a30af90e8 usr/src/cmd/subversion/subversion-1.6.5.patch
--- a/usr/src/cmd/subversion/subversion-1.6.5.patch	Mon Nov 18 20:14:16 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- Makefile.in	2009-02-16 08:10:48.000000000 -0800
-+++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
-@@ -76,8 +76,8 @@
- swig_rb_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
-+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- contribdir = @bindir@/svn-contrib