On Sat, Mar 20, 2010 at 08:13:10PM +0100, Stefan Sperling wrote:
> This diff updates the Subversion port to 1.6.9.
>
> It also fixes the build on hppa. As reported by landry@, the port was
> running autoconf twice which messed up the build on hppa for some reason.
> Using CONFIGURE_STYLE=gnu causes autoconf to be run only once, in the
> pre-configure target.
>
> Please test / ok.
Apologies, the previous diff wasn't against HEAD.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile 26 Feb 2010 18:21:08 -0000 1.66
+++ Makefile 20 Mar 2010 23:32:46 -0000
@@ -6,16 +6,16 @@ COMMENT-python= python interface to sub
COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-VERSION= 1.6.6
+VERSION= 1.6.9
DISTNAME= subversion-${VERSION}
-PKGNAME-main= ${DISTNAME}p0
-FULLPKGNAME-perl= p5-SVN-${VERSION}p0
+PKGNAME-main= ${DISTNAME}
+FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl
-FULLPKGNAME-python= py-subversion-${VERSION}p0
+FULLPKGNAME-python= py-subversion-${VERSION}
FULLPKGPATH-python= devel/subversion,-python
-FULLPKGNAME-ruby= ruby-subversion-${VERSION}p1
+FULLPKGNAME-ruby= ruby-subversion-${VERSION}
FULLPKGPATH-ruby= devel/subversion,-ruby
-FULLPKGNAME-ap2= ap2-subversion-${VERSION}p0
+FULLPKGNAME-ap2= ap2-subversion-${VERSION}
FULLPKGPATH-ap2= devel/subversion,-ap2
SO_VERSION= 1.2
@@ -153,7 +153,7 @@ MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
# should be 2.63
AUTOCONF_VERSION=2.62
-CONFIGURE_STYLE=autoconf
+CONFIGURE_STYLE=gnu
CONFIGURE_ENV= PYTHON2=${MODPY_BIN}
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-sasl=${LOCALBASE} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo 27 Oct 2009 09:06:13 -0000 1.22
+++ distinfo 20 Mar 2010 18:39:07 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (subversion-1.6.9.tar.bz2) = nDCkex1IZk56/vaLtINMUw==
+RMD160 (subversion-1.6.9.tar.bz2) = XwhcBTZX3I0ASJRCZdvkNokqlPs=
+SHA1 (subversion-1.6.9.tar.bz2) = R3qonmDeeXSsCqkhzDabTCkHaTw=
+SHA256 (subversion-1.6.9.tar.bz2) =
BVJvkvy2Er3DurDV4hjiWEe/EIRuBHziROM4WbIFERw=
+SIZE (subversion-1.6.9.tar.bz2) = 5478554
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
--- patches/patch-subversion_bindings_swig_ruby_test_test_core_rb 27 Oct
2009 09:06:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$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)
