This updates devel/subversion to 1.14.0.
Release notes: https://subversion.apache.org/docs/release-notes/1.14.html
For the actual list of changes since 1.13.0, see the CHANGES file:
https://svn.apache.org/repos/asf/subversion/trunk/CHANGES
Not a lot has changed since 1.13.0, so this is really more of a
maintenance update from the point of view of our ports tree.
The big ticket item relative to 1.13.0 is much better Python3 support.
The new devel/py3c port which was imported today is now required.
However, the Python bindings in our port remain on Python 2.7 for now to
avoid problems with consumers in the ports tree which do not yet support
Python3. AFAIK those are cvs2svn and trac. I am now setting MODPY_VERSION
explicitly to make sure we don't flip this port to a newer version by
accident.
I am switching to Ruby 2.7 since Subversion's Ruby bindings can now work
with it.
ok?
diff 24cae81146b73ebd1005423a1e7a1b85981687f0 /usr/ports
blob - 3ca5215b4bf8aed2aaafd4b25271aec3c474a3af
file + devel/subversion/Makefile
--- devel/subversion/Makefile
+++ devel/subversion/Makefile
@@ -7,7 +7,7 @@ COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
-VERSION= 1.13.0
+VERSION= 1.14.0
DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
FULLPKGNAME-perl= p5-SVN-${VERSION}
@@ -21,17 +21,15 @@ FULLPKGPATH-ap2= devel/subversion,-ap2
FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring
-REVISION-main= 1
-REVISION-perl= 0
-REVISION-python= 0
-REVISION-ruby= 0
-REVISION-ap2= 0
-
-MODRUBY_REV ?= 2.5
+MODRUBY_REV ?= 2.7
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
MODRUBY_BINREV= ${MODRUBY_REV:S/.//}
-SO_VERSION= 5.0
+# Subversion supports either python2 or python3 bindings. Consumers in the
+# ports tree are not yet ready for python3. So keep using python 2.7 for now.
+MODPY_VERSION ?= 2.7
+
+SO_VERSION= 6.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 \
@@ -69,7 +67,8 @@ MODULES= lang/python
WANTLIB= expat iconv intl lz4 m pthread z
-BUILD_DEPENDS= devel/gettext,-tools
+BUILD_DEPENDS= devel/gettext,-tools \
+ devel/py3c
MULTI_PACKAGES = -main -ap2 -perl -python -ruby -gnome-keyring
@@ -143,7 +142,7 @@ RUN_DEPENDS-gnome-keyring=
MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= PYTHON2=${MODPY_BIN} MKDIR="/bin/mkdir -p"
+CONFIGURE_ENV= PYTHON=${MODPY_BIN} MKDIR="/bin/mkdir -p"
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} \
--without-jikes \
--without-jdk \
blob - f3e9a934ed16ecc22fe06886f22fcc6fb457fe39
file + devel/subversion/distinfo
--- devel/subversion/distinfo
+++ devel/subversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (subversion-1.13.0.tar.bz2) =
vFDOLD+qexrpEDxDIBffmN/ZicQjn5+CcLs6MU7Z5b0=
-SIZE (subversion-1.13.0.tar.bz2) = 8508122
+SHA256 (subversion-1.14.0.tar.bz2) =
a6jiGPn5eoOnmeWKPG2hIh0DSxjZ2Mu8tuxSqxFyIQI=
+SIZE (subversion-1.14.0.tar.bz2) = 8497531
blob - facc9081810686bf9f2549d8846e28032e04b64b
file + devel/subversion/patches/patch-Makefile_in
--- devel/subversion/patches/patch-Makefile_in
+++ devel/subversion/patches/patch-Makefile_in
@@ -17,20 +17,14 @@ Index: Makefile.in
# where to install pkg-config files
pkgconfig_dir = $(datadir)/pkgconfig
-@@ -150,13 +150,13 @@ BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_
+@@ -150,8 +150,8 @@ BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_
SWIG = @SWIG@
- SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
+ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ @SVN_PY3C_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@ -L@libdir@
+SWIG_PY_LIBS = -lpython${MODPY_VERSION}
+ SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
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@
- SWIG_RB_LINK = @SWIG_RB_LINK@
--SWIG_RB_LIBS = @SWIG_RB_LIBS@
-+SWIG_RB_LIBS = -lruby${MODRUBY_BINREV}
- SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@
- SWIG_RB_SITE_ARCH_DIR = @SWIG_RB_SITE_ARCH_DIR@
- SWIG_RB_TEST_VERBOSE = @SWIG_RB_TEST_VERBOSE@
+ SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
blob - 10f71448f892f604a77d21e8a59dc1e1d0840cc2
file + devel/subversion/pkg/PLIST-python
--- devel/subversion/pkg/PLIST-python
+++ devel/subversion/pkg/PLIST-python
@@ -31,21 +31,13 @@ lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.la
@so lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.so
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
-lib/python${MODPY_VERSION}/site-packages/libsvn/ra.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/repos.py
-lib/python${MODPY_VERSION}/site-packages/libsvn/repos.pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/wc.py
-lib/python${MODPY_VERSION}/site-packages/libsvn/wc.pyc
lib/python${MODPY_VERSION}/site-packages/svn/
lib/python${MODPY_VERSION}/site-packages/svn/__init__.py
lib/python${MODPY_VERSION}/site-packages/svn/__init__.pyc
