Update to 1.6.6.

ok sthen@

devel/subversion/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2009/09/10 15:35:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.64 2009/10/27 09:06:13 stsp Exp $
 
 COMMENT-main=		subversion revision control system
 COMMENT-perl=		perl interface to subversion
@@ -6,13 +6,13 @@ COMMENT-python=		python interface to subversion
 COMMENT-ruby=		ruby interface to subversion
 COMMENT-ap2=		apache2 subversion modules
 
-VERSION=		1.6.5
+VERSION=		1.6.6
 DISTNAME=		subversion-${VERSION}
-PKGNAME-main=		${DISTNAME}p0
+PKGNAME-main=		${DISTNAME}
-FULLPKGNAME-perl=	p5-SVN-${VERSION}p0
+FULLPKGNAME-perl=	p5-SVN-${VERSION}
-FULLPKGNAME-python=	py-subversion-${VERSION}p0
+FULLPKGNAME-python=	py-subversion-${VERSION}
-FULLPKGNAME-ruby=	ruby-subversion-${VERSION}p0
+FULLPKGNAME-ruby=	ruby-subversion-${VERSION}
-FULLPKGNAME-ap2=	ap2-subversion-${VERSION}p0
+FULLPKGNAME-ap2=	ap2-subversion-${VERSION}
 
 SO_VERSION=	1.2
 SVN_LIBS=	svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
@@ -72,6 +72,9 @@ CONTRIB_CLIENT_SIDE_SCRIPTS=	incremental-update.py search-svnlog.pl \
 	svn-clean svn-merge-vendor.py svn_apply_autoprops.py \
 	svn_export_empty_files.py
 
+SVN_LOAD_DIRS_FILES=	LICENSE_AFL3.txt svn_load_dirs.README \
+	svn_load_dirs.pl svn_load_dirs_property_table.example
+
 CONTRIB_SERVER_SIDE_SCRIPTS=	authz_svn_group.py fsfsverify.py \
 	svn-fast-backup svn-tweak-author.py
 
