hi,
Here is an update to subversion 1.5.4. I've added some more workarounds
to always find the python binary, and merged stuff from the previous
diffs that were sent.
Tested on amd64, `make regress' gives no failures.
Please test/comment/ok.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile 5 Oct 2008 08:31:14 -0000 1.48
+++ Makefile 27 Oct 2008 11:46:05 -0000
@@ -6,19 +6,19 @@
COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-VERSION= 1.4.4
+VERSION= 1.5.4
DISTNAME= subversion-${VERSION}
PKGNAME= ${DISTNAME}
-PKGNAME-main= ${DISTNAME}p0
-PKGNAME-perl= p5-SVN-${VERSION}p2
-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_fs_util-1 svn_ra-1 svn_ra_neon-1 \
+ svn_ra_local-1 svn_ra_neon-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 svn_swig_ruby-1
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@@ -27,7 +27,7 @@
HOMEPAGE= http://subversion.tigris.org/
-MAINTAINER= Sigfred Haversen <[EMAIL PROTECTED]>
+MAINTAINER= Stefan Sperling <[EMAIL PROTECTED]>
# BSD alike + Apache License 2.0
PERMIT_PACKAGE_CDROM= Yes
@@ -42,33 +42,49 @@
MODULES= devel/gettext
-WANTLIB= apr-1 expat db z
+WANTLIB= expat db z
-LIB_DEPENDS= neon.>=24:neon->=0.24.7:net/neon \
- aprutil-1::devel/apr-util
+LIB_DEPENDS= neon.>=26:neon->=0.26.2:net/neon \
+ apr-1::devel/apr \
+ aprutil-1::devel/apr-util \
+ sasl2.>=2::security/cyrus-sasl2
MULTI_PACKAGES= -main
-WANTLIB-main= ${WANTLIB} c crypto ssl
+WANTLIB-main= ${WANTLIB} c crypto iconv intl ssl
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
+CONTRIB_HOOK_SCRIPTS= case-insensitive.py pre-commit-check.py \
+ check-mime-type.pl pre-lock-require-needs-lock.py \
+ commit-block-joke.py remove-zombie-locks.py detect-merge-conflicts.sh \
+ syntax-check.sh
+# There's also 'enforcer', but it has its own subdir in contrib/hook-scripts/
+# So we handle it separately, see post-install
+
+TOOLS_HOOK_SCRIPTS= commit-access-control.cfg.example \
+ commit-access-control.pl svn2feed.py commit-access-control.pl.in \
+ svnperms.conf.example commit-email.pl svnperms.py commit-email.pl.in \
+ verify-po.py commit-email.rb
+# There's also 'mailer', but it has its own subdir in contrib/hook-scripts/
+# So we handle it separately, see post-install
+
.if !${FLAVOR:L:Mno_ap2}
MULTI_PACKAGES+= -ap2
-WANTLIB-ap2= ${WANTLIB} iconv aprutil-1 expat
+WANTLIB-ap2= ${WANTLIB} apr-1 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 \
- svn_repos-1 svn_subr-1
+ svn_fs_util-1 svn_repos-1 svn_subr-1
LIB_DEPENDS-ap2+=
${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
+. endfor
BUILD_DEPENDS+= ::www/apache-httpd
RUN_DEPENDS-ap2= ::www/apache-httpd
-. endfor
.endif
.if !${FLAVOR:L:Mno_bindings}
MULTI_PACKAGES+=-perl -python -ruby
SHARED_ONLY= Yes
-WANTLIB-perl= ${WANTLIB} aprutil-1
+WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1
RUN_DEPENDS-perl= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-perl= ${MODGETTEXT_LIB_DEPENDS}
. for _lib in svn_diff-1 svn_ra-1 svn_delta-1 svn_subr-1 svn_fs-1 \
@@ -76,63 +92,67 @@
LIB_DEPENDS-perl+=
${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
. endfor
-WANTLIB-python= ${WANTLIB} crypto ssl neon aprutil-1
+WANTLIB-python= ${WANTLIB} apr-1 aprutil-1 crypto neon sasl2 ssl
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS} ${MODGETTEXT_LIB_DEPENDS}
. for _lib in ${SVN_LIBS}
LIB_DEPENDS-python+=
${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
. endfor
-WANTLIB-ruby= ${WANTLIB} crypto expat ssl neon aprutil-1
+WANTLIB-ruby= ${WANTLIB} apr-1 aprutil-1 crypto neon sasl2 ssl
RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
-LIB_DEPENDS-ruby= ${MODGETTEXT_LIB_DEPENDS}
+LIB_DEPENDS-ruby= ruby.>=2::lang/ruby ${MODGETTEXT_LIB_DEPENDS}
. for _lib in ${SVN_LIBS}
LIB_DEPENDS-ruby+=
${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
. endfor
MODULES+= lang/ruby lang/python
-BUILD_DEPENDS+= ::devel/swig
+BUILD_DEPENDS+= :swig->=1.3.36:devel/swig
.endif
+# BSD make cannot build target autogen-swig to regenerate bindings
+USE_GMAKE= Yes
+MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
-SEPARATE_BUILD= simple
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.62
+CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= PYTHON2=${MODPY_BIN}
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
- --with-neon=${LOCALBASE} \
- --with-apr=${LOCALBASE} \
- --with-apr-util=${LOCALBASE} \
- --with-zlib \
+ --without-jikes \
--without-jdk
.if !${FLAVOR:L:Mno_bindings}
-CONFIGURE_ARGS+=--enable-swig-bindings=perl,python,ruby \
- --with-swig=${LOCALBASE}
+CONFIGURE_ARGS+=--with-swig
.else
-CONFIGURE_ARGS+=--disable-swig-bindings \
- --without-swig
+CONFIGURE_ARGS+=--without-swig
.endif
.if !${FLAVOR:L:Mno_ap2}
-CONFIGURE_ARGS+=--with-apxs=${LOCALBASE}/sbin/apxs2
+CONFIGURE_ARGS+=--with-apxs=${LOCALBASE}/sbin/apxs2 \
+ --disable-mod-activation
.else
CONFIGURE_ARGS+=--without-apxs
.endif
REGRESS_DEPENDS=::lang/python/${MODPY_VERSION}
MODPY_VERSION?= 2.5
+SUBST_VARS= MODPY_BIN LOCALBASE
-pre-configure:
- @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE}," ${WRKSRC}/configure
- @perl -pi -e "s,!!MODPY_VERSION!!,${MODPY_VERSION}," ${WRKSRC}/configure
+pre-patch:
+ @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
-pre-build:
- @perl -pi -e "s,!!MODPY_VERSION!!,${MODPY_VERSION},"
${WRKBUILD}/Makefile
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/Makefile.in ${WRKSRC}/configure.ac
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh
.if !${FLAVOR:L:Mno_bindings}
-REGRESS_DEPENDS+= ::devel/p5-IO-String \
- :${PKGNAME-python}:devel/subversion,-python \
+REGRESS_DEPENDS+= :${PKGNAME-python}:devel/subversion,-python \
:${PKGNAME-ruby}:devel/subversion,-ruby
+pre-build:
+ @cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+ ${MAKE_FLAGS} clean-swig
+
post-build:
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
${MAKE_FLAGS} swig-py
@@ -172,36 +192,33 @@
${INSTALL_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/subversion/config
${INSTALL_DATA} ${WRKBUILD}/tools/backup/hot-backup.py \
- ${PREFIX}/share/examples/subversion/backup
+ ${PREFIX}/share/examples/subversion/backup/
${INSTALL_DATA} ${WRKSRC}/tools/server-side/svn-backup-dumps.py \
- ${PREFIX}/share/examples/subversion/backup
+ ${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}/contrib/hook-scripts/enforcer/enforcer \
+
${PREFIX}/share/examples/subversion/hook-scripts/enforcer/
+ ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/enforcer/enforcer.conf \
+
${PREFIX}/share/examples/subversion/hook-scripts/enforcer/
+.for hook_script in ${CONTRIB_HOOK_SCRIPTS}
+ ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/${hook_script} \
+ ${PREFIX}/share/examples/subversion/hook-scripts/
+.endfor
${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
- ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.py \
- ${PREFIX}/share/examples/subversion/hook-scripts
+ ${PREFIX}/share/examples/subversion/hook-scripts/
+.for hook_script in ${TOOLS_HOOK_SCRIPTS}
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/${hook_script} \
+ ${PREFIX}/share/examples/subversion/hook-scripts/
+.endfor
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example
\
${PREFIX}/share/examples/subversion/hook-scripts/mailer
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
${PREFIX}/share/examples/subversion/hook-scripts/mailer
${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/* \
${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
+ find ${PREFIX}/share/examples/subversion -type f | xargs perl -pi \
+ -e "s,.*/usr/bin/python.*,#!${MODPY_BIN},;" \
+ -e "s,.*env python.*,#!${MODPY_BIN},;"
.include <bsd.port.mk>
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 27 Oct 2008 11:46:05 -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.4.tar.gz) = jsCm51bDXcPOIKu1gAQJJA==
+RMD160 (subversion-1.5.4.tar.gz) = LKSA6dymeO65HNuR4FLf5exKNSQ=
+SHA1 (subversion-1.5.4.tar.gz) = VlOp+RlyovBglAGzV+aydYV8Tx8=
+SHA256 (subversion-1.5.4.tar.gz) = /CYHo7PEJ5KR8vEFFuBtcHMbwm66WjDAMQ5KuzbJ1v4=
+SIZE (subversion-1.5.4.tar.gz) = 6673155
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 27 Oct 2008 11:46:05 -0000
@@ -1,69 +1,25 @@
-$OpenBSD: patch-Makefile_in,v 1.7 2007/10/25 10:00:03 steven 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$
+--- Makefile.in.orig Tue Aug 26 19:27:56 2008
++++ Makefile.in Sat Oct 25 21:46:14 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@
-
- SHELL = @SHELL@
- LIBTOOL = @SVN_LIBTOOL@
--LTFLAGS = @SVN_LT_CCTAG@ --silent
--LTCXXFLAGS = @SVN_LT_CXXTAG@ --silent
-+LTFLAGS = @SVN_LT_CCTAG@
-+LTCXXFLAGS = @SVN_LT_CXXTAG@
- LT_LDFLAGS = @LT_LDFLAGS@
- LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
- LT_CXX_LIBADD = @LT_CXX_LIBADD@
-@@ -108,8 +108,8 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
+ contribdir = @bindir@/svn-contrib
+@@ -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)
-
- # 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, \
-@@ -234,8 +229,8 @@ INSTALL_EXTRA_JAVAHL_JAVA=\
- [EMAIL PROTECTED]@
-
- INSTALL_EXTRA_SWIG_RB=\
-- @echo $(MKDIR) $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
-- $(MKDIR) $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
-+ @echo $(INSTALL) -d $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
-+ $(INSTALL) -d $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
- for i in $(abs_srcdir)/subversion/bindings/swig/ruby/svn/*.rb; do \
- echo $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
- $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
Index: patches/patch-build_ac-macros_swig_m4
===================================================================
RCS file: patches/patch-build_ac-macros_swig_m4
diff -N patches/patch-build_ac-macros_swig_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-build_ac-macros_swig_m4 27 Oct 2008 11:46:05 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- build/ac-macros/swig.m4.orig Sat Oct 25 22:10:37 2008
++++ build/ac-macros/swig.m4 Sat Oct 25 22:11:25 2008
+@@ -212,16 +212,16 @@ AC_DEFUN(SVN_FIND_SWIG,
+
+ AC_MSG_CHECKING([where to install Ruby scripts])
+ AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
+- svn_cv_ruby_sitedir_libsuffix="`echo \"$rbconfig_sitelibdir\" | \
+- sed -e \"s,^$rbconfig_sitedir,,\"`"
++ svn_cv_ruby_sitedir_libsuffix="`echo $rbconfig_sitelibdir | \
++ sed -e s,^$rbconfig_sitedir,,`"
+ ])
+
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
+ AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
+
+ AC_MSG_CHECKING([where to install Ruby extensions])
+ AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
+- svn_cv_ruby_sitedir_archsuffix="`echo \"$rbconfig_sitearchdir\" | \
+- sed -e \"s,^$rbconfig_sitedir,,\"`"
++ svn_cv_ruby_sitedir_archsuffix="`echo $rbconfig_sitearchdir | \
++ sed -e s,^$rbconfig_sitedir,,`"
+ ])
+
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
+ AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 25 Oct 2007 10:00:03 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$OpenBSD: patch-configure,v 1.9 2007/10/25 10:00:03 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
- INSTALL="$abs_srcdir/$INSTALL"
- fi
-
--MKDIR="$INSTALL -d"
-+MKDIR="/bin/mkdir -p"
-
-
-
-@@ -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;
- # Python: Used for testsuite, and bindings
-
-
--PYTHON="`$abs_srcdir/build/find_python.sh`"
-+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;}
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 27 Oct 2008 11:46:05 -0000
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- configure.ac.orig Tue Aug 26 19:27:56 2008
++++ configure.ac Sat Oct 25 22:08:16 2008
+@@ -6,7 +6,7 @@ AC_PREREQ(2.58)
+ dnl Get the version of Subversion, using m4's esyscmd() command to do this
+ dnl at m4-time, since AC_INIT() requires it then.
+ AC_INIT([subversion],
+- [esyscmd(python build/getversion.py
subversion/include/svn_version.h)],
++ [esyscmd(${MODPY_BIN} build/getversion.py
subversion/include/svn_version.h)],
+ [http://subversion.tigris.org/])
+
+ AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
+@@ -48,7 +48,7 @@ if test "$INSTALL" = "build/install-sh -c"; then
+ INSTALL="$abs_srcdir/$INSTALL"
+ fi
+
+-AC_SUBST([MKDIR], ["$INSTALL -d"])
++AC_SUBST([MKDIR], ["mkdir -p"])
+
+
+ dnl find Apache with a recent-enough magic module number.
+@@ -309,7 +309,8 @@ if test "$enable_nls" = "yes"; then
+ [
+ AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.])
+ enable_nls="no"
+- ])
++ ], -liconv)
++ AC_CHECK_LIB(iconv, libiconv_open)
+ if test "$enable_nls" = "yes"; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [Define to 1 if translation of program messages to the user's
+@@ -540,7 +541,7 @@ AS_HELP_STRING([--enable-gprof],
+ # Python: Used for testsuite, and bindings
+
+
+-PYTHON="`$abs_srcdir/build/find_python.sh`"
++PYTHON=${MODPY_BIN}
+ if test -z "$PYTHON"; then
+ AC_MSG_WARN([Python 2.2 or later is required to run the testsuite])
+ AC_MSG_WARN([or to use the Subversion Python bindings])
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: patch-subversion_bindings_swig_perl_native_Core_pm,v 1.2 2006/09/30
06:23:58 steven Exp $
---- 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.2 2007/06/18
06:34:48 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 27 Oct 2008 11:46:05 -0000
@@ -5,9 +5,10 @@
@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 27 Oct 2008 11:46:05 -0000
@@ -3,6 +3,7 @@
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 27 Oct 2008 11:46:05 -0000
@@ -1,10 +1,9 @@
@comment $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/diff.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
Index: pkg/PLIST-ap2
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-ap2,v
retrieving revision 1.1
diff -u -r1.1 PLIST-ap2
--- pkg/PLIST-ap2 11 Apr 2007 13:26:36 -0000 1.1
+++ pkg/PLIST-ap2 27 Oct 2008 11:46:05 -0000
@@ -1,3 +1,5 @@
@comment $OpenBSD: PLIST-ap2,v 1.1 2007/04/11 13:26:36 deanna Exp $
+include/subversion-1/mod_authz_svn.h
+include/subversion-1/mod_dav_svn.h
lib/apache2/mod_authz_svn.so
lib/apache2/mod_dav_svn.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 27 Oct 2008 11:46:05 -0000
@@ -2,20 +2,20 @@
@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_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 +27,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 +61,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,17 +95,19 @@
@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/check-mime-type.pl
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-access-control.pl.in
+share/examples/subversion/hook-scripts/commit-block-joke.py
share/examples/subversion/hook-scripts/commit-email.pl
+share/examples/subversion/hook-scripts/commit-email.pl.in
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
@@ -110,8 +116,15 @@
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/pre-commit-check.py
+share/examples/subversion/hook-scripts/pre-lock-require-needs-lock.py
+share/examples/subversion/hook-scripts/remove-zombie-locks.py
+share/examples/subversion/hook-scripts/svn2feed.py
share/examples/subversion/hook-scripts/svnperms.conf.example
share/examples/subversion/hook-scripts/svnperms.py
+share/examples/subversion/hook-scripts/syntax-check.sh
+share/examples/subversion/hook-scripts/verify-po.py
share/locale/de/LC_MESSAGES/subversion.mo
share/locale/es/LC_MESSAGES/subversion.mo
share/locale/fr/LC_MESSAGES/subversion.mo
Index: pkg/PLIST-perl
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-perl,v
retrieving revision 1.2
diff -u -r1.2 PLIST-perl
--- pkg/PLIST-perl 21 Jan 2005 20:29:11 -0000 1.2
+++ pkg/PLIST-perl 27 Oct 2008 11:46:05 -0000
@@ -2,7 +2,6 @@
%%SHARED%%
lib/libsvn_swig_perl-1.a
lib/libsvn_swig_perl-1.la
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Base.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Client.pm
@@ -12,7 +11,6 @@
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Ra.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Repos.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Wc.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.bs
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 27 Oct 2008 11:46:05 -0000
@@ -5,26 +5,30 @@
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
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_client.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_client.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_core.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_core.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.la
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.a
[EMAIL PROTECTED] lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_client.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_client.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_core.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_core.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.la
+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/_fs.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.la
+lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.a
+lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.la
lib/python${MODPY_VERSION}/site-packages/libsvn/client.py
lib/python${MODPY_VERSION}/site-packages/libsvn/client.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/core.py
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 27 Oct 2008 11:46:05 -0000
@@ -2,23 +2,16 @@
%%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/
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/
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/diff.a
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/diff.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
@@ -27,3 +20,16 @@
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/${MODRUBY_REV}/svn/
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/client.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/commit-mailer.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/synchronizer.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/util.rb
+lib/ruby/site_ruby/${MODRUBY_REV}/svn/wc.rb
