devel/subversion-lts: update port to next LTS version: 1.14.2
PR: 253566 Approved by: jrm (mentor), otis (mentor), lev Release Notes: https://subversion.apache.org/docs/release-notes/1.14 Differential Revision: https://reviews.freebsd.org/D42348
This commit is contained in:
Michael Osipov
parent
b890ffa426
commit
914eca41bf
12 changed files with 989 additions and 1034 deletions
9
UPDATING
9
UPDATING
|
|
@ -5,6 +5,15 @@ they are unavoidable.
|
|||
You should get into the habit of checking this file for changes each time
|
||||
you update your ports collection, before attempting any port upgrades.
|
||||
|
||||
20231031:
|
||||
AFFECTS: users of devel/subversion-lts
|
||||
AUTHOR: michaelo@FreeBSD.org
|
||||
|
||||
devel/subversion-lts has been updated from 1.10.x to the latest LTS version,
|
||||
1.14.x. Some changes between these releases may require attention from
|
||||
administrators or users.
|
||||
Refer to https://subversion.apache.org/docs/release-notes/1.14.html#compat-misc for details.
|
||||
|
||||
20231028:
|
||||
AFFECTS: users of net-mgmt/nfdump
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ WWW= https://subversion.apache.org/
|
|||
|
||||
BUILD_DEPENDS= ${LOCALBASE}/include/py3c.h:devel/py3c
|
||||
|
||||
USES= python:2.7+
|
||||
USES= python
|
||||
USE_PYTHON= flavors py3kplist
|
||||
|
||||
# There is bug in python bindings Makefile
|
||||
|
|
@ -17,12 +17,6 @@ PORTREVISION_LTS= 0
|
|||
|
||||
SVN_BUILD_BINDINGS= yes
|
||||
|
||||
.if ${FLAVOR:Upy37:Mpy3*}
|
||||
WITH_SUBVERSION_VER= 114
|
||||
.else
|
||||
WITH_SUBVERSION_VER= LTS
|
||||
.endif
|
||||
|
||||
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
|
||||
|
||||
CATEGORIES+= python
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
PORTREVISION= 5
|
||||
PORTREVISION= 0
|
||||
PKGNAMESUFFIX= -lts
|
||||
|
||||
MAINTAINER= lev@FreeBSD.org
|
||||
COMMENT= Version control system, long-time-support version
|
||||
COMMENT= Version control system, long-term-support version
|
||||
WWW= https://subversion.apache.org/
|
||||
|
||||
CONFLICTS_INSTALL= subversion
|
||||
|
|
@ -14,8 +14,7 @@ PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README
|
|||
OPTIONS_DEFINE= \
|
||||
BDB \
|
||||
DOCS \
|
||||
FREEBSD_TEMPLATE\
|
||||
GPG_AGENT \
|
||||
GPG_AGENT \
|
||||
NLS \
|
||||
SASL \
|
||||
SERF \
|
||||
|
|
@ -24,18 +23,18 @@ OPTIONS_DEFINE= \
|
|||
TEST \
|
||||
TOOLS
|
||||
|
||||
OPTIONS_DEFAULT=SERF TOOLS
|
||||
OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS
|
||||
|
||||
GPG_AGENT_DESC= Enable GPG agent password store
|
||||
SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module
|
||||
STATIC_DESC= Build static version (no shared libs)
|
||||
STATIC_DESC= No shared libs (disables SVN integration)
|
||||
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)
|
||||
TEST_DESC= Run subversion test suite
|
||||
TOOLS_DESC= Install several tools
|
||||
|
||||
SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper
|
||||
|
||||
USES+= shebangfix python:2.7,env
|
||||
USES+= shebangfix python:env
|
||||
python_OLD_CMD+= "/bin/env python"
|
||||
SHEBANG_REGEX= ./tools/.*
|
||||
|
||||
|
|
@ -84,6 +83,14 @@ WITH_REPOSITORY_CREATION= yes
|
|||
MKREPOS_TARGET= _mkrepos
|
||||
.endif
|
||||
|
||||
BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \
|
||||
svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion
|
||||
|
||||
TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \
|
||||
svn-populate-node-origins-index svnauthz \
|
||||
svnauthz-validate svnconflict svndiff svndiff3 \
|
||||
svndiff4 svnmover svnraisetreeconflict x509-parser
|
||||
|
||||
pre-everything::
|
||||
@${ECHO_MSG} ""
|
||||
.if defined(WITH_REPOSITORY_CREATION)
|
||||
|
|
@ -113,9 +120,9 @@ pre-everything::
|
|||
pre-configure:
|
||||
.if ${PORT_OPTIONS:MBDB}
|
||||
@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
|
||||
if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \
|
||||
if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" -a "$${BDB_VERSION}" != "18" ] ; then \
|
||||
${ECHO_MSG} "" ; \
|
||||
${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \
|
||||
${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \
|
||||
${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
|
||||
${ECHO_MSG} "" ; \
|
||||
${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
|
||||
|
|
@ -130,14 +137,6 @@ LIBS+= ${LIBS_SQLITE3}
|
|||
LIBS+= -lc++ -lm
|
||||
.endif
|
||||
|
||||
BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \
|
||||
svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion
|
||||
|
||||
TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \
|
||||
svn-populate-node-origins-index svnauthz \
|
||||
svnauthz-validate svnconflict svndiff svndiff3 \
|
||||
svndiff4 svnmover svnraisetreeconflict x509-parser
|
||||
|
||||
post-configure:
|
||||
# Enable GNOME Keyring / KWallet support in main code, as it is harmless
|
||||
@${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h
|
||||
|
|
@ -227,8 +226,7 @@ _mkrepos: .USE
|
|||
.endif
|
||||
|
||||
svn-build-outputs-hack:
|
||||
(cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf)
|
||||
(cd ${WRKSRC} && python2.7 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
|
||||
(cd ${WRKSRC} && python gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
|
||||
${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME?= subversion
|
||||
PORTVERSION= 1.10.8
|
||||
PORTVERSION= 1.14.2
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES+= devel
|
||||
MASTER_SITES= APACHE/subversion
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1649855225
|
||||
SHA256 (subversion-1.10.8.tar.bz2) = 0a73ba3127b5a2fffb8fee2b702984f2a808de710a8db28b7dd4010d8be50e5a
|
||||
SIZE (subversion-1.10.8.tar.bz2) = 8394726
|
||||
TIMESTAMP = 1649858194
|
||||
SHA256 (subversion-1.14.2.tar.bz2) = c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
|
||||
SIZE (subversion-1.14.2.tar.bz2) = 8606570
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,11 +1,17 @@
|
|||
--- Makefile.in.orig 2015-09-18 15:56:29.000000000 +0300
|
||||
+++ Makefile.in 2015-10-15 01:29:59.889146000 +0300
|
||||
@@ -86,7 +86,7 @@
|
||||
swig_pydir_extra = @libdir@/svn-python/svn
|
||||
--- Makefile.in.orig 2020-05-31 20:53:15 UTC
|
||||
+++ Makefile.in
|
||||
@@ -89,11 +89,11 @@ 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 = /usr/local/lib/python3.8/site-packages/libsvn
|
||||
+swig_pydir_extra = /usr/local/lib/python3.8/site-packages/svn
|
||||
swig_pldir = @libdir@/svn-perl
|
||||
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
|
||||
-toolsdir = @bindir@/svn-tools
|
||||
+toolsdir = @bindir@
|
||||
|
||||
# where to install pkg-config files
|
||||
pkgconfig_dir = $(datadir)/pkgconfig
|
||||
pkgconfig_dir = $(prefix)/libdata/pkgconfig
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- build.conf.orig 2018-04-19 20:21:34.859567000 +0300
|
||||
+++ build.conf 2018-04-19 20:21:55.939112000 +0300
|
||||
@@ -430,7 +430,7 @@
|
||||
--- build.conf.orig 2020-04-08 04:00:55 UTC
|
||||
+++ build.conf
|
||||
@@ -434,7 +434,7 @@ type = apache-mod
|
||||
path = tools/server-side/mod_dontdothat
|
||||
nonlibs = mod_dav_svn apr aprutil
|
||||
libs = libsvn_subr libhttpd
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Subversion is a version control system designed to be as similar to cvs(1)
|
||||
as possible, while fixing many outstanding problems with cvs(1).
|
||||
|
||||
This port contains LTS release.
|
||||
This port contains an LTS release.
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ 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_opt_impl.h
|
||||
include/subversion-1/svn_path.h
|
||||
include/subversion-1/svn_pools.h
|
||||
include/subversion-1/svn_props.h
|
||||
|
|
@ -63,6 +64,7 @@ include/subversion-1/svn_string.h
|
|||
include/subversion-1/svn_subst.h
|
||||
include/subversion-1/svn_time.h
|
||||
include/subversion-1/svn_types.h
|
||||
include/subversion-1/svn_types_impl.h
|
||||
include/subversion-1/svn_user.h
|
||||
include/subversion-1/svn_utf.h
|
||||
include/subversion-1/svn_version.h
|
||||
|
|
@ -198,14 +200,6 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnclean.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnlog.sh
|
||||
%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
|
||||
%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
|
||||
%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
|
||||
%%SERF%%%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/setenv.sh
|
||||
|
|
@ -214,6 +208,7 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck.sh
|
||||
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnclean.sh
|
||||
%%DATADIR%%/buildbot/slaves/svnbot-common/README
|
||||
%%DATADIR%%/buildbot/slaves/ubuntu-x64/svnbuild.sh
|
||||
%%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
|
||||
%%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck.sh
|
||||
|
|
@ -233,11 +228,6 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svncheck.bat
|
||||
%%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnclean.bat
|
||||
%%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnlog.bat
|
||||
%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl
|
||||
%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnbuild.bat
|
||||
%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svncheck.bat
|
||||
%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnclean.bat
|
||||
%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnlog.bat
|
||||
%%DATADIR%%/client-side/bash_completion
|
||||
%%DATADIR%%/client-side/bash_completion_test
|
||||
%%DATADIR%%/client-side/change-svn-wc-format.py
|
||||
|
|
@ -259,6 +249,7 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/client-side/svn-viewspec.py
|
||||
%%DATADIR%%/client-side/svnconflict/README
|
||||
%%DATADIR%%/client-side/svnconflict/svnconflict.c
|
||||
%%DATADIR%%/client-side/svnviewspec_test.py
|
||||
%%DATADIR%%/client-side/wcfind
|
||||
%%DATADIR%%/dev/analyze-svnlogs.py
|
||||
%%DATADIR%%/dev/aprerr.txt
|
||||
|
|
@ -360,19 +351,23 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/dist/backport_tests_data/backport_branch_with_original_revision.dump
|
||||
%%DATADIR%%/dist/backport_tests_data/backport_branches.dump
|
||||
%%DATADIR%%/dist/backport_tests_data/backport_indented_entry.dump
|
||||
%%DATADIR%%/dist/backport_tests_data/backport_logsummary_colon.dump
|
||||
%%DATADIR%%/dist/backport_tests_data/backport_multirevisions.dump
|
||||
%%DATADIR%%/dist/backport_tests_data/backport_two_approveds.dump
|
||||
%%DATADIR%%/dist/backport_tests_data/backport_unicode_entry.dump
|
||||
%%DATADIR%%/dist/backport_tests_pl.py
|
||||
%%DATADIR%%/dist/backport_tests_py.py
|
||||
%%DATADIR%%/dist/changes-to-html.py
|
||||
%%DATADIR%%/dist/checksums.py
|
||||
%%DATADIR%%/dist/detect-conflicting-backports.py
|
||||
%%DATADIR%%/dist/dist.sh
|
||||
%%DATADIR%%/dist/edit-N-log-messages
|
||||
%%DATADIR%%/dist/extract-for-examination.sh
|
||||
%%DATADIR%%/dist/merge-approved-backports.py
|
||||
%%DATADIR%%/dist/nightly.sh
|
||||
%%DATADIR%%/dist/nominate.pl
|
||||
%%DATADIR%%/dist/rat-excludes
|
||||
%%DATADIR%%/dist/release-lines.yaml
|
||||
%%DATADIR%%/dist/release.py
|
||||
%%DATADIR%%/dist/security/__init__.py
|
||||
%%DATADIR%%/dist/security/_gnupg.py
|
||||
|
|
@ -380,9 +375,12 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/dist/security/mailer.py
|
||||
%%DATADIR%%/dist/security/mailinglist.py
|
||||
%%DATADIR%%/dist/security/parser.py
|
||||
%%DATADIR%%/dist/templates/STATUS.ezt
|
||||
%%DATADIR%%/dist/templates/download.ezt
|
||||
%%DATADIR%%/dist/templates/rc-news.ezt
|
||||
%%DATADIR%%/dist/templates/rc-release-ann.ezt
|
||||
%%DATADIR%%/dist/templates/release-notes-lts.ezt
|
||||
%%DATADIR%%/dist/templates/release-notes.ezt
|
||||
%%DATADIR%%/dist/templates/stable-news.ezt
|
||||
%%DATADIR%%/dist/templates/stable-release-ann.ezt
|
||||
%%DATADIR%%/dist/test.sh
|
||||
|
|
@ -470,3 +468,4 @@ man/man8/svnserve.8.gz
|
|||
%%DATADIR%%/server-side/test_svn_server_log_parse.py
|
||||
%%DATADIR%%/xslt/svnindex.css
|
||||
%%DATADIR%%/xslt/svnindex.xsl
|
||||
@dir %%DATADIR%%/buildbot/slaves/svn-arm64-gentoo
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \
|
|||
${PORTNAME}-1.1[0-1].[0-9]* \
|
||||
${PORTNAME}-lts-1.[0-9][0-9].[0-9]*
|
||||
PORTREVISION= ${PORTREVISION_114:U0}
|
||||
PLIST_SUB+= SVN115="" SVNLTS="@comment "
|
||||
PLIST_SUB+= SVN114="" SVNLTS="@comment "
|
||||
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
|
||||
OPTIONS_NAME= devel_subversion
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@ WWW= https://subversion.apache.org/
|
|||
|
||||
USES= apache
|
||||
|
||||
PORTREVISION_114= 0
|
||||
PORTREVISION_LTS= 0
|
||||
|
||||
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
|
||||
|
||||
CONFIGURE_ARGS+= --with-apxs=${APXS} \
|
||||
|
|
|
|||
Loading…
Reference in a new issue