Version 1.5.1

(24 Jul 2008, from /branches/1.5.x)
http://svn.collab.net/repos/svn/tags/1.5.1

 User-visible changes:
  * mergeinfo on switched subtrees should elide in repos (issue #3188)
  * Add support for --config-dir to svnmerge.py (r31727)
  * improve performance of bdb post-commit deltification (r31820, -59)
  * return faster when there is nothing to be merged (r30748)
  * don't commit an add of a missing item (issue #3198)
  * don't create unneeded self-referential mergeinfo (issue #3157)
  * support 'http-library' (if --enable-runtime-module-search) (r31425, -722)
  * support Berkeley DB 4.7 (r32017, -29)
  * fixed: make serf usable with root-level authz (r31464)
  * fixed: 'svndumpfilter' partial-path matching bug (r31833)
  * fixed: crash on invalid dates in 'log' and 'blame' (issue #2721)
  * fixed: 'svn status --xml' outputting invalid XML (issue #2887)
  * fixed: 'svn merge' prints incorrect range (r30746, -47)
  * fixed: using neon/serf, can not replace branch (issue #2939)
  * fixed: 'file not found' error when merging to a broken symlink (r31159, -79)
  * fixed: using serf, crash or endless loop fetching authn data (r31619)
  * fixed: ArrayIndexOutOfBoundsException in JavaHL bindings (r31719, -806)
  * fixed: authn password lookup used wrong username (issue #2242)
  * fixed: unbounded memory usage in wc-to-wc copy and move (r31868)
  * fixed: subtree merges broken for non-intersecting ranges (issue #3199)
  * fixed: invalid XML from 'svn log --xml' against pre-1.2 servers (r31875)
  * fixed: 'svnlook diff' ignores --diff-copy-from for properties (issue #3248)
  * fixed: 'svnlook diff' doesn't report that binary files differ (issue #3249)
  * fixed: bogus results from commits to subtrees added by merge (issue #3240)
  * fixed: non-existent subtree in destination breaks the merge (issue #3067)
  * fixed: serf merge bug too complex to describe here (r32056)
  * fixed: 'svn log -g' correctness and speed (issue #3220, issue #3235)
  * fixed: merge chokes on renamed subtrees (issue #3174)

 Developer-visible changes:
  * export svn_path_is_url() to the bindings (r31603)
  * don't clobber LDFLAGS in configure when given '--with-zlib' (r31825)
  * make libsvn_ra depend on libsvn_delta unconditionally (r31852)
  * correctly set the peg revision for copy in JavaHL (r31994)
  * 'svn mergeinfo' handles wc paths (r31023, -873, -874, -929, -930, -038)
  * fixed: crash when when svn_ra_open3() is passed a bogus URL (r31223)
  * fixed: JavaHL compilation on Windows (r31737)
  * fixed: crash in calling apr_pstrcat (affects TortoiseSVN) (r32080)

5 files changed, 10 insertions, 12 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 6dd06285445..501f04e6da8 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2008/07/03 20:39:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.55 2008/07/31 21:00:39 epg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
-PKGREVISION=	1
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 1b8b8f026c0..de921846fd1 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2008/07/02 13:14:23 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2008/07/31 21:00:39 epg Exp $
 
 PKGNAME=	subversion-${SVNVER}
-PKGREVISION=	2
 COMMENT=	Version control system, meta-package
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 7f943785f6f..97bdc34328f 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.41 2008/06/19 22:33:25 epg Exp $
+# $NetBSD: Makefile.version,v 1.42 2008/07/31 21:00:39 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		1.5.0
+SVNVER=		1.5.1
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 7174e938f88..102a01b760e 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.62 2008/06/19 22:33:25 epg Exp $
+$NetBSD: distinfo,v 1.63 2008/07/31 21:00:39 epg Exp $
 
-SHA1 (subversion-1.5.0.tar.gz) = c147d51b45c3fd3130f5eb0ad4e6a25423a31c13
-RMD160 (subversion-1.5.0.tar.gz) = 25895e2b6a27c9722a5f9f5d39cd1cffdb65f633
-Size (subversion-1.5.0.tar.gz) = 6604640 bytes
+SHA1 (subversion-1.5.1.tar.gz) = a86d234791713a553d3446d80e1ade08e1a9cb76
+RMD160 (subversion-1.5.1.tar.gz) = dcb7c3b14e271ee5de5f19987e4f6d71f5c45335
+Size (subversion-1.5.1.tar.gz) = 6627153 bytes
 SHA1 (patch-ad) = 52da52e60e4d70266081d98ab0bf4ec312427bd6
diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk
index c23279f61d9..da67ee71a53 100644
--- a/devel/subversion/files/build-outputs.mk
+++ b/devel/subversion/files/build-outputs.mk
@@ -233,7 +233,7 @@ install-lib: $(SVN_RA_LIB_INSTALL_DEPS)
 libsvn_ra_DEPS = $(SVN_RA_LIB_DEPS) subversion/libsvn_ra/compat.lo subversion/libsvn_ra/ra_loader.lo subversion/libsvn_ra/util.lo
 libsvn_ra_OBJECTS = compat.lo ra_loader.lo util.lo
 subversion/libsvn_ra/libsvn_ra-1.la: $(libsvn_ra_DEPS)
-	cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) -lsvn_subr-1 $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/libsvn_ra && $(LINK) -o libsvn_ra-1.la $(LT_NO_UNDEFINED) $(libsvn_ra_OBJECTS) -lsvn_delta-1 -lsvn_subr-1 $(SVN_RA_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 
 libsvn_ra_local_PATH = subversion/libsvn_ra_local
 libsvn_ra_local_DEPS =  subversion/libsvn_ra_local/ra_plugin.lo subversion/libsvn_ra_local/split_url.lo
@@ -2085,7 +2085,7 @@ subversion/svn/unlock-cmd.o: subversion/svn/unlock-cmd.c subversion/include/svn_
 
 subversion/svn/update-cmd.o: subversion/svn/update-cmd.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
-subversion/svn/util.o: subversion/svn/util.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/util.o: subversion/svn/util.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl.h subversion/svn_private_config.h
 
 subversion/svnadmin/main.o: subversion/svnadmin/main.c subversion/include/svn_auth.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h