Valery Masiutsin [2008-08-26, 09:55:23]:
> Hello
>
> > The bindings tests pass for you?
> >
> > Do you see any errors like I described here?
> > http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142053
> >
> It takes long for tests to pass even on fast amd64, have had no chance
> to check all tests yesterday,
> i've just started with fixing first failed ones and went through as
> much as time allowed.
>
> > I'd rather not use SEPARATE_BUILD, if not using it means
> > less patches to maintain.
>
> I dont think that m4 macroses and python build scripts
> will be changing much between minor releases, so i am fine with that.
>
> > Also, Valery, if you want to pick up maintainership for this port
> > (i.e. maintain it in the long term), please feel free to do so.
> > I put my name into MAINTAINER in my patch mostly because the CVS logs
> > show timeouts by the old maintainer (Sigfried, in Cc), and because I
> > felt sort of obligated to keep maintaining the port if no one else
> > wants it (being one of the few people who are Subversion developers
> > and OpenBSD users at the same time).
>
> > So I would be glad if you took official maintenance for this port.
> > I will be around to help wherever and whenever I can, of course :)
> > But if this is too much of a burden for you (or if it turns out to
> > be at some point), I can take the port and keep updating it, no problem.
> >
> > Since Sigfried has not been doing active maintenance of the port for
> > some time, I expect we can assume that he is fine with handing
> > maintainership over to someone else.
> >
> > Also note that 1.5.2 is due being rolled on Wednesday, and should be
> > released on the following weekend if things go as planned.
> Ugh :\ , i will adapt patches to the fresh release. I think that svn
> is quite popular version
> control system, so it can be maintained by ports@, but i dont have
> objections against maintaining it.
>
> Lets wait for steven@ and other developer opinions.
Here is a diff for 1.5.2. Haven't tested it yet beyond building...
It picks up cyrus sasl if installed, should we enable that by default?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 4 Jul 2008 19:57:06 -0000 1.47
+++ Makefile 2 Sep 2008 07:25:25 -0000
@@ -6,19 +6,20 @@
COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-VERSION= 1.4.4
+VERSION= 1.5.2
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= 1.1
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
@@ -56,7 +57,7 @@
MULTI_PACKAGES+= -ap2
WANTLIB-ap2= ${WANTLIB} iconv aprutil-1 expat
LIB_DEPENDS-ap2= ${MODGETTEXT_LIB_DEPENDS}
-. for _lib in svn_delta-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1 \
+. for _lib in svn_delta-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 \
svn_repos-1 svn_subr-1
LIB_DEPENDS-ap2+=
${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
BUILD_DEPENDS+= ::www/apache-httpd
@@ -85,7 +86,7 @@
WANTLIB-ruby= ${WANTLIB} crypto expat ssl neon aprutil-1
RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
-LIB_DEPENDS-ruby= ${MODGETTEXT_LIB_DEPENDS}
+LIB_DEPENDS-ruby= ${MODGETTEXT_LIB_DEPENDS} ${MODRUBY_LIB_DEPENDS}
. for _lib in ${SVN_LIBS}
LIB_DEPENDS-ruby+=
${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
. endfor
@@ -102,14 +103,14 @@
--with-neon=${LOCALBASE} \
--with-apr=${LOCALBASE} \
--with-apr-util=${LOCALBASE} \
- --with-zlib \
- --without-jdk
+ --with-zlib=/usr \
+ --without-jdk \
+ --with-jikes=no \
+ ac_cv_search_bindtextdomain="-L${LOCALBASE}/lib -lintl -liconv"
.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}
@@ -122,11 +123,10 @@
MODPY_VERSION?= 2.5
pre-configure:
- @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE}," ${WRKSRC}/configure
- @perl -pi -e "s,!!MODPY_VERSION!!,${MODPY_VERSION}," ${WRKSRC}/configure
+ @${SUBST_CMD} ${WRKSRC}/configure
pre-build:
- @perl -pi -e "s,!!MODPY_VERSION!!,${MODPY_VERSION},"
${WRKBUILD}/Makefile
+ @${SUBST_CMD} ${WRKBUILD}/Makefile
.if !${FLAVOR:L:Mno_bindings}
REGRESS_DEPENDS+= ::devel/p5-IO-String \
@@ -181,7 +181,7 @@
${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 -r1.15 distinfo
--- distinfo 18 Jun 2007 06:34:48 -0000 1.15
+++ distinfo 2 Sep 2008 05:42:56 -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.2.tar.gz) = 7DrlXUPuh8HB9X4kEQCUWQ==
+RMD160 (subversion-1.5.2.tar.gz) = pSEK8ycAbxWgj3UL3Tpq8oUtjEg=
+SHA1 (subversion-1.5.2.tar.gz) = ECdMfD06e84R1dRwvfEQ1P881r0=
+SHA256 (subversion-1.5.2.tar.gz) = Vspcc7Hsxc60CNkq0v97e4Tgt64ERb88cfrsj/Oa+mo=
+SIZE (subversion-1.5.2.tar.gz) = 6646636
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 25 Oct 2007 10:00:03 -0000 1.7
+++ patches/patch-Makefile_in 2 Sep 2008 05:48:36 -0000
@@ -1,40 +1,40 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2006/11/29 08:52:39 msf Exp $
---- 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 Tue Aug 26 19:27:56 2008
++++ Makefile.in Tue Sep 2 07:45:05 2008
+@@ -68,8 +68,8 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
-swig_pydir = @libdir@/svn-python/libsvn
-swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = @libdir@/python!!MODPY_VERSION!!/site-packages/libsvn
-+swig_pydir_extra = @libdir@/python!!MODPY_VERSION!!/site-packages/svn
++swig_pydir = @libdir@/python${MODPY_VERSION}/site-packages/libsvn
++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@
-SWIG_PY_LINK = @SWIG_PY_LINK@
-SWIG_PY_LIBS = @SWIG_PY_LIBS@
+SWIG_PY_LINK = @SWIG_PY_LINK@ [EMAIL PROTECTED]@
-+SWIG_PY_LIBS = -lpython!!MODPY_VERSION!!
++SWIG_PY_LIBS = -lpython${MODPY_VERSION}
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)
+@@ -210,19 +210,14 @@ INSTALL_JAVAHL_LIB = $(INSTALL_LIB)
# additional installation rules for the SWIG wrappers
INSTALL_EXTRA_SWIG_PY=\
@@ -56,7 +56,7 @@
$(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=\
+@@ -248,8 +243,8 @@ INSTALL_EXTRA_JAVAHL_JAVA=\
[EMAIL PROTECTED]@
INSTALL_EXTRA_SWIG_RB=\
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-configure,v
retrieving revision 1.9
diff -u -r1.9 patch-configure
--- patches/patch-configure 25 Oct 2007 10:00:03 -0000 1.9
+++ patches/patch-configure 2 Sep 2008 06:28:55 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.8 2007/06/18 06:34:48 steven Exp $
---- 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 Wed Aug 27 22:42:29 2008
++++ configure Tue Sep 2 08:27:12 2008
+@@ -3818,7 +3818,7 @@ if test "$INSTALL" = "build/install-sh -c"; then
INSTALL="$abs_srcdir/$INSTALL"
fi
@@ -10,30 +10,12 @@
-@@ -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;
+@@ -24244,7 +24244,7 @@ fi
# Python: Used for testsuite, and bindings
-PYTHON="`$abs_srcdir/build/find_python.sh`"
-+PYTHON="python!!MODPY_VERSION!!"
++PYTHON="python${MODPY_VERSION}"
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$
---- 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: patch-subversion_bindings_swig_perl_native_Ra_pm,v 1.1 2006/09/30
06:23:58 steven Exp $
---- 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 -r1.1 PFRAG.shared-main
--- pkg/PFRAG.shared-main 24 Nov 2006 19:52:53 -0000 1.1
+++ pkg/PFRAG.shared-main 2 Sep 2008 06:13:14 -0000
@@ -1,13 +1,14 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.2 2006/01/07 01:10:11 steven Exp $
[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}
@lib lib/libsvn_fs-1.so.${LIBsvn_fs-1_VERSION}
@lib lib/libsvn_fs_base-1.so.${LIBsvn_fs_base-1_VERSION}
@lib lib/libsvn_fs_fs-1.so.${LIBsvn_fs_fs-1_VERSION}
[EMAIL PROTECTED] lib/libsvn_fs_util-1.so.${LIBsvn_fs_util-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}
[EMAIL PROTECTED] lib/libsvn_ra_neon-1.so.${LIBsvn_ra_neon-1_VERSION}
@lib lib/libsvn_ra_svn-1.so.${LIBsvn_ra_svn-1_VERSION}
@lib lib/libsvn_repos-1.so.${LIBsvn_repos-1_VERSION}
@lib lib/libsvn_subr-1.so.${LIBsvn_subr-1_VERSION}
Index: pkg/PFRAG.shared-python
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PFRAG.shared-python,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared-python
--- pkg/PFRAG.shared-python 25 Oct 2007 10:00:03 -0000 1.3
+++ pkg/PFRAG.shared-python 2 Sep 2008 06:14:52 -0000
@@ -1,8 +1,9 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-python,v 1.2 2006/01/07 01:10:11
steven Exp $
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-python,v 1.3 2007/10/25 10:00:03
steven Exp $
@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
lib/python${MODPY_VERSION}/site-packages/libsvn/_client.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_core.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.so
+lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.so
lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.so
Index: pkg/PFRAG.shared-ruby
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PFRAG.shared-ruby,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.shared-ruby
--- pkg/PFRAG.shared-ruby 29 Nov 2006 08:52:39 -0000 1.1
+++ pkg/PFRAG.shared-ruby 2 Sep 2008 07:17:22 -0000
@@ -1,11 +1,10 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.2 2006/01/07 01:10:11 steven Exp $
[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
+lib/ruby/site_ruby/svn/ext/client.so
+lib/ruby/site_ruby/svn/ext/core.so
+lib/ruby/site_ruby/svn/ext/delta.so
+lib/ruby/site_ruby/svn/ext/diff.so
+lib/ruby/site_ruby/svn/ext/fs.so
+lib/ruby/site_ruby/svn/ext/ra.so
+lib/ruby/site_ruby/svn/ext/repos.so
+lib/ruby/site_ruby/svn/ext/wc.so
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 15 Feb 2007 10:25:17 -0000 1.2
+++ pkg/PLIST-main 2 Sep 2008 07:16:24 -0000
@@ -1,21 +1,23 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.8 2006/09/30 06:23:58 steven Exp $
[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_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
@@ -59,12 +63,14 @@
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
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
lib/libsvn_ra_svn-1.a
lib/libsvn_ra_svn-1.la
lib/libsvn_repos-1.a
@@ -91,8 +97,7 @@
@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,6 +115,7 @@
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
Index: pkg/PLIST-python
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-python,v
retrieving revision 1.4
diff -u -r1.4 PLIST-python
--- pkg/PLIST-python 25 Oct 2007 10:00:03 -0000 1.4
+++ pkg/PLIST-python 2 Sep 2008 06:14:42 -0000
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-python,v 1.3 2006/12/21 08:58:04 steven Exp $
[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
@@ -11,6 +11,8 @@
@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_core.la
@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.a
@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_diff.la
@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.a
@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.la
@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.a
@@ -25,6 +27,8 @@
lib/python${MODPY_VERSION}/site-packages/libsvn/core.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/delta.py
lib/python${MODPY_VERSION}/site-packages/libsvn/delta.pyc
+lib/python${MODPY_VERSION}/site-packages/libsvn/diff.py
+lib/python${MODPY_VERSION}/site-packages/libsvn/diff.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/fs.py
lib/python${MODPY_VERSION}/site-packages/libsvn/fs.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/ra.py
@@ -42,6 +46,8 @@
lib/python${MODPY_VERSION}/site-packages/svn/core.pyc
lib/python${MODPY_VERSION}/site-packages/svn/delta.py
lib/python${MODPY_VERSION}/site-packages/svn/delta.pyc
+lib/python${MODPY_VERSION}/site-packages/svn/diff.py
+lib/python${MODPY_VERSION}/site-packages/svn/diff.pyc
lib/python${MODPY_VERSION}/site-packages/svn/fs.py
lib/python${MODPY_VERSION}/site-packages/svn/fs.pyc
lib/python${MODPY_VERSION}/site-packages/svn/ra.py
Index: pkg/PLIST-ruby
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-ruby,v
retrieving revision 1.3
diff -u -r1.3 PLIST-ruby
--- pkg/PLIST-ruby 18 Jun 2007 06:34:48 -0000 1.3
+++ pkg/PLIST-ruby 2 Sep 2008 07:17:35 -0000
@@ -1,29 +1,33 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-ruby,v 1.2 2006/12/21 08:58:04 steven Exp $
[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/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/ext/
+lib/ruby/site_ruby/svn/ext/client.a
+lib/ruby/site_ruby/svn/ext/client.la
+lib/ruby/site_ruby/svn/ext/core.a
+lib/ruby/site_ruby/svn/ext/core.la
+lib/ruby/site_ruby/svn/ext/delta.a
+lib/ruby/site_ruby/svn/ext/delta.la
+lib/ruby/site_ruby/svn/ext/diff.a
+lib/ruby/site_ruby/svn/ext/diff.la
+lib/ruby/site_ruby/svn/ext/fs.a
+lib/ruby/site_ruby/svn/ext/fs.la
+lib/ruby/site_ruby/svn/ext/ra.a
+lib/ruby/site_ruby/svn/ext/ra.la
+lib/ruby/site_ruby/svn/ext/repos.a
+lib/ruby/site_ruby/svn/ext/repos.la
+lib/ruby/site_ruby/svn/ext/wc.a
+lib/ruby/site_ruby/svn/ext/wc.la
+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
