Update subversion to 1.6.2 via patch in private mail from Jens

Rehsack.  apr1 is no longer an option; that's just the way it is.

Version 1.6.2
(09 May 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.2

 User-visible changes:
  * vastly improve memory usage with 'svn merge' (issue #3393)
  * make default depth for merge 'infinity' (r37156)
  * make 'status --quiet' show tree conflicts (issue #3396)
  * allow '--set-depth infinity' to expand shallow subtrees (r37169)
  * return an error if attempting to reintegrate from/to the repo root (r37385)
  * don't store bogus mergeinfo for '--ignore-ancestry', foreign merges (r37333)
  * don't allow merge of difference between two repos (r37519)
  * avoid potential segfault with subtree mergeinfo (r36613, -15, -31, -41)
  * recommend sqlite 3.6.13 (r37245)
  * avoid unnecessary server query for implicit mergeinfo (r36509)
  * avoid unnecessary server query during reverse merges (r36527)
  * set depth=infinity on 'svn add' items with restricted depth (r37607)
  * fixed: commit log message template missing paths (issue #3399)
  * fixed: segfault on merge with servers < 1.6 (r37363, -67, -68, -79)
  * fixed: repeat merge failures with non-inheritable mergeinfo (issue #3392)
  * fixed: another memory leak when performing mergeinfo-aware merges (r37398)
  * fixed: incorrect mergeinfo on children of shallow merges (issue #3407)
  * fixed: pool lifetime issues in the BDB backend (r37137)

 Developer-visible changes:
  * don't fail if an embedding app has already initialized SQLite (issue #3387)
  * resolve naming collisions with static stat() function in svnserve (r37527)
  * fix an expectation for a failing dirent windows test (r37121)


Version 1.6.1
(10 Apr 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.1

 User-visible changes:
  * recommend Neon 0.28.4. (r36388)
  * improve performance of 'svn merge --ignore-ancestry' (r36256)
  * improve 'svn merge' performance with subtree mergeinfo (r36444)
  * correctly proxy LOCK and UNLOCK requests (r36159)
  * prevent a crash when updating old working copies (r36751)
  * don't let svnmerge.py delete a nonexistent property (r36086, -767, -769)
  * don't fail when upgrading pre-1.2 repositories (r36851, -7)
  * allow escaping of separator characters in autoprops (r36763, -84)
  * improve tempfile creation robustness on Windows (r36442, -3)
  * fix change-svn-wc-format.py for 1.6.x working copies (r36874, -5)
  * improve configure's detection of Berkeley DB (r36741, -2)
  * don't allow foreign merges to add foreign mergeinfo (issue #3383)
  * improve performance of 'svn update' on large files (r36389, et. al.)
  * fixed: error leak and potential crash (r36860)
  * fixed: parent directory handling on Windows (r36049, -50, -51, -131)
  * fixed: unintialized memory errors (r36252, -3)
  * fixed: potential working copy corruption (r36714)
  * fixed: working copy upgrade error (r36302)
  * fixed: pointer dereference error (r36783)
  * fixed: error diff'ing large data with ignored whitespace (r36816)
  * fixed: potential hang in ra_serf (r36913)
  * fixed: problem with merge and non-inheritable mergeinfo (r36879)
  * fixed: repeated merging of conflicted properties fails (issue #3250)
  * fixed: excluding an absent directory segfaults (issue #3391)

 Developer-visible changes:
  * ensure svn_subst_translate_cstring2() properly flushes data (r36747)
  * make serf report a base checksum to apply_textdelta (r36890)
  * syntax updates for strict C89 compilers (r36799)
  * update RPM scripts for RHEL4 (r36834)
  * allow tests to be run with Python 2.6.1 on Windows (r36149, -50, -51, -56)
  * allow building JavaHL with Visual Studio 2008 (r36954)
  * stop setting default translation domain in JavaHL (r36955)
  * fixed: warning with Python 2.6 and ctypes bindings (r36559)
  * fixed: undefined references to svn_fs_path_change2_create() (r36823)


Version 1.6.0
(20 Mar 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.0

 User-visible changes:
  - General:
    * Now require Windows 2000 or newer on Windows (r33170)

  - Major new features:
    * identical files share storage space in repository (issue #2286)
    * file-externals support for intra-repository files (issue #937)
    * "tree" conflicts now handled more gracefully (issue #2282, #2908)
    * repository root relative URL support on most commands (issue #3193)

  - Minor new features and improvements:
    * pre-lock hook can now specify lock tokens via stdout (r32778)
    * svnmucc: support '--with-revprop' (r29492)
    * merge: log include-descendants in operational log (r30426, r30428)
    * improved operational logging for 'svn switch' (r30517)
    * new 'Header' keyword, similar to 'Id' but with full URL (r35386)
    * warn/disallow when storing plain-text passwords (r31046)
    * support KWallet and GNOME keyring for password storage (r31241, -337)
    * client now caches SSL client cert passphrases (issue #2489)
    * add '--prefix-file' option to 'svndumpfilter' (issue #2697)
    * add '--ignore-externals' option to 'svn cp' (issue #3365)
    * add '--with-no-revprops' to 'svn log' (issue #3286)
    * new 'svnadmin pack' command to compress FSFS filesystems
    * new SVNAllowBulkUpdates mod_dav_svn directive (issue #3121)
    * new public mod_dav_svn URI syntax:  path?[p=PEG][&r=REV] (r34076)
    * new 'svnsync info' command to show synchronization information (r35053)
    * conflict resolver supports display-conflict, mine-conflict and theirs-conflict

  - Client-side bugfixes:
    * faulty reflexive merges (issue #2897)
    * buffer overflow on a 0 byte string buffer (r35968, -74)
    * conflict resolver needed more useful 'diff' option (issue #3048)
    * disable username assumption (issue #2324)
    * more accurate usage message for 'svn log' (r30449)
    * do not repeat merge if target has explicit mergeinfo (issue #2821)
    * corruption when filtering self-referential mergeinfo (r30467)
    * filter empty mergeinfo with self-referential mergeinfo (r30510)
    * pay attention to partial replay from the server in svnsync (r30440)
    * improved property name handling in svnsync (r30480)
    * properly recognize the file:/// in repository with svnsync (r30482)
    * svn+ssh SIGKILLs ssh processes (issue #2580)
    * 'svn up'/'svn co' early abort with svn:externals (issue #3148)
    * improve tempfile names for conflict resolver (issue #3166)
    * ra_serf: 'svn merge' aborts (issue #3212)
    * 'svn cleanup' failed on non-ASCII characters (issue #3313)
    * 'svn update' fails on moved, modified file with local mods (issue #3354)
    * easier use of NTLM for proxy with ra_neon (r29874)
    * 2-url merge from DAV-accessed foreign repo makes bad wcprops (issue #3118)
    * can't add .svn (and children) to your wc via '--parents' (r35819)
    * improved performance removing unversioned directories (r36111)
    * 'svn cp --parents' had path URL encoding issues (issue #3374)
    * support shell quoting rules in externals definitions (issue #2461)
    * new SVN_LOCALE_DIR environment variable for localization (issue #2879)
    * scheme and domain name in urls handled case insensitive (issue #2475)
    * merge: pick default revisions with peg revision in single url (r30455)
    * many other minor bugfixes, optimizations, plugs of memory leaks, etc

  - Server-side bugfixes:
    * mod_dav_svn runs pre-revprop-change twice (issue #3085)
    * mod_dav_svn ignores pre-revprop-change failure on delete (issue #3086)
    * mod_dav_svn prevented lock breaks from being propagated to client (r29914)
    * non-UTF8 filenames could enter repository (issue #2748)
    * 'svnlook proplist' xml output (issue #2809)
    * don't let mod_dav_svn hide errors from client (issue #3102)
    * ra_serf failure during update (issue #3113)
    * ra_serf comply with RFC 2617 in handling authentication headers (r35981)
    * use both SHA1 and MD5 in the FS backends (r34388)
    * many other minor bugfixes too numerous to list here

  - Contributed tools improvements and bugfixes:
    * commit-email.pl: Deprecated; use mailer.py instead (r31755, -67)
    * svnmerge.py migration tool munged svn:mergeinfo ordering (issue #3302)
    * And other random sundry stuff

 Developer-visible changes:
  - General:
    * serf 0.3.0 required, when building with serf (r35586)
    * require SQLite 3.4.0 or newer (r33520)
    * allow the use of an in-tree SQLite amalgamation (r35263)
    * svn_log_changed_path_t now includes a 'kind' field (issue #1967)
    * BDB `changes' table inconsistency when APIs are misused (issue #3349)
    * configure should prefer apr-1 over apr-0 if both are present (issue #2671)
    * make 'Not Found' errors consistent between RA layers (issue #3137)
    * fix a potential buffer overrun (r34374)
    * many bug fixes and improvements to the test suite

  - API changes:
    * notification system for properties and revision properties (issue #783)
    * make ra_svn's merge commit-revprops public (r30462, r30453)
    * mod_dav_svn operational logging compatible with svnserve logging (r30518)
    * improve speed of svn_client__get_copy_source() (issue #3356)
    * if fsfs commit fails return SVN_INVALID_REVNUM (r35950)

  - Bindings:
    * new: ctypes python bindings
    * many improvements to all bindings (Java, Perl, Python, and Ruby)
    * respect CFLAGS in SWIG bindings (r35879)
    * fix building Ruby bindings with Ruby 1.9 (r35852, r35883)

16 files changed, 87 insertions, 93 deletions

diff --git a/devel/java-subversion/Makefile b/devel/java-subversion/Makefile
index 92142a1cc38..96f0e929638 100644
--- a/devel/java-subversion/Makefile
+++ b/devel/java-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/04/16 21:42:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/30 00:16:46 gdt Exp $
 
 PKGNAME=	java-subversion-${SVNVER}
-PKGREVISION=	1
 COMMENT=	Java bindings for Subversion
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index e742590e94e..8a4edc8aa59 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2009/04/16 21:42:41 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2009/05/30 00:16:47 gdt Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
-PKGREVISION=	2
 COMMENT=	Perl bindings for Subversion
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 52e67857bea..112164bb827 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2009/04/16 21:42:41 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/05/30 00:16:47 gdt Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
-PKGREVISION=	1
 COMMENT=	Python bindings and tools for Subversion
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/py-subversion/PLIST b/devel/py-subversion/PLIST
index 12e49448bc8..ba0dbea6f92 100644
--- a/devel/py-subversion/PLIST
+++ b/devel/py-subversion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/06/19 22:33:25 epg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/05/30 00:16:47 gdt Exp $
 lib/libsvn_swig_py-1.la
 ${PYSITELIB}/libsvn/__init__.py
 ${PYSITELIB}/libsvn/__init__.pyc
@@ -57,5 +57,7 @@ share/examples/subversion/python/revplist.py
 share/examples/subversion/python/svnlook.py
 share/examples/subversion/python/svnshell.py
 @dirrm share/examples/subversion/python
+@dirrm share/examples/subversion/hook-scripts
+@dirrm share/examples/subversion
 @dirrm ${PYSITELIB}/svn
 @dirrm ${PYSITELIB}/libsvn
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index 48063ad9188..4bbd155762b 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2009/04/16 21:42:42 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/30 00:16:47 gdt Exp $
 
 PKGNAME=	${RUBY_PKGPREFIX}-subversion-${SVNVER}
-PKGREVISION=	1
 COMMENT=	Ruby bindings for Subversion
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index aa120b356df..ee0f25ef7a8 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2009/05/21 16:11:41 abs Exp $
+# $NetBSD: Makefile,v 1.63 2009/05/30 00:16:47 gdt Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
-PKGREVISION=	3
 COMMENT=	Version control system, base programs and libraries
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -13,52 +12,24 @@ BROKEN_GETTEXT_DETECTION=	yes
 
 .include "../../devel/subversion/Makefile.common"
 
-.if !empty(PKG_OPTIONS:Mapr1)
-APU_OPTIONS=		PKG_BUILD_OPTIONS.apr-util
-.else
-APU_OPTIONS=		PKG_BUILD_OPTIONS.apr
-.endif
-
-BUILD_DEFS+=		${APU_OPTIONS}
-
 USE_TOOLS+=		msgfmt
 
 CONFIGURE_ARGS+=	--disable-neon-version-check
-CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
 
-.if !empty(PKG_OPTIONS:Mapr1)
-.  include "../../devel/apr/buildlink3.mk"
-.  include "../../devel/apr-util/buildlink3.mk"
-.  if !empty(PKG_OPTIONS:Mserf)
-DAV_RA=				serf
-.    include "../../www/serf/buildlink3.mk"
-.  else
-BUILDLINK_API_DEPENDS.neon+=	neon>=0.25.0
-DAV_RA=				neon
-.    include "../../www/neon/buildlink3.mk"
-.  endif
-.else
-.  include "../../devel/apr0/buildlink3.mk"
-BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.5
-BUILDLINK_API_DEPENDS.neon+=	neon>=0.25.0
-DAV_RA=				neon
-.  include "../../www/neon/buildlink3.mk"
-.endif
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/apr-util/buildlink3.mk"
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.4
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 
-.if !empty(${APU_OPTIONS}:Mdb4)
-PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
+PLIST_VARS+=		db4
+.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
+PLIST.db4=		yes
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
 .endif
 
-.if !empty(PKG_OPTIONS:Msasl)
-.include "../../security/cyrus-sasl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-.else
-CONFIGURE_ARGS+=	--without-sasl
-.endif
-
 PLIST_SUBST+=		DAV_RA=${DAV_RA:Q}
 
 SUBST_CLASSES+=		paths
@@ -74,14 +45,23 @@ post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/backup
 	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/cgi
 	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
+	${INSTALL_DATA_DIR} ${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
 	${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
 		${DESTDIR}${SVNEXAMPLES}/backup
 	${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi \
 		${DESTDIR}${SVNEXAMPLES}/cgi
-	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.pl \
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit* \
 		${DESTDIR}${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
 		${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \
+		${WRKSRC}/tools/hook-scripts/verify-po.py \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer* \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/mailer* \
+		${DESTDIR}${SVNEXAMPLES}/hook-scripts/mailer/tests
 
 .PHONY: svn-build-outputs-hack
 # Use this target to update the build-outputs.mk hack for sub-packages.
diff --git a/devel/subversion-base/PLIST b/devel/subversion-base/PLIST
index b7e42678d22..19ff049eef9 100644
--- a/devel/subversion-base/PLIST
+++ b/devel/subversion-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2008/06/19 22:33:26 epg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/05/30 00:16:47 gdt Exp $
 bin/svn
 bin/svnadmin
 bin/svndumpfilter
@@ -11,6 +11,7 @@ include/subversion-1/mod_dav_svn.h
 include/subversion-1/svn-revision.txt
 include/subversion-1/svn_auth.h
 include/subversion-1/svn_base64.h
+include/subversion-1/svn_checksum.h
 include/subversion-1/svn_client.h
 include/subversion-1/svn_cmdline.h
 include/subversion-1/svn_compat.h
@@ -19,6 +20,7 @@ include/subversion-1/svn_ctype.h
 include/subversion-1/svn_dav.h
 include/subversion-1/svn_delta.h
 include/subversion-1/svn_diff.h
+include/subversion-1/svn_dirent_uri.h
 include/subversion-1/svn_dso.h
 include/subversion-1/svn_error.h
 include/subversion-1/svn_error_codes.h
@@ -52,10 +54,12 @@ lib/libsvn_delta-1.la
 lib/libsvn_diff-1.la
 lib/libsvn_fs-1.la
 lib/libsvn_fs_fs-1.la
+${PLIST.db4}lib/libsvn_fs_base-1.la
 lib/libsvn_fs_util-1.la
 lib/libsvn_ra-1.la
-lib/libsvn_ra_${DAV_RA}-1.la
 lib/libsvn_ra_local-1.la
+${PLIST.neon}lib/libsvn_ra_neon-1.la
+${PLIST.serf}lib/libsvn_ra_serf-1.la
 lib/libsvn_ra_svn-1.la
 lib/libsvn_repos-1.la
 lib/libsvn_subr-1.la
@@ -75,9 +79,21 @@ share/doc/subversion/lj_article.txt
 share/doc/subversion/svn-best-practices.html
 share/examples/subversion/backup/hot-backup.py
 share/examples/subversion/cgi/tweak-log.cgi
-share/examples/subversion/hook-scripts/commit-email.pl
+share/examples/subversion/hook-scripts/commit-access-control.cfg.example
+share/examples/subversion/hook-scripts/commit-access-control.pl
+share/examples/subversion/hook-scripts/commit-access-control.pl.in
+share/examples/subversion/hook-scripts/commit-email.rb
+share/examples/subversion/hook-scripts/log-police.py
+share/examples/subversion/hook-scripts/mailer/mailer.conf.example
+share/examples/subversion/hook-scripts/mailer/mailer.py
+share/examples/subversion/hook-scripts/mailer/tests/mailer-init.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.output
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-tweak.py
+share/examples/subversion/hook-scripts/mailer/tests/mailer.conf
 share/examples/subversion/hook-scripts/svnperms.conf.example
 share/examples/subversion/hook-scripts/svnperms.py
+share/examples/subversion/hook-scripts/verify-po.py
 share/locale/de/LC_MESSAGES/subversion.mo
 share/locale/es/LC_MESSAGES/subversion.mo
 share/locale/fr/LC_MESSAGES/subversion.mo
@@ -90,6 +106,8 @@ share/locale/pt_BR/LC_MESSAGES/subversion.mo
 share/locale/sv/LC_MESSAGES/subversion.mo
 share/locale/zh_CN/LC_MESSAGES/subversion.mo
 share/locale/zh_TW/LC_MESSAGES/subversion.mo
+@dirrm share/examples/subversion/hook-scripts/mailer/tests
+@dirrm share/examples/subversion/hook-scripts/mailer
 @dirrm share/examples/subversion/hook-scripts
 @dirrm share/examples/subversion/cgi
 @dirrm share/examples/subversion/backup
diff --git a/devel/subversion-base/PLIST.bdb b/devel/subversion-base/PLIST.bdb
index 25dbdd41aab..e69de29bb2d 100644
--- a/devel/subversion-base/PLIST.bdb
+++ b/devel/subversion-base/PLIST.bdb
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.bdb,v 1.1 2004/09/30 14:39:33 epg Exp $
-lib/libsvn_fs_base-1.la
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index c0c1acedbab..0feaf8ab0cb 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/04/16 21:42:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/05/30 00:16:47 gdt Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/subversion/Makefile.version"
@@ -21,18 +21,17 @@ pkgbase := subversion-base
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mapr1)
-.  include "../../devel/apr/buildlink3.mk"
-.  include "../../devel/apr-util/buildlink3.mk"
-.  if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
-.    include "../../www/serf/buildlink3.mk"
-.  else
-.    include "../../www/neon/buildlink3.mk"
-.  endif
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/apr-util/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.subversion-base:Mserf)
+.  include "../../www/serf/buildlink3.mk"
 .else
-.  include "../../devel/apr0/buildlink3.mk"
 .  include "../../www/neon/buildlink3.mk"
 .endif
+
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.4
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .endif # SUBVERSION_BASE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-subversion-base
diff --git a/devel/subversion-base/options.mk b/devel/subversion-base/options.mk
index 66491e30128..66f00cf1472 100644
--- a/devel/subversion-base/options.mk
+++ b/devel/subversion-base/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2008/07/03 22:01:48 schmonz Exp $
+# $NetBSD: options.mk,v 1.9 2009/05/30 00:16:47 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.subversion
-PKG_SUPPORTED_OPTIONS=	apache22 apr1 serf java sasl
-PKG_SUGGESTED_OPTIONS=	apr1
+PKG_SUPPORTED_OPTIONS=	serf sasl
+PKG_SUGGESTED_OPTIONS=	# empty
 
 # Note that this file is included as part of several packages.
 # Therefore this file only defines options, but does not include the
@@ -11,6 +11,22 @@ PKG_SUGGESTED_OPTIONS=	apr1
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mapache22) || !empty(PKG_OPTIONS:Mserf)
-PKG_OPTIONS+=		apr1
+PLIST_VARS+=	serf neon
+
+.if !empty(PKG_OPTIONS:Mserf)
+DAV_RA=		serf
+PLIST.serf=	yes
+.  include "../../www/serf/buildlink3.mk"
+.else
+BUILDLINK_API_DEPENDS.neon+=	neon>=0.25.0
+DAV_RA=		neon
+PLIST.neon=	yes
+.  include "../../www/neon/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msasl)
+.include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.else
+CONFIGURE_ARGS+=	--without-sasl
 .endif
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index ce86dcc4699..084ec3b80c4 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2009/04/08 22:54:22 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/05/30 00:16:47 gdt Exp $
 
 PKGNAME=	subversion-${SVNVER}
-PKGREVISION=	1
 COMMENT=	Version control system, meta-package
 
 META_PACKAGE=	# empty
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 19c55066d6e..a97cb6ee46a 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.version,v 1.48 2009/03/22 15:27:06 gdt Exp $
+# $NetBSD: Makefile.version,v 1.49 2009/05/30 00:16:47 gdt Exp $
 
 .if !defined(SVNVER)
 # As of 2009-03-22 gdt@NetBSD.org knows 1.6.0 is out, but is
 # intentionally waiting until post-2009Q1 and until there is enough
 # experience with 1.6.0 before subjecting pkgsrc users to it.  Update
 # will probably come mid to late April; comments welcome.
-SVNVER=		1.5.6
+SVNVER=		1.6.2
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index a96d391e0f0..3bfb6740aad 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.70 2009/05/21 16:11:41 abs Exp $
+$NetBSD: distinfo,v 1.71 2009/05/30 00:16:47 gdt Exp $
 
-SHA1 (subversion-1.5.6.tar.gz) = de5fd8c46e3872f7ee3a05a45b71936f82646a92
-RMD160 (subversion-1.5.6.tar.gz) = cc725c81854f594c9471fd5a4712e53e83d1be9a
-Size (subversion-1.5.6.tar.gz) = 6727513 bytes
-SHA1 (patch-aa) = b74ab8e8a0f2a28bee9b00f3562d8ff31b2004ba
+SHA1 (subversion-1.6.2.tar.gz) = 35964d8c00dd58e78a374a083a2347b97cc7be1d
+RMD160 (subversion-1.6.2.tar.gz) = c311c1b3e532b3e92bc2eba661b74e0764d41ea4
+Size (subversion-1.6.2.tar.gz) = 7506011 bytes
 SHA1 (patch-ad) = 52da52e60e4d70266081d98ab0bf4ec312427bd6
 SHA1 (patch-ae) = 55982ded0a7cbb09a91545c7580021e8ed4947f0
diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk
index da67ee71a53..b0f3e725ec2 100644
--- a/devel/subversion/files/build-outputs.mk
+++ b/devel/subversion/files/build-outputs.mk
@@ -36,7 +36,8 @@ MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndum
 
 CLEAN_FILES = contrib/client-side/svn-push/svn-push$(EXEEXT) contrib/client-side/svnmucc/svnmucc$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT)
 
-SWIG_INCLUDES = -I$(abs_srcdir)/subversion/include \
+SWIG_INCLUDES = -I$(abs_srcdir)/subversion \
+  -I$(abs_srcdir)/subversion/include \
   -I$(abs_srcdir)/subversion/bindings/swig \
   -I$(abs_srcdir)/subversion/bindings/swig/include \
   -I$(abs_srcdir)/subversion/bindings/swig/proxy \
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
index 354d0c1f031..e69de29bb2d 100644
--- a/devel/subversion/patches/patch-aa
+++ b/devel/subversion/patches/patch-aa
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2009/05/21 16:11:41 abs Exp $
-
---- tools/hook-scripts/commit-email.pl.in.orig	2008-04-01 16:12:17.000000000 +0100
-+++ tools/hook-scripts/commit-email.pl.in
-@@ -557,7 +557,7 @@ foreach my $project (@project_settings_l
- 
-     my @head;
-     my $formatted_date;
--    if (defined $stdout)
-+    if ($stdout)
-       {
-         $formatted_date = strftime('%a %b %e %X %Y', localtime());
-         push(@head, "From $mail_from $formatted_date\n");
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 460a09e5ba3..e96c963e47e 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2009/04/16 21:42:43 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2009/05/30 00:16:47 gdt Exp $
 
 PKGNAME=	${APACHE_PKG_PREFIX}-subversion-${SVNVER}
-PKGREVISION=	1
 COMMENT=	WebDAV server (Apache module) for Subversion
 
 PKG_DESTDIR_SUPPORT=	user-destdir