Subversion 1.6.6 has been released, the diff below updates the port. Please test / ok.
Version 1.6.6 (16 Oct 2009, from /branches/1.6.x) http://svn.collab.net/repos/svn/tags/1.6.6 User-visible changes: * fix crash during 'svn update' (r39673) * respect Apache's ServerSignature directive (r40008, -21, -31) * don't add a file with mixed line endings, and then abort (issue #2713) * support Neon 0.29. * fix a crash in 'svn rm --force' (r37953) * handle tree conflicts involving replacements (issue #3486) * allow non-threadsafe sqlite if APR has no threads (r39301) * print newline before plaintext SSL cert / password prompts (r38982, r39302) * improve merge performance with implicit subtree mergeinfo (issue #3443) * fix "libsvn_ra_svn/marshal.c assertion failed (opt || cstr)" (issue #3485) * make file externals work for binary files (issue #3368) * perform MIME type matching case-insensitively (issue #3479) * do not treat non-existent revisions as HEAD in 'svn export' (issue #3400) * revert r36720's default MIME type change back to "text/plain" (issue #3508) * improve "tree conflict already exists" error message (r38872) * fix failure to commit replacement of a directory (issue #3281) * fix mod_dav_svn parent dir links to preserve peg revisions (issue #3425) Developer-visible changes: * fix 2 failing tests in ruby bindings (r38886) * do not require GNU grep for build (issue #3453) * use '$SED' instead of 'sed' in build scripts (issue #3458) * add svn.client.{log5,merge_peg3} to python bindings (r39635, -6, -7) * include the time of a test run in tests.log (r39887) Also, though not mentioned in upstream's change log, the svn_load_dirs vendor-branching helper script has finally been assigned a licence by its copyright holder (which is a large corporation so this took some time). The OpenBSD package can now include this script again. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/subversion/Makefile,v retrieving revision 1.63 diff -u -p -r1.63 Makefile --- Makefile 10 Sep 2009 15:35:04 -0000 1.63 +++ Makefile 22 Oct 2009 09:40:32 -0000 @@ -6,13 +6,13 @@ COMMENT-python= python interface to sub 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 -FULLPKGNAME-perl= p5-SVN-${VERSION}p0 -FULLPKGNAME-python= py-subversion-${VERSION}p0 -FULLPKGNAME-ruby= ruby-subversion-${VERSION}p0 -FULLPKGNAME-ap2= ap2-subversion-${VERSION}p0 +PKGNAME-main= ${DISTNAME} +FULLPKGNAME-perl= p5-SVN-${VERSION} +FULLPKGNAME-python= py-subversion-${VERSION} +FULLPKGNAME-ruby= ruby-subversion-${VERSION} +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 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} Index: distinfo =================================================================== RCS file: /cvs/ports/devel/subversion/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo 25 Aug 2009 10:26:20 -0000 1.21 +++ distinfo 21 Oct 2009 20:08:46 -0000 @@ -1,5 +1,5 @@ -MD5 (subversion-1.6.5.tar.bz2) = GlOg5yvuC/gU9NqDqbamNg== -RMD160 (subversion-1.6.5.tar.bz2) = 6y2tkt4EQ1Lb4W4PnIHK3NXc0X4= -SHA1 (subversion-1.6.5.tar.bz2) = xXXF+s+XLlAQSa1Hqb4Fxc8ig4g= -SHA256 (subversion-1.6.5.tar.bz2) = ZDMb2kWemEuNNptEnuyJ2qLzzSiBhvHSqa2AEbrdTa0= -SIZE (subversion-1.6.5.tar.bz2) = 5491251 +MD5 (subversion-1.6.6.tar.bz2) = 5RCdp1bXTH2Y9oPwBKU5rw== +RMD160 (subversion-1.6.6.tar.bz2) = Q8rJW0rPxhjcGjwa7ChOA9fKL7k= +SHA1 (subversion-1.6.6.tar.bz2) = AbA9BGYPpdH3bHQrD4o4vxyhpQc= +SHA256 (subversion-1.6.6.tar.bz2) = /iPBokfepjEEi9Yv0c1hEZJL4olu8tFmJFrJoShMPJI= +SIZE (subversion-1.6.6.tar.bz2) = 5513036 Index: patches/patch-subversion_bindings_swig_ruby_test_test_client_rb =================================================================== RCS file: patches/patch-subversion_bindings_swig_ruby_test_test_client_rb diff -N patches/patch-subversion_bindings_swig_ruby_test_test_client_rb --- patches/patch-subversion_bindings_swig_ruby_test_test_client_rb 25 Aug 2009 10:26:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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) Index: patches/patch-subversion_bindings_swig_ruby_test_test_core_rb =================================================================== RCS file: patches/patch-subversion_bindings_swig_ruby_test_test_core_rb diff -N patches/patch-subversion_bindings_swig_ruby_test_test_core_rb --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-subversion_bindings_swig_ruby_test_test_core_rb 22 Oct 2009 08:48:04 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +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) Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v retrieving revision 1.7 diff -u -p -r1.7 PLIST-main --- pkg/PLIST-main 10 Sep 2009 15:35:04 -0000 1.7 +++ pkg/PLIST-main 21 Oct 2009 20:47:08 -0000 @@ -145,6 +145,11 @@ share/examples/subversion/client-side/sv 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
