On Monday 25 September 2006 18:30, Sigfred Håversen wrote:
> Attached an update of devel/subversion to 1.4.0 that is tested on Alpha and
> Sparc64.
>
> Note: There are changes in working copy format as well as in the repository
> format. See http://subversion.tigris.org/svn_1.4_releasenotes.html for
> details.
With alpha now using gcc3, the *_main_c patches are no longer needed. Attached
a new diff. Please test.
/Sigfred
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 18 Sep 2006 11:50:39 -0000 1.23
+++ Makefile 29 Sep 2006 16:15:28 -0000
@@ -1,28 +1,21 @@
-# $OpenBSD: Makefile,v 1.23 2006/09/18 11:50:39 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2006/08/21 17:39:00 aanriot Exp $
COMMENT= "subversion revision control system"
COMMENT-perl= "perl interface to subversion"
COMMENT-python= "python interface to subversion"
-VERSION= 1.3.2
+VERSION= 1.4.0
DISTNAME= subversion-${VERSION}
-PKGNAME-perl= p5-SVN-${VERSION}p0
+PKGNAME-perl= p5-SVN-${VERSION}
PKGNAME-python= py-subversion-${VERSION}
-SHARED_LIBS= svn_client-1 0.0 \
- svn_delta-1 0.0 \
- svn_diff-1 0.0 \
- svn_fs-1 0.0 \
- svn_fs_base-1 0.0 \
- svn_fs_fs-1 0.0 \
- svn_ra-1 0.0 \
- svn_ra_dav-1 0.0 \
- svn_ra_local-1 0.0 \
- svn_ra_svn-1 0.0 \
- svn_repos-1 0.0 \
- svn_subr-1 0.0 \
- svn_swig_perl-1 0.0 \
- svn_swig_py-1 0.0 \
- svn_wc-1 0.0
+
+SO_VERSION= 1.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
+.for _lib in ${SVN_LIBS} svn_swig_perl-1 svn_swig_py-1
+SHARED_LIBS+= ${_lib} ${SO_VERSION}
+.endfor
CATEGORIES= devel
@@ -57,13 +50,18 @@
. if defined(PACKAGING) && !empty(SUBPACKAGE)
SHARED_ONLY= Yes
-LIB_DEPENDS= svn_diff-1,svn_ra-1,svn_delta-1,svn_subr-1,svn_fs-1,svn_repos-1,svn_wc-1,svn_client-1::devel/subversion \
- expat.>=4::textproc/expat
+LIB_DEPENDS= expat.>=4::textproc/expat
+. for _lib in svn_diff-1 svn_ra-1 svn_delta-1 svn_subr-1 svn_fs-1 \
+ svn_repos-1 svn_wc-1 svn_client-1
+LIB_DEPENDS+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion
+. endfor
WANTLIB+= aprutil-1
. if ${SUBPACKAGE} == "-python"
RUN_DEPENDS+= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
-LIB_DEPENDS+= svn_diff-1,svn_ra-1,svn_delta-1,svn_subr-1,svn_fs-1,svn_repos-1,svn_wc-1,svn_client-1,svn_fs_fs-1,svn_ra_svn-1,svn_ra_local-1,svn_fs_base-1,svn_ra_dav-1::devel/subversion
+. for _lib in ${SVN_LIBS}
+LIB_DEPENDS+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion
+. endfor
LIB_DEPENDS+= python${PYTHON_VER}:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
WANTLIB+= neon xml2 m ssl crypto
. endif
@@ -83,7 +81,7 @@
SEPARATE_BUILD= simple
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= PYTHON2=${LOCALBASE}/bin/python${PYTHON_VER}
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
+CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-neon=${LOCALBASE} \
--with-apr=${LOCALBASE} \
--with-apr-util=${LOCALBASE} \
@@ -141,17 +139,28 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts
${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
${INSTALL_DATA} ${WRKBUILD}/tools/backup/hot-backup.py \
${PREFIX}/share/examples/subversion/backup
+ ${INSTALL_DATA} ${WRKSRC}/tools/server-side/svn-backup-dumps.py \
+ ${PREFIX}/share/examples/subversion/backup
${INSTALL_DATA} ${WRKSRC}/contrib/server-side/svn-fast-backup \
${PREFIX}/share/examples/subversion/backup/svn-fast-backup
${INSTALL_DATA} ${WRKBUILD}/tools/hook-scripts/* \
${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.* \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/detect-merge-conflicts.sh \
+ ${PREFIX}/share/examples/subversion/hook-scripts
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/README \
${PREFIX}/share/examples/subversion/hook-scripts
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-access-control.cfg.example \
${PREFIX}/share/examples/subversion/hook-scripts
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.rb \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/log-police.py \
${PREFIX}/share/examples/subversion/hook-scripts
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.conf.example \
${PREFIX}/share/examples/subversion/hook-scripts
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 15 Jul 2006 16:55:32 -0000 1.10
+++ distinfo 29 Sep 2006 16:15:28 -0000
@@ -1,4 +1,4 @@
-MD5 (subversion-1.3.2.tar.gz) = f790c49c219b4196e37ebfa71ab797d5
-RMD160 (subversion-1.3.2.tar.gz) = 4209f361fe7d8717bbba75717d41731f7b0143f4
-SHA1 (subversion-1.3.2.tar.gz) = d69267231b5cbfbff4b1603a6a8f1e879ca5753e
-SIZE (subversion-1.3.2.tar.gz) = 8803719
+MD5 (subversion-1.4.0.tar.gz) = 6f7485986776204138a1d221ac5eec40
+RMD160 (subversion-1.4.0.tar.gz) = 7a868b4fe6338ccdb93916afffbe8e2692450039
+SHA1 (subversion-1.4.0.tar.gz) = fcea8ab76d6d6b3d532d921b94c312ca7fdc9f81
+SIZE (subversion-1.4.0.tar.gz) = 6268503
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 15 Apr 2006 10:27:38 -0000 1.4
+++ patches/patch-Makefile_in 29 Sep 2006 16:15:28 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2006/04/15 10:27:38 steven Exp $
---- Makefile.in.orig Wed Nov 16 01:56:15 2005
-+++ Makefile.in Wed Apr 5 20:10:11 2006
+$OpenBSD$
+--- Makefile.in.orig Sat Jul 15 01:24:31 2006
++++ Makefile.in Sat Jul 15 01:28:07 2006
@@ -66,8 +66,8 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
@@ -12,7 +12,7 @@
swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
-@@ -94,8 +94,8 @@ EXEEXT = @EXEEXT@
+@@ -90,8 +90,8 @@ EXEEXT = @EXEEXT@
SHELL = @SHELL@
LIBTOOL = @SVN_LIBTOOL@
@@ -23,8 +23,8 @@
LT_LDFLAGS = @LT_LDFLAGS@
LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
LT_CXX_LIBADD = @LT_CXX_LIBADD@
-@@ -116,8 +116,8 @@ SWIG_INCLUDES = -I$(SWIG_BUILD_DIR) \
- $(SVN_APR_INCLUDES) $(SVN_APRUTIL_INCLUDES)
+@@ -108,8 +108,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@
-SWIG_PY_LINK = @SWIG_PY_LINK@
@@ -34,3 +34,25 @@
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)
+
+ # additional installation rules for the SWIG wrappers
+ INSTALL_EXTRA_SWIG_PY=\
+- $(MKDIR) $(DESTDIR)$(swig_pydir); \
+- $(MKDIR) $(DESTDIR)$(swig_pydir_extra); \
++ $(INSTALL) -d $(DESTDIR)$(swig_pydir); \
++ $(INSTALL) -d $(DESTDIR)$(swig_pydir_extra); \
+ for i in $(abs_srcdir)/subversion/bindings/swig/python/svn/*.py; do \
+ $(INSTALL_DATA) "$$i" $(DESTDIR)$(swig_pydir_extra); \
+ done; \
+ for i in $(abs_srcdir)/subversion/bindings/swig/python/*.py; do \
+ $(INSTALL_DATA) "$$i" $(DESTDIR)$(swig_pydir); \
+ done; \
+- if test "$(abs_srcdir)" != "$(abs_builddir)"; then \
+- for i in $(abs_builddir)/subversion/bindings/swig/python/*.py; do \
+- $(INSTALL_DATA) "$$i" $(DESTDIR)$(swig_pydir); \
+- done; \
+- fi; \
+ $(PYTHON) -c 'import compileall; \
+ compileall.compile_dir("$(DESTDIR)$(swig_pydir)", 1, "$(swig_pydir)"); \
+ compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \
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 29 Sep 2006 16:15:28 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- build-outputs.mk.orig Sun Sep 10 17:20:54 2006
++++ build-outputs.mk Sun Sep 10 17:21:44 2006
+@@ -32,7 +32,7 @@ TEST_DEPS = subversion/tests/libsvn_subr
+
+ TEST_PROGRAMS = subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_wc/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/target-test.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/utf8_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/authz_tests.py
+
+-MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnversion/svnsync.1 subversion/svnversion/svnversion.1
++MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1
+
+ CLEAN_FILES = contrib/client-side/mucc$(EXEEXT) contrib/client-side/svn-push/svn-push$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/translate-test$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT)
+
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-configure,v
retrieving revision 1.5
diff -u -r1.5 patch-configure
--- patches/patch-configure 15 Apr 2006 10:27:38 -0000 1.5
+++ patches/patch-configure 29 Sep 2006 16:15:28 -0000
@@ -1,16 +1,25 @@
-$OpenBSD: patch-configure,v 1.5 2006/04/15 10:27:38 steven Exp $
---- configure.orig Sat Mar 25 03:00:55 2006
-+++ configure Sun Mar 26 13:14:07 2006
-@@ -21025,7 +21025,7 @@ rm -f conftest.err conftest.$ac_objext \
+$OpenBSD$
+--- configure.orig Sat Jul 15 20:55:11 2006
++++ configure Sat Jul 15 21:00:22 2006
+@@ -3012,7 +3012,7 @@ if test "$INSTALL" = "build/install-sh -
+ INSTALL="$abs_srcdir/$INSTALL"
+ fi
+
+-MKDIR="$INSTALL -d"
++MKDIR="/bin/mkdir -p"
+
+
+
+@@ -20609,7 +20609,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"
++ LIBS="-l$ac_lib -liconv $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21070,7 +21070,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20654,7 +20654,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19,7 +28,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -22392,7 +22392,7 @@ _ACEOF
+@@ -21943,7 +21943,7 @@ fi;
# Python: Used for testsuite, and bindings
Index: patches/patch-subversion_bindings_swig_perl_native_Core_pm
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-subversion_bindings_swig_perl_native_Core_pm,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_bindings_swig_perl_native_Core_pm
--- patches/patch-subversion_bindings_swig_perl_native_Core_pm 21 Aug 2006 17:39:00 -0000 1.1
+++ patches/patch-subversion_bindings_swig_perl_native_Core_pm 29 Sep 2006 16:15:28 -0000
@@ -1,13 +1,27 @@
-$OpenBSD: patch-subversion_bindings_swig_perl_native_Core_pm,v 1.1 2006/08/21 17:39:00 aanriot Exp $
---- subversion/bindings/swig/perl/native/Core.pm.orig Mon Aug 14 15:23:49 2006
-+++ subversion/bindings/swig/perl/native/Core.pm Mon Aug 14 15:23:57 2006
-@@ -50,9 +50,6 @@ BEGIN {
+$OpenBSD$
+--- 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;
--SVN::Core::utf_initialize($gpool);
--
++my $gpool = SVN::Pool->new_default;
++sub gpool { $gpool } # holding the reference to gpool
+ SVN::Core::utf_initialize($gpool);
+
END {
- SVN::_Core::apr_terminate();
+@@ -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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-subversion_bindings_swig_perl_native_Ra_pm 29 Sep 2006 16:15:28 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- subversion/bindings/swig/perl/native/Ra.pm.orig Thu Sep 21 16:04:27 2006
++++ subversion/bindings/swig/perl/native/Ra.pm Thu Sep 21 16:07:55 2006
+@@ -64,7 +64,7 @@ objects, with the session_baton and pool
+
+ 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: patches/patch-subversion_clients_cmdline_main_c
===================================================================
RCS file: patches/patch-subversion_clients_cmdline_main_c
diff -N patches/patch-subversion_clients_cmdline_main_c
--- patches/patch-subversion_clients_cmdline_main_c 27 Jan 2006 10:20:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-subversion_clients_cmdline_main_c,v 1.2 2006/01/27 10:20:56 alek Exp $
---- subversion/clients/cmdline/main.c.orig Sun Jan 8 14:06:11 2006
-+++ subversion/clients/cmdline/main.c Sun Jan 8 14:06:43 2006
-@@ -769,7 +769,7 @@ const svn_opt_subcommand_desc_t svn_cl__
- static svn_error_t *
- check_lib_versions (void)
- {
-- static const svn_version_checklist_t checklist[] =
-+ static svn_version_checklist_t checklist[] =
- {
- { "svn_subr", svn_subr_version },
- { "svn_client", svn_client_version },
Index: patches/patch-subversion_svnadmin_main_c
===================================================================
RCS file: patches/patch-subversion_svnadmin_main_c
diff -N patches/patch-subversion_svnadmin_main_c
--- patches/patch-subversion_svnadmin_main_c 27 Jan 2006 10:20:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-subversion_svnadmin_main_c,v 1.2 2006/01/27 10:20:56 alek Exp $
---- subversion/svnadmin/main.c.orig Sun Jan 8 14:07:39 2006
-+++ subversion/svnadmin/main.c Sun Jan 8 14:07:52 2006
-@@ -161,7 +161,7 @@ open_repos (svn_repos_t **repos,
- static svn_error_t *
- check_lib_versions (void)
- {
-- static const svn_version_checklist_t checklist[] =
-+ static svn_version_checklist_t checklist[] =
- {
- { "svn_subr", svn_subr_version },
- { "svn_repos", svn_repos_version },
Index: patches/patch-subversion_svndumpfilter_main_c
===================================================================
RCS file: patches/patch-subversion_svndumpfilter_main_c
diff -N patches/patch-subversion_svndumpfilter_main_c
--- patches/patch-subversion_svndumpfilter_main_c 27 Jan 2006 10:20:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-subversion_svndumpfilter_main_c,v 1.2 2006/01/27 10:20:56 alek Exp $
---- subversion/svndumpfilter/main.c.orig Sun Jan 8 14:08:21 2006
-+++ subversion/svndumpfilter/main.c Sun Jan 8 14:09:18 2006
-@@ -906,7 +906,7 @@ subcommand_help (apr_getopt_t *os, void
- static svn_error_t *
- check_lib_versions (void)
- {
-- static const svn_version_checklist_t checklist[] =
-+ static svn_version_checklist_t checklist[] =
- {
- { "svn_subr", svn_subr_version },
- { "svn_repos", svn_repos_version },
Index: patches/patch-subversion_svnlook_main_c
===================================================================
RCS file: patches/patch-subversion_svnlook_main_c
diff -N patches/patch-subversion_svnlook_main_c
--- patches/patch-subversion_svnlook_main_c 27 Jan 2006 10:20:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-subversion_svnlook_main_c,v 1.2 2006/01/27 10:20:56 alek Exp $
---- subversion/svnlook/main.c.orig Sun Jan 8 14:09:43 2006
-+++ subversion/svnlook/main.c Sun Jan 8 14:10:32 2006
-@@ -297,7 +297,7 @@ check_cancel (void *baton)
- static svn_error_t *
- check_lib_versions (void)
- {
-- static const svn_version_checklist_t checklist[] =
-+ static svn_version_checklist_t checklist[] =
- {
- { "svn_subr", svn_subr_version },
- { "svn_repos", svn_repos_version },
Index: patches/patch-subversion_svnserve_main_c
===================================================================
RCS file: patches/patch-subversion_svnserve_main_c
diff -N patches/patch-subversion_svnserve_main_c
--- patches/patch-subversion_svnserve_main_c 27 Jan 2006 10:20:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-subversion_svnserve_main_c,v 1.2 2006/01/27 10:20:56 alek Exp $
---- subversion/svnserve/main.c.orig Sun Jan 8 14:11:28 2006
-+++ subversion/svnserve/main.c Sun Jan 8 14:13:38 2006
-@@ -215,7 +215,7 @@ static void * APR_THREAD_FUNC serve_thre
- static svn_error_t *
- check_lib_versions(void)
- {
-- static const svn_version_checklist_t checklist[] =
-+ static svn_version_checklist_t checklist[] =
- {
- { "svn_subr", svn_subr_version },
- { "svn_repos", svn_repos_version },
Index: patches/patch-subversion_svnversion_main_c
===================================================================
RCS file: patches/patch-subversion_svnversion_main_c
diff -N patches/patch-subversion_svnversion_main_c
--- patches/patch-subversion_svnversion_main_c 27 Jan 2006 10:20:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-subversion_svnversion_main_c,v 1.2 2006/01/27 10:20:56 alek Exp $
---- subversion/svnversion/main.c.orig Sun Jan 8 14:14:17 2006
-+++ subversion/svnversion/main.c Sun Jan 8 14:14:28 2006
-@@ -141,7 +141,7 @@ help(const apr_getopt_option_t *options,
- static svn_error_t *
- check_lib_versions (void)
- {
-- static const svn_version_checklist_t checklist[] =
-+ static svn_version_checklist_t checklist[] =
- {
- { "svn_subr", svn_subr_version },
- { "svn_client", svn_client_version },
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 15 Jul 2006 16:55:32 -0000 1.7
+++ pkg/PLIST 29 Sep 2006 16:15:28 -0000
@@ -6,6 +6,7 @@
bin/svndumpfilter
bin/svnlook
bin/svnserve
+bin/svnsync
bin/svnversion
include/subversion-1/
include/subversion-1/mod_dav_svn.h
@@ -19,6 +20,7 @@
include/subversion-1/svn_dav.h
include/subversion-1/svn_delta.h
include/subversion-1/svn_diff.h
+include/subversion-1/svn_dso.h
include/subversion-1/svn_error.h
include/subversion-1/svn_error_codes.h
include/subversion-1/svn_fs.h
@@ -39,6 +41,7 @@
include/subversion-1/svn_subst.h
include/subversion-1/svn_time.h
include/subversion-1/svn_types.h
+include/subversion-1/svn_user.h
include/subversion-1/svn_utf.h
include/subversion-1/svn_version.h
include/subversion-1/svn_wc.h
@@ -73,19 +76,28 @@
@man man/man1/svnadmin.1
@man man/man1/svndumpfilter.1
@man man/man1/svnlook.1
[EMAIL PROTECTED] man/man1/svnsync.1
@man man/man1/svnversion.1
@man man/man5/svnserve.conf.5
@man man/man8/svnserve.8
share/examples/subversion/
share/examples/subversion/backup/
share/examples/subversion/backup/hot-backup.py
+share/examples/subversion/backup/svn-backup-dumps.py
share/examples/subversion/backup/svn-fast-backup
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/commit-access-control.cfg.example
share/examples/subversion/hook-scripts/commit-access-control.pl
share/examples/subversion/hook-scripts/commit-email.pl
share/examples/subversion/hook-scripts/commit-email.rb
+share/examples/subversion/hook-scripts/detect-merge-conflicts.sh
+share/examples/subversion/hook-scripts/enforcer/
+share/examples/subversion/hook-scripts/enforcer/enforcer
+share/examples/subversion/hook-scripts/enforcer/enforcer.conf
+share/examples/subversion/hook-scripts/log-police.py
share/examples/subversion/hook-scripts/mailer/
share/examples/subversion/hook-scripts/mailer/mailer.conf.example
share/examples/subversion/hook-scripts/mailer/mailer.py
@@ -94,7 +106,6 @@
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/propchange-email.pl
share/examples/subversion/hook-scripts/svnperms.conf.example
share/examples/subversion/hook-scripts/svnperms.py
share/locale/de/LC_MESSAGES/subversion.mo
