Update to 0.25.

Upstream change log:

Version 0.25.0 (released 09 July 2003, revision 6394, branches/release-0.25.0)

User-visible changes:
 * command line options:
   . new --force option for svn export (r6327,#1296)
   . new --force-log for commit, copy, delete, import, mkdir, move (r6294)
   . --force no longer needed for commit


 * commands
   . new -  svnadmin archive (r6310)
   . changed - svn import syntax now 'svn import [PATH] URL' (r6288,#933,#735)
   . fixed - Search PATH for external diff commands (r6373)
   . fixed - 'svn switch' memory bug (r6296)
   . fixed - 'svn mkdir' coredump (r6388,#1369)

 * python bindings now in -tools rpm for  Mandrake 9.1 (r6374)
 * allow parent-into-child copies, provided they are not WC->WC. (r6348,#1367)
 * fixed - Apache module installation order (r6382-6,#1381)
 * now requre apache 2.0.47 (and apr 0.9.4)
 * fix 2 commit leaks
 * fix mod_dav_svn path-escaping bug

Developer-visible changes:

 * Win32 build system
   . new - .vcproj files for svn_config project and APR (r6311)
   . fixed - SWIG bindings for Win32 (r6304)
   . vcproj generator now works (r6316)
   . swig's generated .c files now dependent on headers in .i files (r6379)
   . refactored code common to dsp & vcproj into gen_win.py (r6328)

 * fixed
   . SEGFAULTs in SWIG bindings (r6339)
   . potential SEGFAULTs in 'REPORT vcc' backward-compatibility code (r6377)
   . mod_dav_svn's autoversioning failure on PUT (r6312)
   . 'svn switch' memory bug (r6296)

 * changed - mailer.py now uses svn_repos_replay()

4 files changed, 9 insertions, 25 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 43fb7b05d61..9044987a894 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/06/18 13:26:26 epg Exp $
+# $NetBSD: Makefile,v 1.3 2003/07/12 05:39:43 epg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -23,6 +23,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
 		${SVNEXAMPLES}/hook-scripts
 
+BUILDLINK_DEPENDS.apr?=		apr>=0.9.4
+
 .include "../../databases/db4/buildlink2.mk"
 .include "../../devel/apr/buildlink2.mk"
 .include "../../www/neon/buildlink2.mk"
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index cc5a07615eb..c2a92696096 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.2 2003/06/18 13:26:26 epg Exp $
+# $NetBSD: Makefile.version,v 1.3 2003/07/12 05:39:41 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		0.24.1
+SVNVER=		0.25
 # This macro is in this file because the URL changes with every release.
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4761/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/5110/
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index ca5a5454dc7..3baccfe076f 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2003/06/20 06:44:59 epg Exp $
+$NetBSD: distinfo,v 1.10 2003/07/12 05:39:42 epg Exp $
 
-SHA1 (subversion-0.24.1.tar.gz) = 013c3f225cabfb19bc795b817ccc83cbd1d1482c
-Size (subversion-0.24.1.tar.gz) = 7832674 bytes
+SHA1 (subversion-0.25.tar.gz) = 03b36709d3bbbc0eb665b578341d18743d10d672
+Size (subversion-0.25.tar.gz) = 5821703 bytes
 SHA1 (patch-aa) = 994c64bce9b6f237435a2fb57364a12dc3d502e1
-SHA1 (patch-ab) = 55574e8d6ce0c697444745c018390e9efd83f5f1
 SHA1 (patch-ac) = 4468a8196a1cc151ed4bc626bbebf0bf622d5871
 SHA1 (patch-ad) = 6b786776e012917b88c9eee49f0a6c0ab34bc941
 SHA1 (patch-ae) = 76481c3e7185d79c1dec5ee84fba590a4e03e39f
diff --git a/devel/subversion/patches/patch-ab b/devel/subversion/patches/patch-ab
deleted file mode 100644
index 3d009dea8f3..00000000000
--- a/devel/subversion/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/06/06 11:05:01 jmmv Exp $
-
---- tools/backup/hot-backup.py.in.orig	Wed Mar 12 21:09:33 2003
-+++ tools/backup/hot-backup.py.in
-@@ -31,10 +31,10 @@ import sys, os, shutil, string, re
- svnlook = "@SVN_BINDIR@/svnlook"
- 
- # Path to db_archive program
--db_archive = "/usr/local/BerkeleyDB.4.0/bin/db_archive"
-+db_archive = "@BUILDLINK_PREFIX.db4@/bin/db4_archive"
- 
- # Path to db_recover progrem
--db_recover = "/usr/local/BerkeleyDB.4.0/bin/db_recover"
-+db_recover = "@BUILDLINK_PREFIX.db4@/bin/db4_recover"
- 
- # Number of backups to keep around (0 for "keep them all")
- num_backups = 64