Update to revision 3687.

User-visible changes (for developer-changes see the included CHANGES file):

Version 0.15 (released 7 Nov 2002, revision 3687)

 * New 'S' indicator in 'svn status' shows switched subdirs
 * New --dry-run option added for 'svn merge' (issue #953)
 * Fix 'svn update .' to handle svn:externals correctly
 * Memory usage of 'svn import' reduced (issue #860)
 * Allow 'svn revert' on missing directories scheduled for deletion
 * Assorted bug fixes in several exciting flavors
 * Documentation improvements

Version 0.14.5 [Alpha Interim 5] (released 30 Oct 2002, revision 3578)

 * allow --incremental option for 'svn log' xml output

Version 0.14.4 [Alpha Interim 4] (released 29 Oct 2002, revision 3553)

 * new working-copy entry-caching: speeds many ops up to 5x (#749)
 * new 'svnadmin recover', instead of db_recover
 * client can now view & change server-side revision props (e.g. log messages)
 * new --non-interactive switch for commandline client
 * new --incremental option to 'svn log'
 * new -r {date} syntax for specifying dated revs; works over network too.
 * automatically set svn:executable prop when adding or importing (#870)
 * initial $EDITOR text now ignores all log data below special token
 * consistify behavior of text & prop columns in 'svn status' output.
 * .svn/auth/* files now chmod 700, to stop scaring people.  :-)
 * improved labels in 'svn diff' output (#936)
 * run-time adjustable neon timeout in newly renamed 'servers' config file
 * big improvements to cvs2svn script:  bugfixes and basic branch/tag support
 * new python access-control hook script
 * no more implicit dot-target for 'svn propedit' or 'svn propset' (#924)
 * remove obsolete --xml-file support
 * Handbook is now ported to Docbook, 2 new chapters.

Version 0.14.3 [Alpha Interim 3] (released 20 Sept 2002, revision 3200)

 * new ~/.subversion/config file
 * new $Id$ keyword
 * new client --no-auth-cache option
 * empty values in the Windows Registry are no longer ignored (issue #671)
 * report details of repository start-commit or pre-commit hook errors
 * fix locking behaviour when using current directory as a target
 * updated man page
 * new front-page logo.  :-)

Version 0.14.2 [Alpha Interim 2] (released 22 Aug 2002, revision 3033)

 * fs schema change, see issue #842. **NOTE: repos dump/load cycle required!**
 * new 'svn ls -R' option
 * new status code `~', for type changes
 * add --username and --password options to 'svn ls'
 * new script tools/client-side/svn_all_diffs.pl
 * new script tools/examples/blame.py (draft)

Version 0.14.1 [Alpha Interim 1] (released 9 August 2002, revision 2927)

 * show copy-ancestry in 'svn log -v'
 * 'svn co' can take multiple URLs now
 * new 'svn ls' command
 * new 'svn st --no-ignore' option
 * new 'svn --version --quiet' option
 * more conservative 'svn help' usage error-message
 * more graceful degradation from charset conversion failure
 * standardize policy of -q switch behavior
 * less intimidating error output
 * new SVNParentPath directive for mod_dav_svn <Location>s
 * svnlook now correctly displays copied subtrees
 * Handbook: additions, tweaks, cleanups, and new French Translation :-)
 * svn_load_dirs.pl: auto propset on files matching specified regex, bug fixes

5 files changed, 12 insertions, 77 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 3ae96a8cd4e..d16e3591705 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/11/09 15:18:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/25 20:09:50 wiz Exp $
 
-DISTNAME=	subversion-r2667
-PKGNAME=	subversion-0.2667
+DISTNAME=	subversion-r3687
+PKGNAME=	subversion-0.3687
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/578/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/1698/
 
 MAINTAINER=	joelw@unix.se
 HOMEPAGE=	http://subversion.tigris.org
@@ -11,7 +11,7 @@ COMMENT=	Version control system, meant to replace CVS
 
 DEPENDS+=	python22-[0-9]*:../../lang/python22
 
-AUTOCONF_REQD=	2.50
+AUTOCONF_REQD=	2.56
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl
 CONFIGURE_ARGS+= --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include/db4:${LOCALBASE}
@@ -24,10 +24,8 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 PLIST_SUBST+=   INSTALL_INFO=${INSTALL_INFO}
 INFO_FILES+=	svn-design.info
-INFO_FILES+=	svn-handbook.info
 
 post-extract:
-	@${SED} 's/ldb/ldb4/g' < ${WRKSRC}/configure > ${WRKSRC}/configure
 	@${RM} -r ${WRKSRC}/neon
 	@${RM} -r ${WRKSRC}/apr
 	@${RM} -r ${WRKSRC}/apr-util
diff --git a/devel/subversion/PLIST b/devel/subversion/PLIST
index 493c41bad15..0e7337ab362 100644
--- a/devel/subversion/PLIST
+++ b/devel/subversion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/03 02:01:42 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/25 20:09:50 wiz Exp $
 bin/svn
 bin/svn-config
 bin/svnadmin
@@ -15,8 +15,11 @@ include/subversion-1/svn_error_codes.h
 include/subversion-1/svn_fs.h
 include/subversion-1/svn_hash.h
 include/subversion-1/svn_io.h
+include/subversion-1/svn_opt.h
 include/subversion-1/svn_path.h
+include/subversion-1/svn_pipe.h
 include/subversion-1/svn_pools.h
+include/subversion-1/svn_props.h
 include/subversion-1/svn_quoprint.h
 include/subversion-1/svn_ra.h
 include/subversion-1/svn_repos.h
@@ -30,13 +33,10 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/svn-design.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/svn-handbook.info
 info/svn-design.info
 info/svn-design.info-1
 info/svn-design.info-2
 info/svn-design.info-3
-info/svn-handbook.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/svn-handbook.info
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/svn-design.info
 lib/libsvn_auth-1.a
 lib/libsvn_auth-1.la
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index d6a10486761..8bcd128876f 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/03 02:01:42 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2002/11/25 20:09:50 wiz Exp $
 
-SHA1 (subversion-r2667.tar.gz) = 260717b20aef19536361c52dde038961eedc15ca
-Size (subversion-r2667.tar.gz) = 5308872 bytes
-SHA1 (patch-aa) = ced652b876650042f4762c309672ba0cdda0a018
+SHA1 (subversion-r3687.tar.gz) = 814dd70eef36e2eff06cc405bfcdb270adb33e4d
+Size (subversion-r3687.tar.gz) = 7005220 bytes
 SHA1 (patch-ab) = d0ef1f26060421d77a85241dc03f89385ccb2530
 SHA1 (patch-ac) = 7f4f5bf2cabcf2612993d7541d570d39f4d7f528
-SHA1 (patch-ad) = ed2c1dce15209b1796be71f0bf01264d7a2b6a9d
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
deleted file mode 100644
index f28d3c44066..00000000000
--- a/devel/subversion/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/03 02:01:42 hubertf Exp $
-
---- ac-helpers/berkeley-db.m4.orig	Fri Aug  2 11:30:28 2002
-+++ ac-helpers/berkeley-db.m4
-@@ -102,7 +102,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
-     if test "$enable_shared" = "yes"; then
-         SVN_DB_LIBS="$dbdir/libdb-4.0.la"
-     else
--        SVN_DB_LIBS="-L$dbdir -ldb"
-+        SVN_DB_LIBS="-L$dbdir -ldb4"
-     fi
-   elif test "$status" = "skip"; then
-     svn_lib_berkeley_db=no
-@@ -193,7 +193,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
-       ;;
-       "std" )
-         SVN_DB_INCLUDES=
--        SVN_DB_LIBS=-ldb
-+        SVN_DB_LIBS=-ldb4
-         svn_lib_berkeley_db=yes
-       ;;
-       *":"* )
-@@ -201,13 +201,13 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
- 	lib="`echo $found | sed -e 's/^.*://'`"
-         SVN_DB_INCLUDES="-I$header"
- dnl ### should look for a .la file
--        SVN_DB_LIBS="-L$lib -ldb"
-+        SVN_DB_LIBS="-L$lib -ldb4"
-         svn_lib_berkeley_db=yes
-       ;;
-       * )
-         SVN_DB_INCLUDES="-I$found/include"
- dnl ### should look for a .la file
--        SVN_DB_LIBS="-L$found/lib -ldb"
-+        SVN_DB_LIBS="-L$found/lib -ldb4"
- 	svn_lib_berkeley_db=yes
-       ;;
-     esac
-@@ -234,7 +234,7 @@ dnl   function, then this macro assumes 
- AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
-   [
-     svn_lib_berkeley_db_try_save_libs="$LIBS"
--    LIBS="$LIBS -ldb"
-+    LIBS="$LIBS -ldb4"
- 
-     svn_check_berkeley_db_major=$1
-     svn_check_berkeley_db_minor=$2
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
deleted file mode 100644
index 45e03b31b98..00000000000
--- a/devel/subversion/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/08/03 02:01:42 hubertf Exp $
-
---- build.conf.orig	Fri Aug  2 11:56:00 2002
-+++ build.conf
-@@ -73,9 +73,6 @@ libs = libsvn_client libsvn_wc libsvn_ra
- manpages = subversion/clients/cmdline/man/svn.1
-  subversion/svnadmin/svnadmin.1
- infopages = doc/handbook/svn-handbook.info
-- doc/handbook/svn-handbook.info-1
-- doc/handbook/svn-handbook.info-2
-- doc/handbook/svn-handbook.info-3
-  doc/programmer/design/svn-design.info
-  doc/programmer/design/svn-design.info-1
-  doc/programmer/design/svn-design.info-2