Fix subversion build weirdness oi_151a
authorJon Tibble <meths@btinternet.com>
Fri Nov 22 12:03:44 2013 +0000 (2013-11-22)
branchoi_151a
changeset 247516a30af90e8
parent 246 2907cc8807f4
child 248 43c271b7f56d
Fix subversion build weirdness
usr/src/cmd/subversion/Makefile.sfw
usr/src/cmd/subversion/Patches/configure.patch
usr/src/cmd/subversion/Patches/subversion-1.6.5.patch
usr/src/cmd/subversion/subversion-1.6.5.patch
     1.1 --- a/usr/src/cmd/subversion/Makefile.sfw	Mon Nov 18 20:14:16 2013 +0000
     1.2 +++ b/usr/src/cmd/subversion/Makefile.sfw	Fri Nov 22 12:03:44 2013 +0000
     1.3 @@ -216,7 +216,8 @@
     1.4  $(VER)/configure: $(VER).tar.gz
     1.5  	gzip -dc $(VER).tar.gz | tar xopf -
     1.6  	( cd $(VER) ; \
     1.7 -	    gpatch -p0 <../$(VER).patch )
     1.8 +	    gpatch -p0 <../Patches/$(VER).patch; \
     1.9 +	    gpatch -p1 <../Patches/configure.patch )
    1.10  	touch $(VER)/configure
    1.11  	chmod 0755 $(VER)/configure
    1.12  	chmod 0755 $(VER)
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/usr/src/cmd/subversion/Patches/configure.patch	Fri Nov 22 12:03:44 2013 +0000
     2.3 @@ -0,0 +1,11 @@
     2.4 +--- subversion-1.6.5/configure.orig	Thu Nov 21 21:14:02 2013
     2.5 ++++ subversion-1.6.5/configure	Thu Nov 21 21:15:14 2013
     2.6 +@@ -7182,7 +7182,7 @@
     2.7 + apache_minor_version=AP_SERVER_MINORVERSION
     2.8 + _ACEOF
     2.9 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    2.10 +-  $EGREP "[apache_minor_version= *"$apache_minor_version_wanted_regex"]" >/dev/null 2>&1; then
    2.11 ++  $EGREP "apache_minor_version= *\"$apache_minor_version_wanted_regex\"" >/dev/null 2>&1; then
    2.12 +   { $as_echo "$as_me:$LINENO: result: yes" >&5
    2.13 + $as_echo "yes" >&6; }
    2.14 + else
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/usr/src/cmd/subversion/Patches/subversion-1.6.5.patch	Fri Nov 22 12:03:44 2013 +0000
     3.3 @@ -0,0 +1,13 @@
     3.4 +--- Makefile.in	2009-02-16 08:10:48.000000000 -0800
     3.5 ++++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
     3.6 +@@ -76,8 +76,8 @@
     3.7 + swig_rb_libdir = @libdir@
     3.8 + 
     3.9 + ### these possibly need further discussion
    3.10 +-swig_pydir = @libdir@/svn-python/libsvn
    3.11 +-swig_pydir_extra = @libdir@/svn-python/svn
    3.12 ++swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
    3.13 ++swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
    3.14 + swig_pldir = @libdir@/svn-perl
    3.15 + swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
    3.16 + contribdir = @bindir@/svn-contrib
     4.1 --- a/usr/src/cmd/subversion/subversion-1.6.5.patch	Mon Nov 18 20:14:16 2013 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,13 +0,0 @@
     4.4 ---- Makefile.in	2009-02-16 08:10:48.000000000 -0800
     4.5 -+++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
     4.6 -@@ -76,8 +76,8 @@
     4.7 - swig_rb_libdir = @libdir@
     4.8 - 
     4.9 - ### these possibly need further discussion
    4.10 --swig_pydir = @libdir@/svn-python/libsvn
    4.11 --swig_pydir_extra = @libdir@/svn-python/svn
    4.12 -+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
    4.13 -+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
    4.14 - swig_pldir = @libdir@/svn-perl
    4.15 - swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
    4.16 - contribdir = @bindir@/svn-contrib