Hello ! I was in need of subversion update to work with 1.5 repos, so i've made one. Status - everything builds and packages just fine, svn client works fine, tested on amd64. However language bindings, need more attention and clean-up. Comments are welcome.
Regards Valery. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/subversion/Makefile,v retrieving revision 1.47 diff -u -p -u -p -r1.47 Makefile --- Makefile 4 Jul 2008 19:57:06 -0000 1.47 +++ Makefile 21 Aug 2008 14:30:37 -0000 @@ -6,19 +6,20 @@ COMMENT-python= python interface to subv COMMENT-ruby= ruby interface to subversion COMMENT-ap2= apache2 subversion modules -VERSION= 1.4.4 +VERSION= 1.5.1 DISTNAME= subversion-${VERSION} PKGNAME= ${DISTNAME} -PKGNAME-main= ${DISTNAME}p0 -PKGNAME-perl= p5-SVN-${VERSION}p1 -PKGNAME-python= py-subversion-${VERSION}p3 -PKGNAME-ruby= ruby-subversion-${VERSION}p4 -PKGNAME-ap2= ap2-subversion-${VERSION}p0 +PKGNAME-main= ${DISTNAME} +PKGNAME-perl= p5-SVN-${VERSION} +PKGNAME-python= py-subversion-${VERSION} +PKGNAME-ruby= ruby-subversion-${VERSION} +PKGNAME-ap2= ap2-subversion-${VERSION} -SO_VERSION= 1.0 +SO_VERSION= 2.0 SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \ - svn_fs_base-1 svn_fs_fs-1 svn_ra-1 svn_ra_dav-1 \ - svn_ra_local-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1 + svn_fs_base-1 svn_fs_fs-1 svn_ra-1 \ + svn_ra_local-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1 \ + svn_fs_util-1 svn_ra_neon-1 .for _lib in ${SVN_LIBS} svn_swig_perl-1 svn_swig_py-1 svn_swig_ruby-1 SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor @@ -102,14 +103,13 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ --with-neon=${LOCALBASE} \ --with-apr=${LOCALBASE} \ --with-apr-util=${LOCALBASE} \ - --with-zlib \ - --without-jdk + --with-zlib=/usr \ + --without-jdk \ + --with-jikes=no .if !${FLAVOR:L:Mno_bindings} -CONFIGURE_ARGS+=--enable-swig-bindings=perl,python,ruby \ - --with-swig=${LOCALBASE} +CONFIGURE_ARGS+= --with-swig=${LOCALBASE} .else -CONFIGURE_ARGS+=--disable-swig-bindings \ - --without-swig +CONFIGURE_ARGS+= --without-swig .endif .if !${FLAVOR:L:Mno_ap2} @@ -181,7 +181,7 @@ post-install: ${PREFIX}/share/examples/subversion/hook-scripts ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/enforcer/* \ ${PREFIX}/share/examples/subversion/hook-scripts/enforcer - ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/check-case-insensitive.* \ + ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/case-insensitive.* \ ${PREFIX}/share/examples/subversion/hook-scripts ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/detect-merge-conflicts.sh \ ${PREFIX}/share/examples/subversion/hook-scripts Index: distinfo =================================================================== RCS file: /cvs/ports/devel/subversion/distinfo,v retrieving revision 1.15 diff -u -p -u -p -r1.15 distinfo --- distinfo 18 Jun 2007 06:34:48 -0000 1.15 +++ distinfo 21 Aug 2008 14:30:37 -0000 @@ -1,5 +1,5 @@ -MD5 (subversion-1.4.4.tar.gz) = cCZV3vpBi6uPaD9iaLT9MA== -RMD160 (subversion-1.4.4.tar.gz) = 6SaR9Ff7B9W9t+S86daNqlKC1Rg= -SHA1 (subversion-1.4.4.tar.gz) = OIGGJM88tsNt+vg4jL5+u0+m0xk= -SHA256 (subversion-1.4.4.tar.gz) = aGvdhki0vCOo8+nGRTueLuwHh2QXbAHcEjBWu7uAN5o= -SIZE (subversion-1.4.4.tar.gz) = 6317457 +MD5 (subversion-1.5.1.tar.gz) = N1M7BDXKqj5OG+NZOJ/LuQ== +RMD160 (subversion-1.5.1.tar.gz) = 3LfDsU4nHuXeXxmYfk9tcfXEUzU= +SHA1 (subversion-1.5.1.tar.gz) = qG0jR5FxOlU9NEbYDhreCOGpy3Y= +SHA256 (subversion-1.5.1.tar.gz) = 6sR9k1UxGAd8mh+HB3lw0DKHhKXKuGuEl8gKTeOOFR8= +SIZE (subversion-1.5.1.tar.gz) = 6627153 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-Makefile_in --- patches/patch-Makefile_in 25 Oct 2007 10:00:03 -0000 1.7 +++ patches/patch-Makefile_in 21 Aug 2008 14:30:37 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: steven $ ---- Makefile.in.orig Thu Aug 24 00:12:43 2006 -+++ Makefile.in Mon Nov 20 15:31:13 2006 -@@ -66,8 +66,8 @@ swig_pl_libdir = @libdir@ +$OpenBSD: patch-Makefile_in,v 1.7 2007/10/25 10:00:03 steven Exp $ +--- Makefile.in.orig Sat Apr 12 01:49:51 2008 ++++ Makefile.in Thu Aug 21 16:49:05 2008 +@@ -68,8 +68,8 @@ swig_pl_libdir = @libdir@ swig_rb_libdir = @libdir@ ### these possibly need further discussion @@ -11,19 +11,19 @@ $OpenBSD: steven $ +swig_pydir_extra = @libdir@/python!!MODPY_VERSION!!/site-packages/svn swig_pldir = @libdir@/svn-perl swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext - -@@ -90,8 +90,8 @@ EXEEXT = @EXEEXT@ + contribdir = @bindir@/svn-contrib +@@ -95,8 +95,8 @@ EXEEXT = @EXEEXT@ SHELL = @SHELL@ LIBTOOL = @SVN_LIBTOOL@ --LTFLAGS = @SVN_LT_CCTAG@ --silent --LTCXXFLAGS = @SVN_LT_CXXTAG@ --silent -+LTFLAGS = @SVN_LT_CCTAG@ -+LTCXXFLAGS = @SVN_LT_CXXTAG@ +-LTFLAGS = --tag=CC --silent +-LTCXXFLAGS = --tag=CXX --silent ++LTFLAGS = --tag=CC ++LTCXXFLAGS = --tag=CXX LT_LDFLAGS = @LT_LDFLAGS@ LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ LT_CXX_LIBADD = @LT_CXX_LIBADD@ -@@ -108,8 +108,8 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@ +@@ -114,8 +114,8 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@ SWIG = @SWIG@ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ @@ -34,7 +34,7 @@ $OpenBSD: steven $ SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ -@@ -196,19 +196,14 @@ INSTALL_JAVAHL_LIB = $(INSTALL_LIB) +@@ -209,19 +209,14 @@ INSTALL_JAVAHL_LIB = $(INSTALL_LIB) # additional installation rules for the SWIG wrappers INSTALL_EXTRA_SWIG_PY=\ @@ -56,7 +56,7 @@ $OpenBSD: steven $ $(PYTHON) -c 'import compileall; \ compileall.compile_dir("$(DESTDIR)$(swig_pydir)", 1, "$(swig_pydir)"); \ compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \ -@@ -234,8 +229,8 @@ INSTALL_EXTRA_JAVAHL_JAVA=\ +@@ -247,8 +242,8 @@ INSTALL_EXTRA_JAVAHL_JAVA=\ [EMAIL PROTECTED]@ INSTALL_EXTRA_SWIG_RB=\ Index: patches/patch-build-outputs_mk =================================================================== RCS file: patches/patch-build-outputs_mk diff -N patches/patch-build-outputs_mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-build-outputs_mk 21 Aug 2008 14:30:38 -0000 @@ -0,0 +1,78 @@ +$OpenBSD$ +--- build-outputs.mk.orig Thu Aug 21 17:04:05 2008 ++++ build-outputs.mk Thu Aug 21 17:11:01 2008 +@@ -1425,58 +1425,58 @@ subversion/bindings/swig/perl/native/svn_wc.lo: subver + $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_wc.c + + subversion/bindings/swig/python/core.lo: subversion/bindings/swig/python/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/core.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/core.c + + subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h + $(COMPILE_SWIG_PY) $(abs_srcdir)/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c + + subversion/bindings/swig/python/svn_client.lo: subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_client.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_client.c + + subversion/bindings/swig/python/svn_delta.lo: subversion/bindings/swig/python/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_delta.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_delta.c + + subversion/bindings/swig/python/svn_diff.lo: subversion/bindings/swig/python/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_diff.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_diff.c + + subversion/bindings/swig/python/svn_fs.lo: subversion/bindings/swig/python/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_fs.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_fs.c + + subversion/bindings/swig/python/svn_ra.lo: subversion/bindings/swig/python/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_ra.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_ra.c + + subversion/bindings/swig/python/svn_repos.lo: subversion/bindings/swig/python/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_repos.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_repos.c + + subversion/bindings/swig/python/svn_wc.lo: subversion/bindings/swig/python/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h +- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_wc.c ++ $(COMPILE_PY_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/python/svn_wc.c + + subversion/bindings/swig/ruby/core.lo: subversion/bindings/swig/ruby/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/core.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/core.c + + subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h + $(COMPILE_SWIG_RB) $(abs_srcdir)/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c + + subversion/bindings/swig/ruby/svn_client.lo: subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_client.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_client.c + + subversion/bindings/swig/ruby/svn_delta.lo: subversion/bindings/swig/ruby/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_delta.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_delta.c + + subversion/bindings/swig/ruby/svn_diff.lo: subversion/bindings/swig/ruby/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_diff.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_diff.c + + subversion/bindings/swig/ruby/svn_fs.lo: subversion/bindings/swig/ruby/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_fs.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_fs.c + + subversion/bindings/swig/ruby/svn_ra.lo: subversion/bindings/swig/ruby/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_ra.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_ra.c + + subversion/bindings/swig/ruby/svn_repos.lo: subversion/bindings/swig/ruby/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_repos.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_repos.c + + subversion/bindings/swig/ruby/svn_wc.lo: subversion/bindings/swig/ruby/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h +- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_wc.c ++ $(COMPILE_RB_WRAPPER) $(abs_srcdir)/subversion/bindings/swig/ruby/svn_wc.c + + subversion/libsvn_client/add.lo: subversion/libsvn_client/add.c subversion/include/svn_auth.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h + Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/devel/subversion/patches/patch-configure,v retrieving revision 1.9 diff -u -p -u -p -r1.9 patch-configure --- patches/patch-configure 25 Oct 2007 10:00:03 -0000 1.9 +++ patches/patch-configure 21 Aug 2008 14:30:38 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: steven $ ---- configure.orig Wed May 30 02:49:24 2007 -+++ configure Mon Jun 11 08:38:35 2007 -@@ -3012,7 +3012,7 @@ if test "$INSTALL" = "build/install-sh -c"; then +$OpenBSD: patch-configure,v 1.9 2007/10/25 10:00:03 steven Exp $ +--- configure.orig Thu Jul 24 08:39:59 2008 ++++ configure Thu Aug 21 16:56:54 2008 +@@ -3814,7 +3814,7 @@ if test "$INSTALL" = "build/install-sh -c"; then INSTALL="$abs_srcdir/$INSTALL" fi @@ -10,30 +10,12 @@ $OpenBSD: steven $ -@@ -20630,7 +20630,7 @@ rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_cv_search_bindtextdomain" = no; then - for ac_lib in intl; do -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ LIBS="-l$ac_lib -liconv $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20675,7 +20675,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_search_bindtextdomain="-l$ac_lib" -+ ac_cv_search_bindtextdomain="-l$ac_lib -liconv" - break - else - echo "$as_me: failed program was:" >&5 -@@ -21964,7 +21964,7 @@ fi; +@@ -24240,7 +24240,7 @@ fi # Python: Used for testsuite, and bindings -PYTHON="`$abs_srcdir/build/find_python.sh`" -+PYTHON="python!!MODPY_VERSION!!" ++PYTHON="python2.5" if test -z "$PYTHON"; then - { echo "$as_me:$LINENO: WARNING: Python 2.0 or later is required to run the testsuite" >&5 - echo "$as_me: WARNING: Python 2.0 or later is required to run the testsuite" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python 2.2 or later is required to run the testsuite" >&5 + $as_echo "$as_me: WARNING: Python 2.2 or later is required to run the testsuite" >&2;} Index: patches/patch-subversion_bindings_swig_perl_native_Core_pm =================================================================== RCS file: patches/patch-subversion_bindings_swig_perl_native_Core_pm diff -N patches/patch-subversion_bindings_swig_perl_native_Core_pm --- patches/patch-subversion_bindings_swig_perl_native_Core_pm 30 Sep 2006 06:23:58 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: steven $ ---- subversion/bindings/swig/perl/native/Core.pm.orig Thu Sep 21 16:04:11 2006 -+++ subversion/bindings/swig/perl/native/Core.pm Thu Sep 21 16:12:24 2006 -@@ -50,7 +50,8 @@ BEGIN { - SVN::_Core::apr_initialize(); - } - --our $gpool = SVN::Pool->new_default; -+my $gpool = SVN::Pool->new_default; -+sub gpool { $gpool } # holding the reference to gpool - SVN::Core::utf_initialize($gpool); - - END { -@@ -404,9 +405,13 @@ sub _wrap { - $npool; - } - -+use Scalar::Util 'reftype'; -+ - sub DESTROY { - return if $globaldestroy; - my $self = shift; -+ # for some reason, REF becomes SCALAR in perl -c or after apr_terminate -+ return if reftype($self) eq 'SCALAR'; - if ($$self eq $SVN::_Core::current_pool) { - $SVN::_Core::current_pool = pop @POOLSTACK; - } Index: patches/patch-subversion_bindings_swig_perl_native_Ra_pm =================================================================== RCS file: patches/patch-subversion_bindings_swig_perl_native_Ra_pm diff -N patches/patch-subversion_bindings_swig_perl_native_Ra_pm --- patches/patch-subversion_bindings_swig_perl_native_Ra_pm 18 Jun 2007 06:34:48 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: steven $ ---- subversion/bindings/swig/perl/native/Ra.pm.orig Fri Jun 17 11:14:04 2005 -+++ subversion/bindings/swig/perl/native/Ra.pm Mon Jun 11 08:38:35 2007 -@@ -64,7 +64,7 @@ objects, with the session_baton and pool omitted. - - require SVN::Client; - --my $ralib = SVN::_Ra::svn_ra_init_ra_libs($SVN::Core::gpool); -+my $ralib = SVN::_Ra::svn_ra_init_ra_libs(SVN::Core->gpool); - - # Ra methods that returns reporter - my %reporter = map { $_ => 1 } qw(do_diff do_switch do_status do_update); Index: pkg/PFRAG.shared-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PFRAG.shared-main,v retrieving revision 1.1 diff -u -p -u -p -r1.1 PFRAG.shared-main --- pkg/PFRAG.shared-main 24 Nov 2006 19:52:53 -0000 1.1 +++ pkg/PFRAG.shared-main 21 Aug 2008 14:30:38 -0000 @@ -1,4 +1,4 @@ [EMAIL PROTECTED] $OpenBSD: steven $ [EMAIL PROTECTED] $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/24 19:52:53 steven Exp $ @lib lib/libsvn_client-1.so.${LIBsvn_client-1_VERSION} @lib lib/libsvn_delta-1.so.${LIBsvn_delta-1_VERSION} @lib lib/libsvn_diff-1.so.${LIBsvn_diff-1_VERSION} @@ -6,7 +6,6 @@ @lib lib/libsvn_fs_base-1.so.${LIBsvn_fs_base-1_VERSION} @lib lib/libsvn_fs_fs-1.so.${LIBsvn_fs_fs-1_VERSION} @lib lib/libsvn_ra-1.so.${LIBsvn_ra-1_VERSION} [EMAIL PROTECTED] lib/libsvn_ra_dav-1.so.${LIBsvn_ra_dav-1_VERSION} @lib lib/libsvn_ra_local-1.so.${LIBsvn_ra_local-1_VERSION} @lib lib/libsvn_ra_svn-1.so.${LIBsvn_ra_svn-1_VERSION} @lib lib/libsvn_repos-1.so.${LIBsvn_repos-1_VERSION} Index: pkg/PFRAG.shared-ruby =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PFRAG.shared-ruby,v retrieving revision 1.1 diff -u -p -u -p -r1.1 PFRAG.shared-ruby --- pkg/PFRAG.shared-ruby 29 Nov 2006 08:52:39 -0000 1.1 +++ pkg/PFRAG.shared-ruby 21 Aug 2008 14:30:38 -0000 @@ -1,11 +1,2 @@ [EMAIL PROTECTED] $OpenBSD: msf $ [EMAIL PROTECTED] $OpenBSD: PFRAG.shared-ruby,v 1.1 2006/11/29 08:52:39 msf Exp $ @lib lib/libsvn_swig_ruby-1.so.${LIBsvn_swig_ruby-1_VERSION} -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.so -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.so -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.so -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.so -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.so -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.so -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.so Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST-main --- pkg/PLIST-main 15 Feb 2007 10:25:17 -0000 1.2 +++ pkg/PLIST-main 21 Aug 2008 14:30:38 -0000 @@ -1,21 +1,23 @@ [EMAIL PROTECTED] $OpenBSD: dlg $ [EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.2 2007/02/15 10:25:17 dlg Exp $ @pkgpath devel/subversion,no_bindings @pkgpath devel/subversion %%SHARED%% -bin/svn -bin/svnadmin -bin/svndumpfilter -bin/svnlook -bin/svnserve -bin/svnsync -bin/svnversion [EMAIL PROTECTED] bin/svn [EMAIL PROTECTED] bin/svnadmin [EMAIL PROTECTED] bin/svndumpfilter [EMAIL PROTECTED] bin/svnlook [EMAIL PROTECTED] bin/svnserve [EMAIL PROTECTED] bin/svnsync [EMAIL PROTECTED] bin/svnversion include/subversion-1/ +include/subversion-1/mod_authz_svn.h 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_client.h include/subversion-1/svn_cmdline.h +include/subversion-1/svn_compat.h include/subversion-1/svn_config.h include/subversion-1/svn_ctype.h include/subversion-1/svn_dav.h @@ -27,7 +29,9 @@ include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h +include/subversion-1/svn_iter.h include/subversion-1/svn_md5.h +include/subversion-1/svn_mergeinfo.h include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h @@ -47,6 +51,7 @@ include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h +lib/apache2/ lib/libsvn_client-1.a lib/libsvn_client-1.la lib/libsvn_delta-1.a @@ -59,12 +64,16 @@ lib/libsvn_fs_base-1.a lib/libsvn_fs_base-1.la lib/libsvn_fs_fs-1.a lib/libsvn_fs_fs-1.la +lib/libsvn_fs_util-1.a +lib/libsvn_fs_util-1.la [EMAIL PROTECTED] lib/libsvn_fs_util-1.so.${LIBsvn_fs_util-1_VERSION} lib/libsvn_ra-1.a lib/libsvn_ra-1.la -lib/libsvn_ra_dav-1.a -lib/libsvn_ra_dav-1.la lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la +lib/libsvn_ra_neon-1.a +lib/libsvn_ra_neon-1.la [EMAIL PROTECTED] lib/libsvn_ra_neon-1.so.${LIBsvn_ra_neon-1_VERSION} lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la lib/libsvn_repos-1.a @@ -91,8 +100,7 @@ share/examples/subversion/config @sample ${SYSCONFDIR}/subversion/config share/examples/subversion/hook-scripts/ share/examples/subversion/hook-scripts/README -share/examples/subversion/hook-scripts/check-case-insensitive.pl -share/examples/subversion/hook-scripts/check-case-insensitive.py +share/examples/subversion/hook-scripts/case-insensitive.py 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-email.pl @@ -110,17 +118,6 @@ share/examples/subversion/hook-scripts/m 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/locale/de/LC_MESSAGES/subversion.mo -share/locale/es/LC_MESSAGES/subversion.mo -share/locale/fr/LC_MESSAGES/subversion.mo -share/locale/it/LC_MESSAGES/subversion.mo -share/locale/ja/LC_MESSAGES/subversion.mo -share/locale/ko/LC_MESSAGES/subversion.mo -share/locale/nb/LC_MESSAGES/subversion.mo -share/locale/pl/LC_MESSAGES/subversion.mo -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 Index: pkg/PLIST-python =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-python,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST-python --- pkg/PLIST-python 25 Oct 2007 10:00:03 -0000 1.4 +++ pkg/PLIST-python 21 Aug 2008 14:30:38 -0000 @@ -1,7 +1,8 @@ [EMAIL PROTECTED] $OpenBSD: steven $ [EMAIL PROTECTED] $OpenBSD: PLIST-python,v 1.4 2007/10/25 10:00:03 steven Exp $ %%SHARED%% lib/libsvn_swig_py-1.a lib/libsvn_swig_py-1.la +lib/python${MODPY_VERSION}/ lib/python${MODPY_VERSION}/site-packages/libsvn/ lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.py lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.pyc @@ -50,3 +51,11 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/svn/repos.pyc lib/python${MODPY_VERSION}/site-packages/svn/wc.py lib/python${MODPY_VERSION}/site-packages/svn/wc.pyc +lib/python${MODPY_VERSION}/site-packages/ +lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.a +lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.la +lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.so +lib/python${MODPY_VERSION}/site-packages/libsvn/diff.py +lib/python${MODPY_VERSION}/site-packages/libsvn/diff.pyc +lib/python${MODPY_VERSION}/site-packages/svn/diff.py +lib/python${MODPY_VERSION}/site-packages/svn/diff.pyc Index: pkg/PLIST-ruby =================================================================== RCS file: /cvs/ports/devel/subversion/pkg/PLIST-ruby,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST-ruby --- pkg/PLIST-ruby 18 Jun 2007 06:34:48 -0000 1.3 +++ pkg/PLIST-ruby 21 Aug 2008 14:30:38 -0000 @@ -1,29 +1,44 @@ [EMAIL PROTECTED] $OpenBSD: steven $ [EMAIL PROTECTED] $OpenBSD: PLIST-ruby,v 1.3 2007/06/18 06:34:48 steven Exp $ %%SHARED%% lib/libsvn_swig_ruby-1.a lib/libsvn_swig_ruby-1.la -lib/ruby/site_ruby/${MODRUBY_REV}/svn/ -lib/ruby/site_ruby/${MODRUBY_REV}/svn/client.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/core.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/delta.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/error.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/fs.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/info.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/ra.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/repos.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/util.rb -lib/ruby/site_ruby/${MODRUBY_REV}/svn/wc.rb -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.la -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.la -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/delta.la -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/fs.la -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/ra.la -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.la -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.a -lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.la +lib/ruby/ +lib/ruby/site_ruby/ +lib/ruby/site_ruby/svn/ +lib/ruby/site_ruby/svn/client.rb +lib/ruby/site_ruby/svn/commit-mailer.rb +lib/ruby/site_ruby/svn/core.rb +lib/ruby/site_ruby/svn/delta.rb +lib/ruby/site_ruby/svn/error.rb +lib/ruby/site_ruby/svn/fs.rb +lib/ruby/site_ruby/svn/info.rb +lib/ruby/site_ruby/svn/ra.rb +lib/ruby/site_ruby/svn/repos.rb +lib/ruby/site_ruby/svn/synchronizer.rb +lib/ruby/site_ruby/svn/util.rb +lib/ruby/site_ruby/svn/wc.rb +lib/ruby/site_ruby/svn/ext/ +lib/ruby/site_ruby/svn/ext/client.a +lib/ruby/site_ruby/svn/ext/client.la +lib/ruby/site_ruby/svn/ext/client.so +lib/ruby/site_ruby/svn/ext/core.a +lib/ruby/site_ruby/svn/ext/core.la +lib/ruby/site_ruby/svn/ext/core.so +lib/ruby/site_ruby/svn/ext/delta.a +lib/ruby/site_ruby/svn/ext/delta.la +lib/ruby/site_ruby/svn/ext/delta.so +lib/ruby/site_ruby/svn/ext/diff.a +lib/ruby/site_ruby/svn/ext/diff.la +lib/ruby/site_ruby/svn/ext/diff.so +lib/ruby/site_ruby/svn/ext/fs.a +lib/ruby/site_ruby/svn/ext/fs.la +lib/ruby/site_ruby/svn/ext/fs.so +lib/ruby/site_ruby/svn/ext/ra.a +lib/ruby/site_ruby/svn/ext/ra.la +lib/ruby/site_ruby/svn/ext/ra.so +lib/ruby/site_ruby/svn/ext/repos.a +lib/ruby/site_ruby/svn/ext/repos.la +lib/ruby/site_ruby/svn/ext/repos.so +lib/ruby/site_ruby/svn/ext/wc.a +lib/ruby/site_ruby/svn/ext/wc.la +lib/ruby/site_ruby/svn/ext/wc.so