@@ -239,6 +242,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/cgi
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/client-side/emacs
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/client-side/svn2cl
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/client-side/svn_load_dirs
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts/mailer
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts/enforcer
@@ -250,6 +254,10 @@ post-install:
 			${PREFIX}/share/examples/subversion/client-side/emacs
 	${INSTALL_DATA} ${WRKSRC}/contrib/client-side/svn2cl/* \
 			${PREFIX}/share/examples/subversion/client-side/svn2cl
+.for _file in ${SVN_LOAD_DIRS_FILES}
+	${INSTALL_DATA} ${WRKSRC}/contrib/client-side/svn_load_dirs/${_file} \
+			${PREFIX}/share/examples/subversion/client-side/svn_load_dirs
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/contrib/server-side/mod_dontdothat/* \
 			${PREFIX}/share/examples/subversion/server-side/mod_dontdothat
 .for _script in ${CONTRIB_CLIENT_SIDE_SCRIPTS}

devel/subversion/distinfo

@@ -1,5 +1,5 @@
-MD5 (subversion-1.6.5.tar.bz2) = GlOg5yvuC/gU9NqDqbamNg==
+MD5 (subversion-1.6.6.tar.bz2) = 5RCdp1bXTH2Y9oPwBKU5rw==
-RMD160 (subversion-1.6.5.tar.bz2) = 6y2tkt4EQ1Lb4W4PnIHK3NXc0X4=
+RMD160 (subversion-1.6.6.tar.bz2) = Q8rJW0rPxhjcGjwa7ChOA9fKL7k=
-SHA1 (subversion-1.6.5.tar.bz2) = xXXF+s+XLlAQSa1Hqb4Fxc8ig4g=
+SHA1 (subversion-1.6.6.tar.bz2) = AbA9BGYPpdH3bHQrD4o4vxyhpQc=
-SHA256 (subversion-1.6.5.tar.bz2) = ZDMb2kWemEuNNptEnuyJ2qLzzSiBhvHSqa2AEbrdTa0=
+SHA256 (subversion-1.6.6.tar.bz2) = /iPBokfepjEEi9Yv0c1hEZJL4olu8tFmJFrJoShMPJI=
-SIZE (subversion-1.6.5.tar.bz2) = 5491251
+SIZE (subversion-1.6.6.tar.bz2) = 5513036

devel/subversion/patches/patch-subversion_bindings_swig_ruby_test_test_client_rb

@@ -1,15 +0,0 @@
-$OpenBSD: patch-subversion_bindings_swig_ruby_test_test_client_rb,v 1.1 2009/08/25 10:26:20 stsp Exp $
-
-Fixes a failing regression test which 1.6.5 ended up shipping with.
-
---- subversion/bindings/swig/ruby/test/test_client.rb.orig	Thu Aug 20 18:32:24 2009
-+++ subversion/bindings/swig/ruby/test/test_client.rb	Thu Aug 20 18:32:45 2009
-@@ -1013,7 +1013,7 @@ class SvnClientTest < Test::Unit::TestCase
-       yield(ctx, branch, rev3, rev4, trunk)
-       ctx.revert(trunk, false)
-       ctx.resolve(:path=>trunk_path,
--                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MINE_FULL)
-+                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_MERGED)
-       rev5 = ctx.commit(@wc_path).revision
-       assert(File.exist?(trunk_path))
-       ctx.up(@wc_path)

devel/subversion/patches/patch-subversion_bindings_swig_ruby_test_test_core_rb

@@ -0,0 +1,23 @@
+$OpenBSD: patch-subversion_bindings_swig_ruby_test_test_core_rb,v 1.1 2009/10/27 09:06:18 stsp Exp $
+
+Fixes make regress:
+
+  1) Failure:
+test_mime_type_detect_with_type_map(SvnCoreTest) [/usr/ports/pobj/subversion-1.6
+.6/subversion-1.6.6/subversion/bindings/swig/ruby/test/test_core.rb:631]:
+<Svn::Error::BadFilename> exception expected but none was thrown.
+
+--- subversion/bindings/swig/ruby/test/test_core.rb.orig	Thu May 22 16:05:46 2008
++++ subversion/bindings/swig/ruby/test/test_core.rb	Thu Oct 22 10:32:23 2009
+@@ -628,9 +628,8 @@ EOM
+     assert_raises(Svn::Error::BadFilename) do
+       Svn::Core::MimeType.detect(nonexistent_html_file)
+     end
+-    assert_raises(Svn::Error::BadFilename) do
+-      Svn::Core::MimeType.detect(nonexistent_html_file, type_map)
+-    end
++    assert_equal("text/html",
++                 Svn::Core::MimeType.detect(nonexistent_html_file, type_map))
+ 
+     empty_html_file = File.join(@tmp_path, "empty.html")
+     FileUtils.touch(empty_html_file)

devel/subversion/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.7 2009/09/10 15:35:04 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.8 2009/10/27 09:06:18 stsp Exp $
 @conflict gnome-keyring-subversion-*
 @pkgpath devel/subversion,no_bindings
 @pkgpath devel/subversion
@@ -145,6 +145,11 @@ share/examples/subversion/client-side/svn2cl/svn2html.css
 share/examples/subversion/client-side/svn2cl/svn2html.xsl
 share/examples/subversion/client-side/svn_apply_autoprops.py
 share/examples/subversion/client-side/svn_export_empty_files.py
+share/examples/subversion/client-side/svn_load_dirs/
+share/examples/subversion/client-side/svn_load_dirs/LICENSE_AFL3.txt
+share/examples/subversion/client-side/svn_load_dirs/svn_load_dirs.README
+share/examples/subversion/client-side/svn_load_dirs/svn_load_dirs.pl
+share/examples/subversion/client-side/svn_load_dirs/svn_load_dirs_property_table.example
 share/examples/subversion/dumpprops.py
 share/examples/subversion/get-location-segments.py
 share/examples/subversion/getfile.py