Update Subversion to 1.10.0.
Release notes:
https://subversion.apache.org/docs/release-notes/1.10.html
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile 11 Jan 2018 19:27:02 -0000 1.164
+++ Makefile 23 Apr 2018 12:48:30 -0000
@@ -7,9 +7,9 @@ COMMENT-ruby= ruby interface to subvers
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
-VERSION= 1.9.7
-DISTNAME= subversion-${VERSION}
-PKGNAME-main= ${DISTNAME}
+VERSION= 1.10.0
+DISTNAME= subversion-${VERSION:S/rc/-rc/}
+PKGNAME-main= subversion-${VERSION}
FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl
FULLPKGNAME-python= py-subversion-${VERSION}
@@ -21,18 +21,11 @@ FULLPKGPATH-ap2= devel/subversion,-ap2
FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring
-REVISION-main= 4
-REVISION-perl= 1
-REVISION-python=0
-REVISION-ruby= 0
-REVISION-ap2= 1
-REVISION-gnome-keyring= 1
-
MODRUBY_REV ?= 2.4
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
MODRUBY_BINREV= ${MODRUBY_REV:S/.//}
-SO_VERSION= 2.0
+SO_VERSION= 3.0
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_fs_x-1 \
svn_ra-1 svn_ra_serf-1 svn_ra_local-1 \
@@ -68,17 +61,15 @@ FLAVOR += no_perl no_python no_ruby
MODULES= lang/python
-WANTLIB= expat iconv intl m pthread z
+WANTLIB= expat iconv intl lz4 m pthread z
-# autogen.sh checks for libtoolize
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- devel/gettext-tools \
- devel/libtool
+BUILD_DEPENDS= devel/gettext-tools
MULTI_PACKAGES = -main -ap2 -perl -python -ruby -gnome-keyring
MAINSPEC = ${PKGNAME}:devel/subversion,-main
LIB_DEPENDS-main = ${LIB_DEPENDS} \
+ archivers/lz4 \
net/serf>=1.3.2 \
databases/sqlite3 \
devel/apr \
@@ -97,7 +88,7 @@ TOOLS_HOOK_SCRIPTS= commit-access-contro
# There's also 'mailer', but we handle it separately, see post-install
TOOLS_CLIENT_SIDE_SCRIPTS= bash_completion change-svn-wc-format.py \
- detach.py mergeinfo-sanitizer.py server-version.py svn-graph.pl \
+ mergeinfo-sanitizer.py server-version.py svn-graph.pl \
svn-ssl-fingerprints.sh svn-vendor.py svn-viewspec.py wcfind
WANTLIB-ap2= ${WANTLIB} apr-1 aprutil-1 db sqlite3 svn_fs_x-1
@@ -137,21 +128,21 @@ WANTLIB-ruby += ${_lib}>=${SO_VERSION}
.endfor
WANTLIB-gnome-keyring= ${WANTLIB} apr-1 aprutil-1 gcrypt gpg-error \
- dbus-1>=7 glib-2.0 gnome-keyring>=6 pcre>=2 sqlite3 \
+ gio-2.0 glib-2.0 secret-1 pcre>=2 sqlite3 \
svn_subr-1>=${SO_VERSION} ffi gmodule-2.0 gobject-2.0
LIB_DEPENDS-gnome-keyring= ${MAINSPEC} \
- x11/gnome/libgnome-keyring
+ x11/gnome/libsecret
RUN_DEPENDS-gnome-keyring=
MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
-AUTOCONF_VERSION=2.64
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= PYTHON2=${MODPY_BIN} MKDIR="/bin/mkdir -p"
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} \
--without-jikes \
--without-jdk \
- --without-libmagic
+ --without-libmagic \
+ --with-utf8proc=internal
# Maintainer mode shows files and line numbers for every error raised
# by Subversion. It is useful for debugging problems with Subversion
@@ -198,10 +189,8 @@ pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
pre-configure:
- @${SUBST_CMD} ${WRKSRC}/Makefile.in ${WRKSRC}/configure.ac \
+ @${SUBST_CMD} ${WRKSRC}/Makefile.in \
${WRKSRC}/subversion/libsvn_subr/auth.c
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh
mv
${WRKSRC}/subversion/bindings/swig/ruby/libsvn_swig_ruby{,${MODRUBY_BINREV}}
sed -i 's/libsvn_swig_ruby/libsvn_swig_ruby${MODRUBY_BINREV}/g' \
`fgrep -lr libsvn_swig_ruby ${WRKSRC}`
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo 10 Aug 2017 18:12:46 -0000 1.55
+++ distinfo 23 Apr 2018 12:48:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (subversion-1.9.7.tar.bz2) =
w7EYMzzhLlAdUJ5muwpHvMNNBTmQrKtFVZQxrD5JFiM=
-SIZE (subversion-1.9.7.tar.bz2) = 7881909
+SHA256 (subversion-1.10.0.tar.bz2) =
LPI/OruDfeoFhaaw69cOgOAflb3e98GqCXwY4+qmtYQ=
+SIZE (subversion-1.10.0.tar.bz2) = 8369823
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Makefile_in
--- patches/patch-Makefile_in 23 Sep 2017 15:59:03 -0000 1.16
+++ patches/patch-Makefile_in 23 Feb 2018 18:35:15 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.16 2017/
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -82,11 +82,11 @@ swig_pl_libdir = @libdir@
+@@ -84,11 +84,11 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
@@ -17,7 +17,7 @@ Index: Makefile.in
# where to install pkg-config files
pkgconfig_dir = $(datadir)/pkgconfig
-@@ -142,13 +142,13 @@ GMOCK_INCLUDES = -I@GMOCK_SRCDIR@
+@@ -146,13 +146,13 @@ GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/google
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-configure_ac,v
retrieving revision 1.11
diff -u -p -r1.11 patch-configure_ac
--- patches/patch-configure_ac 28 Aug 2017 13:58:05 -0000 1.11
+++ patches/patch-configure_ac 24 Feb 2018 16:10:03 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.11 2017/08/28 13:58:05 jeremy Exp $
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
- 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 SVN
subversion/include/svn_version.h)],
-+ [esyscmd(${MODPY_BIN} build/getversion.py SVN
subversion/include/svn_version.h)],
- [http://subversion.apache.org/])
-
- AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
-@@ -1274,7 +1274,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.7 or later is required to run the testsuite])
- AC_MSG_WARN([or to use the Subversion Python bindings])
-@@ -1295,7 +1295,7 @@ AC_PATH_PROG(PERL, perl, none)
- if test -n "$RUBY"; then
- AC_PATH_PROG(RUBY, "$RUBY", none)
- else
-- AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193
ruby2.0 ruby2.1, none)
-+ AC_PATH_PROGS(RUBY, ruby${MODRUBY_BINREV}, none)
- fi
- if test "$RUBY" != "none"; then
- AC_MSG_CHECKING([rb_hash_foreach])
Index: patches/patch-subversion_libsvn_subr_auth_c
===================================================================
RCS file:
/cvs/ports/devel/subversion/patches/patch-subversion_libsvn_subr_auth_c,v
retrieving revision 1.9
diff -u -p -r1.9 patch-subversion_libsvn_subr_auth_c
--- patches/patch-subversion_libsvn_subr_auth_c 14 Jun 2016 08:36:29 -0000
1.9
+++ patches/patch-subversion_libsvn_subr_auth_c 23 Feb 2018 18:35:15 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.9 2016/06/14 08:36:29
czarkoff Exp $
---- subversion/libsvn_subr/auth.c.orig Fri Oct 2 06:00:22 2015
-+++ subversion/libsvn_subr/auth.c Thu May 5 15:04:58 2016
-@@ -511,9 +511,9 @@ svn_auth_get_platform_specific_provider(svn_auth_provi
+Index: subversion/libsvn_subr/auth.c
+--- subversion/libsvn_subr/auth.c.orig
++++ subversion/libsvn_subr/auth.c
+@@ -508,9 +508,9 @@ svn_auth_get_platform_specific_provider(svn_auth_provi
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;
library_name = apr_psprintf(pool,
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 1 Nov 2017 10:16:53 -0000 1.18
+++ pkg/PLIST-main 23 Feb 2018 20:44:38 -0000
@@ -9,12 +9,15 @@
@comment @bin bin/diff3
@comment @bin bin/diff4
@bin bin/fsfs-access-map
+bin/fsfs-stats
@bin bin/svn
+@bin bin/svn-mergeinfo-normalizer
@bin bin/svn-populate-node-origins-index
@bin bin/svnadmin
@bin bin/svnauthz
@bin bin/svnauthz-validate
@bin bin/svnbench
+@bin bin/svnconflict
@bin bin/svndumpfilter
@bin bin/svnfsfs
@bin bin/svnlook
@@ -147,7 +150,6 @@ share/examples/subversion/check-modified
share/examples/subversion/client-side/
share/examples/subversion/client-side/bash_completion
share/examples/subversion/client-side/change-svn-wc-format.py
-share/examples/subversion/client-side/detach.py
share/examples/subversion/client-side/emacs/
share/examples/subversion/client-side/mergeinfo-sanitizer.py
share/examples/subversion/client-side/server-version.py
