The diff below updates the devel/subversion port to Subversion 1.6.11.
It also changes the configure style to 'gnu' instead of 'autoconf'
to avoid running autoconf twice (autoconf is run by the autogen.sh
script in the pre-configure target). landy@ says this fixes the
build on hppa for some reason.
'make regress' passes for me on i386.
I haven't tested the gnome-keyring flavour since massive gnome
updates are going on, and I'd rather install all the new gnome
dependencies from binary packages once they're ready to avoid
compiling tons of crap.
Please test (especially if you have a system with fresh gnome
ports already installed).
Please Cc me in on-list replies.
Thanks,
Stefan
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 20 Apr 2010 20:23:38 -0000 1.67
+++ Makefile 21 Apr 2010 19:45:52 -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.11
DISTNAME= subversion-${VERSION}
-PKGNAME-main= ${DISTNAME}p1
-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
@@ -28,7 +28,7 @@ SHARED_LIBS+= ${_lib} ${SO_VERSION}
CATEGORIES= devel
-HOMEPAGE= http://subversion.tigris.org/
+HOMEPAGE= http://subversion.apache.org
MAINTAINER= Stefan Sperling <[email protected]>
@@ -38,7 +38,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}/downloads/
+# Subversion 1.6.x tarballs are still hosted at tigris.org, not apache.org
+MASTER_SITES= http://subversion.tigris.org/downloads/
EXTRACT_SUFX= .tar.bz2
PSEUDO_FLAVORS= no_bindings no_ap2
@@ -153,7 +154,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 21 Apr 2010 19:50:36 -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.11.tar.bz2) = dUGRWbUGYQksQTdEmUC1zA==
+RMD160 (subversion-1.6.11.tar.bz2) = +9QWEPEESRaoTDm/eGMy6GTQ5tQ=
+SHA1 (subversion-1.6.11.tar.bz2) = Ns+dOcFOW9jXEzAqx3DDlk/hlrM=
+SHA256 (subversion-1.6.11.tar.bz2) =
ZL0ACuMEcNNDwHJXWL3YKIFDOTMI7txRHHgmu2cx5Zw=
+SIZE (subversion-1.6.11.tar.bz2) = 5486069
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)
