This is an update of Subversion to version 1.3.0. Passes regression tests
on sparc64 and i386 on 3.9-beta.
The patch will drag in old subversion libs during build/regression,
but Jacob Meuser latest libtool patch posted to ports@ solves this.
Please test and comment.
/Sigfred
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 7 Jan 2006 01:10:11 -0000 1.16
+++ Makefile 20 Jan 2006 14:40:18 -0000
@@ -4,9 +4,8 @@
COMMENT-perl= "perl interface to subversion"
COMMENT-python= "python interface to subversion"
-VERSION= 1.2.3
+VERSION= 1.3.0
DISTNAME= subversion-${VERSION}
-PKGNAME= ${DISTNAME}p1
PKGNAME-perl= p5-SVN-${VERSION}
PKGNAME-python= py-subversion-${VERSION}
SHARED_LIBS= svn_client-1 0.0 \
@@ -101,15 +100,13 @@
REGRESS_DEPENDS=::lang/python/${PYTHON_VER} \
::devel/p5-IO-String
-REGRESS_FLAGS= LD_LIBRARY_PATH=`find ${WRKBUILD} -name .libs | tr '\012' :`
+#REGRESS_FLAGS= LD_LIBRARY_PATH=`find ${WRKBUILD} -name .libs | tr
'\012' :`
pre-configure:
@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE}," ${WRKSRC}/configure
- @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE}," ${WRKSRC}/configure.in
pre-build:
@perl -pi -e "s,!!PYTHON_VER!!,${PYTHON_VER}," ${WRKBUILD}/Makefile
- @perl -pi -e "s,!!WRKBUILD!!,${WRKBUILD}," ${WRKBUILD}/Makefile
.if !${FLAVOR:L:Mno_bindings}
post-build:
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 2 Oct 2005 09:02:05 -0000 1.7
+++ distinfo 20 Jan 2006 14:40:18 -0000
@@ -1,4 +1,4 @@
-MD5 (subversion-1.2.3.tar.gz) = 95f9b43801b4d9bc071564bca2116763
-RMD160 (subversion-1.2.3.tar.gz) = 4a39e2b9f4dcd39023e785ce0a31b3bd493d6a85
-SHA1 (subversion-1.2.3.tar.gz) = 790cfc94db98799a48a157fef22a13c878e74345
-SIZE (subversion-1.2.3.tar.gz) = 8868156
+MD5 (subversion-1.3.0.tar.gz) = 0d91a7fe152d0373044c47c54deb2c9a
+RMD160 (subversion-1.3.0.tar.gz) = e00cc422636b74df8c8821c136e9eacb8caa42d4
+SHA1 (subversion-1.3.0.tar.gz) = 98cb017844750d4ed26e2a811c581a644e3ad585
+SIZE (subversion-1.3.0.tar.gz) = 8773294
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 4 Jul 2005 22:22:00 -0000 1.2
+++ patches/patch-Makefile_in 20 Jan 2006 14:40:18 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2005/07/04 22:22:00 alek Exp $
---- Makefile.in.orig Mon May 9 07:56:09 2005
-+++ Makefile.in Wed Jun 22 02:08:50 2005
+$OpenBSD$
+--- Makefile.in.orig Tue Nov 15 16:56:15 2005
++++ Makefile.in Sun Jan 8 17:31:33 2006
@@ -66,8 +66,8 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
@@ -12,37 +12,14 @@
swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
-@@ -143,7 +143,23 @@ MKDIR = @MKDIR@
- # the EXTRA_ exist so that extra flags can be passed at 'make' time
- CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
- CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
--LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
-+LDFLAGS = -L!!WRKBUILD!!/subversion/libsvn_client/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_delta/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_diff/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_fs/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_fs_base/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_fs_fs/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_ra/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_ra_dav/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_ra_local/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_ra_svn/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_repos/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_subr/.libs \
-+ -L!!WRKBUILD!!/subversion/libsvn_wc/.libs \
-+ -L!!WRKBUILD!!/subversion/bindings/swig/perl/libsvn_swig_perl/.libs \
-+ -L!!WRKBUILD!!/subversion/bindings/swig/python/libsvn_swig_py/.libs \
-+ -L!!WRKBUILD!!/subversion/bindings/swig/python/.libs \
-+ @LDFLAGS@ $(EXTRA_LDFLAGS)
-
- COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
- COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
-@@ -321,7 +337,7 @@ local-install: @INSTALL_RULES@
-
- ### HACK!! Find a better way to do this
- revision-install:
-- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk >
$(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
-+ env LD_LIBRARY_PATH=${PREFIX}/lib subversion/svnversion/svnversion
$(top_srcdir) /repos/svn/trunk >
$(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
-
- install-static: @INSTALL_STATIC_RULES@
+@@ -94,8 +94,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@
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 4 Nov 2005 09:42:31 -0000 1.3
+++ patches/patch-configure 20 Jan 2006 14:40:18 -0000
@@ -1,57 +1,7 @@
-$OpenBSD: patch-configure,v 1.3 2005/11/04 09:42:31 alek Exp $
---- configure.orig Fri Aug 19 21:42:59 2005
-+++ configure Mon Oct 3 08:21:17 2005
-@@ -1578,7 +1578,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- ac_aux_dir=
--for ac_dir in ac-helpers $srcdir/ac-helpers; do
-+for ac_dir in !!LOCALBASE!!/share/libtool; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
-@@ -1594,8 +1594,8 @@ for ac_dir in ac-helpers $srcdir/ac-help
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in
ac-helpers $srcdir/ac-helpers" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in ac-helpers
$srcdir/ac-helpers" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in
!!LOCALBASE!!/share/libtool" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in
!!LOCALBASE!!/share/libtool" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-@@ -1609,7 +1609,7 @@ echo "$as_me: Configuring Subversion 1.2
- abs_srcdir="`cd $srcdir && pwd`"
- abs_builddir="`pwd`"
-
--INSTALL="$abs_srcdir/ac-helpers/install-sh -c"
-+INSTALL="!!LOCALBASE!!/share/libtool/install-sh -c"
-
-
- MKDIR="$INSTALL -d"
-@@ -3671,8 +3671,9 @@ if test "$experimental_libtool" = "yes";
- LIBTOOL="$sh_libtool"
- SVN_LIBTOOL="$sh_libtool"
- else
-- sh_libtool="$abs_builddir/libtool"
-- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
-+ sh_libtool="!!LOCALBASE!!/bin/libtool"
-+ LIBTOOL="$sh_libtool"
-+ SVN_LIBTOOL="$sh_libtool"
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
-@@ -19457,7 +19458,7 @@ fi
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='!!LOCALBASE!!/bin/libtool'
-
- # Prevent multiple expansion
-
-@@ -20663,7 +20664,7 @@ rm -f conftest.err conftest.$ac_objext \
+$OpenBSD$
+--- configure.orig Sun Jan 8 10:19:14 2006
++++ configure Sun Jan 8 10:32:47 2006
+@@ -21025,7 +21025,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
@@ -60,7 +10,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20708,7 +20709,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -21070,7 +21070,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
Index: patches/patch-subversion_clients_cmdline_main_c
===================================================================
RCS file:
/cvs/ports/devel/subversion/patches/patch-subversion_clients_cmdline_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_clients_cmdline_main_c
--- patches/patch-subversion_clients_cmdline_main_c 30 Nov 2005 19:45:08
-0000 1.1
+++ patches/patch-subversion_clients_cmdline_main_c 20 Jan 2006 14:40:18
-0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-subversion_clients_cmdline_main_c,v 1.1 2005/11/30 19:45:08
sturm Exp $
---- subversion/clients/cmdline/main.c.orig Tue Nov 29 14:25:04 2005
-+++ subversion/clients/cmdline/main.c Tue Nov 29 14:25:22 2005
-@@ -758,7 +758,7 @@ error_exit (svn_error_t *err, FILE *stre
+$OpenBSD$
+--- 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)
{
Index: patches/patch-subversion_svnadmin_main_c
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-subversion_svnadmin_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_svnadmin_main_c
--- patches/patch-subversion_svnadmin_main_c 30 Nov 2005 19:45:08 -0000
1.1
+++ patches/patch-subversion_svnadmin_main_c 20 Jan 2006 14:40:18 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-subversion_svnadmin_main_c,v 1.1 2005/11/30 19:45:08 sturm Exp
$
---- subversion/svnadmin/main.c.orig Tue Nov 29 14:25:56 2005
-+++ subversion/svnadmin/main.c Tue Nov 29 14:26:09 2005
+$OpenBSD$
+--- 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)
Index: patches/patch-subversion_svndumpfilter_main_c
===================================================================
RCS file:
/cvs/ports/devel/subversion/patches/patch-subversion_svndumpfilter_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_svndumpfilter_main_c
--- patches/patch-subversion_svndumpfilter_main_c 30 Nov 2005 19:45:08
-0000 1.1
+++ patches/patch-subversion_svndumpfilter_main_c 20 Jan 2006 14:40:18
-0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-subversion_svndumpfilter_main_c,v 1.1 2005/11/30 19:45:08
sturm Exp $
---- subversion/svndumpfilter/main.c.orig Tue Nov 29 14:26:37 2005
-+++ subversion/svndumpfilter/main.c Tue Nov 29 14:26:51 2005
-@@ -879,7 +879,7 @@ subcommand_help (apr_getopt_t *os, void
+$OpenBSD$
+--- 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)
{
Index: patches/patch-subversion_svnlook_main_c
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-subversion_svnlook_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_svnlook_main_c
--- patches/patch-subversion_svnlook_main_c 30 Nov 2005 19:45:08 -0000
1.1
+++ patches/patch-subversion_svnlook_main_c 20 Jan 2006 14:40:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-subversion_svnlook_main_c,v 1.1 2005/11/30 19:45:08 sturm Exp $
---- subversion/svnlook/main.c.orig Tue Nov 29 14:27:33 2005
-+++ subversion/svnlook/main.c Tue Nov 29 14:27:43 2005
-@@ -277,7 +277,7 @@ check_cancel (void *baton)
+$OpenBSD$
+--- 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)
{
Index: patches/patch-subversion_svnserve_main_c
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-subversion_svnserve_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_svnserve_main_c
--- patches/patch-subversion_svnserve_main_c 30 Nov 2005 19:45:08 -0000
1.1
+++ patches/patch-subversion_svnserve_main_c 20 Jan 2006 14:40:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-subversion_svnserve_main_c,v 1.1 2005/11/30 19:45:08 sturm Exp
$
---- subversion/svnserve/main.c.orig Tue Nov 29 14:28:06 2005
-+++ subversion/svnserve/main.c Tue Nov 29 14:28:15 2005
-@@ -213,7 +213,7 @@ static void * APR_THREAD_FUNC serve_thre
+$OpenBSD$
+--- 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)
{
Index: patches/patch-subversion_svnversion_main_c
===================================================================
RCS file:
/cvs/ports/devel/subversion/patches/patch-subversion_svnversion_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-subversion_svnversion_main_c
--- patches/patch-subversion_svnversion_main_c 30 Nov 2005 19:45:08 -0000
1.1
+++ patches/patch-subversion_svnversion_main_c 20 Jan 2006 14:40:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-subversion_svnversion_main_c,v 1.1 2005/11/30 19:45:08 sturm
Exp $
---- subversion/svnversion/main.c.orig Tue Nov 29 14:28:43 2005
-+++ subversion/svnversion/main.c Tue Nov 29 14:28:58 2005
-@@ -171,7 +171,7 @@ help(const apr_getopt_option_t *options,
+$OpenBSD$
+--- 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)
{
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 2 Oct 2005 09:02:05 -0000 1.5
+++ pkg/PLIST 20 Jan 2006 14:40:18 -0000
@@ -25,6 +25,7 @@
include/subversion-1/svn_hash.h
include/subversion-1/svn_io.h
include/subversion-1/svn_md5.h
+include/subversion-1/svn_nls.h
include/subversion-1/svn_opt.h
include/subversion-1/svn_path.h
include/subversion-1/svn_pools.h
@@ -36,7 +37,6 @@
include/subversion-1/svn_sorts.h
include/subversion-1/svn_string.h
include/subversion-1/svn_subst.h
-include/subversion-1/svn_test.h
include/subversion-1/svn_time.h
include/subversion-1/svn_types.h
include/subversion-1/svn_utf.h
