1 files changed, 23 insertions, 23 deletions

diff --git a/devel/subversion/files/patch-build.conf b/devel/subversion/files/patch-build.conf
index 698b6ab25717..97de2894074a 100644
--- a/devel/subversion/files/patch-build.conf
+++ b/devel/subversion/files/patch-build.conf
@@ -5,7 +5,7 @@
  path = subversion/clients/cmdline
  libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
 -	$(SVN_APR_LIBS) libexpat
-+	$(SVN_APR_LIBS) -lexpat
++	$(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  manpages = subversion/clients/cmdline/man/svn.1
  infopages = doc/user/manual/svn-manual.info
   doc/user/svn_for_cvs_users/svn_for_cvs_users.info 
@@ -14,7 +14,7 @@
  path = subversion/svnadmin
  install = fs-bin
 -libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  # The subversion repository inspection tool
  [svnlook]
@@ -22,7 +22,7 @@
  path = subversion/svnlook
  install = fs-bin
 -libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  # Library needed by all subversion clients
  [libsvn_client]
@@ -31,7 +31,7 @@
  install = base-lib
  path = subversion/libsvn_subr
 -libs =  $(SVN_APR_LIBS) libexpat
-+libs =  $(SVN_APR_LIBS) -lexpat
++libs =  $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  # Working copy management lib
  [libsvn_wc]
@@ -58,7 +58,7 @@
  install = fs-test
  libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
 -	$(SVN_APR_LIBS) libexpat
-+	$(SVN_APR_LIBS) -lexpat
++	$(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # run-fs-tests.sh will run this for us
  testing = skip
  
@@ -67,7 +67,7 @@
  sources = skel-test.c
  install = fs-test
 -libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # run-fs-tests.sh will run this for us
  testing = skip
  
@@ -76,7 +76,7 @@
  sources = key-test.c
  install = fs-test
 -libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) 
  # run-fs-tests.sh will run this for us
  testing = skip
  
@@ -85,7 +85,7 @@
  install = fs-test
  libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
 -       $(SVN_APR_LIBS) libexpat
-+       $(SVN_APR_LIBS) -lexpat
++       $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) 
  # run-fs-tests.sh will run this for us
  testing = skip
  
@@ -94,7 +94,7 @@
  sources = md5args.c
  install = test
 -libs = libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # run-repos-tests.sh will run this for us
  testing = skip
  
@@ -103,7 +103,7 @@
  install = fs-test
  libs = libsvn_test libsvn_test_fs libsvn_repos libsvn_fs libsvn_delta
 -	libsvn_subr $(SVN_APR_LIBS) libexpat
-+	libsvn_subr $(SVN_APR_LIBS) -lexpat
++	libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # run-repos-tests.sh will run this for us
  testing = skip
  
@@ -112,7 +112,7 @@
  sources = hashdump-test.c
  install = test
 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  # test svn_stringbuf_t utilities
  [stringtest]
@@ -121,7 +121,7 @@
  sources = stringtest.c
  install = test
 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  # test path library
  [path-test]
@@ -130,7 +130,7 @@
  sources = translate-test.c
  install = test
 -libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  # use random data to test delta processing
  [random-test]
@@ -139,7 +139,7 @@
  sources = random-test.c
  install = test
 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  
  
  ### Tests that are simply broken (fix?)  ----------
@@ -148,7 +148,7 @@
  sources = delta-combine-test.c
  install = test
 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # disabled for now -- the delta combiner isn't written, and we
  # don't really have any idea if the interface would be compatible 
  # with this test, anyway.
@@ -157,7 +157,7 @@
  install = fs-test
  libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr
 -	$(SVN_APR_LIBS) libexpat
-+	$(SVN_APR_LIBS) -lexpat
++	$(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # disabled for now, BROKEN.
  testing = skip
  
@@ -166,7 +166,7 @@
  sources = target-test.c
  install = test
 -libs = libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # target-test.sh will run this for us
  testing = skip
  
@@ -175,7 +175,7 @@
  sources = xml-output-test.c
  install = test
 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # this is really redundant with our XML svn-test*.sh tests.
  testing = skip
  
@@ -184,7 +184,7 @@
  sources = checkout-test.c
  install = test
 -libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # this is really redundant with our XML svn-test*.sh tests.
  testing = skip
  
@@ -193,7 +193,7 @@
  sources = commit-test.c
  install = test
 -libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  # this is really redundant with our XML svn-test*.sh tests.
  testing = skip
  
@@ -202,7 +202,7 @@
  sources = deltaparse-test.c
  install = test
 -libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  testing = skip
  
  
@@ -211,7 +211,7 @@
  sources = svndiff-test.c
  install = test
 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  testing = skip
  
  # compare two files, print txdelta windows
@@ -220,7 +220,7 @@
  sources = vdelta-test.c
  install = test
 -libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
-+libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  testing = skip