summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/p5-subversion/Makefile2
-rw-r--r--devel/py-subversion/Makefile2
-rw-r--r--devel/ruby-subversion/Makefile2
-rw-r--r--devel/subversion/Makefile16
-rw-r--r--devel/subversion/Makefile.common2
-rw-r--r--devel/subversion/distinfo6
-rw-r--r--devel/subversion/files/extra-patch-fbsd-template2
-rw-r--r--devel/subversion/files/patch-subversion-libsvn_client-conflicts.c98
-rw-r--r--java/java-subversion/Makefile2
-rw-r--r--security/subversion-gnome-keyring/Makefile2
-rw-r--r--security/subversion-kwallet/Makefile2
-rw-r--r--www/mod_dav_svn/Makefile2
12 files changed, 18 insertions, 120 deletions
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 356b7c5c23ef..612c2419c5b5 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -9,7 +9,7 @@ COMMENT= Perl bindings for Version control system
USES= perl5
USE_PERL5= build run
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
SVN_BUILD_BINDINGS= yes
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 5bc493424e9e..db6fd6d0b726 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -10,7 +10,7 @@ COMMENT= Python bindings for version control system
USES+= python
USE_PYTHON= flavors py3kplist
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
SVN_BUILD_BINDINGS= yes
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index 546d2efcd979..1bb6d1f4e43e 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -10,7 +10,7 @@ BROKEN_powerpc64= fails to compile: swigutil_rb.c: 'ruby_errinfo' undeclared
USE_RUBY= yes
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
SVN_BUILD_BINDINGS= yes
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index b33205c9fa82..bdb7e8b6c6d8 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,7 +1,7 @@
# Created by: rooneg@electricjellyfish.net
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system
@@ -27,8 +27,7 @@ OPTIONS_DEFINE= \
TEST \
TOOLS
-OPTIONS_DEFAULT=FREEBSD_TEMPLATE LZ4 \
- SERF TOOLS
+OPTIONS_DEFAULT=FREEBSD_TEMPLATE SERF TOOLS
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
GPG_AGENT_DESC= Enable GPG agent password store
@@ -130,13 +129,10 @@ pre-configure:
fi
.endif
.if ${PORT_OPTIONS:MSTATIC}
- @if ${GREP} -q ucol_close ${LOCALBASE}/lib/libsqlite3.a ; then \
- ${ECHO_MSG} "" ; \
- ${ECHO_MSG} "You cannot build static subversion if your SQLite3 is built with ICU enabled."; \
- ${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \
- ${ECHO_MSG} "" ; \
- ${FALSE} ; \
- fi
+LIBS_SQLITE3!= pkgconf --libs --static sqlite3
+LIBS+= ${LIBS_SQLITE3}
+# for work with ICU
+LIBS+= -lc++ -lm
.endif
post-configure:
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 226a769376c2..e219026c92a7 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= subversion
-PORTVERSION= 1.10.2
+PORTVERSION= 1.10.3
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index f03e61d7c9de..fadceb9712eb 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532350986
-SHA256 (subversion-1.10.2.tar.bz2) = 5b35e3a858d948de9e8892bf494893c9f7886782f6abbe166c0487c19cf6ed88
-SIZE (subversion-1.10.2.tar.bz2) = 8369762
+TIMESTAMP = 1539183639
+SHA256 (subversion-1.10.3.tar.bz2) = 9f0daac8b84aefaa77ad54dd05ab578ecc939d8e72d08c0cd4f61315921dd9fc
+SIZE (subversion-1.10.3.tar.bz2) = 8374465
diff --git a/devel/subversion/files/extra-patch-fbsd-template b/devel/subversion/files/extra-patch-fbsd-template
index 06e4464c5af3..ee4bf924c32e 100644
--- a/devel/subversion/files/extra-patch-fbsd-template
+++ b/devel/subversion/files/extra-patch-fbsd-template
@@ -133,7 +133,7 @@
+ svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR);
-+ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR);
++ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization (each collaborator)." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
diff --git a/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c b/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c
deleted file mode 100644
index f9ebece1b737..000000000000
--- a/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c
+++ /dev/null
@@ -1,98 +0,0 @@
-Upstream patch: fix automatic conflict resolution for files removed from
-the merge target when the merge source and merge target have no proper
-common ancestor. See <https://svn.apache.org/r1839662>.
-
---- subversion/libsvn_client/conflicts.c.orig 2018-07-12 04:00:15 UTC
-+++ subversion/libsvn_client/conflicts.c
-@@ -1059,6 +1059,9 @@ find_deleted_rev(void *baton,
- {
- apr_array_header_t *moves;
-
-+ if (b->moves_table == NULL)
-+ return SVN_NO_ERROR;
-+
- moves = apr_hash_get(b->moves_table, &log_entry->revision,
- sizeof(svn_revnum_t));
- if (moves)
-@@ -2223,8 +2226,8 @@ find_operative_moves(apr_array_header_t
- * If the node was replaced rather than deleted, set *REPLACING_NODE_KIND to
- * the node kind of the replacing node. Else, set it to svn_node_unknown.
- * Only request the log for revisions up to END_REV from the server.
-- * If the deleted node was moved, provide heads of move chains in *MOVES.
-- * If the node was not moved,set *MOVES to NULL.
-+ * If MOVES it not NULL, and the deleted node was moved, provide heads of
-+ * move chains in *MOVES, or, if the node was not moved, set *MOVES to NULL.
- */
- static svn_error_t *
- find_revision_for_suspected_deletion(svn_revnum_t *deleted_rev,
-@@ -2261,10 +2264,11 @@ find_revision_for_suspected_deletion(svn
- scratch_pool));
- victim_abspath = svn_client_conflict_get_local_abspath(conflict);
-
-- SVN_ERR(find_moves_in_revision_range(&moves_table, parent_repos_relpath,
-- repos_root_url, repos_uuid,
-- victim_abspath, start_rev, end_rev,
-- ctx, result_pool, scratch_pool));
-+ if (moves)
-+ SVN_ERR(find_moves_in_revision_range(&moves_table, parent_repos_relpath,
-+ repos_root_url, repos_uuid,
-+ victim_abspath, start_rev, end_rev,
-+ ctx, result_pool, scratch_pool));
-
- url = svn_path_url_add_component2(repos_root_url, parent_repos_relpath,
- scratch_pool);
-@@ -2289,7 +2293,8 @@ find_revision_for_suspected_deletion(svn
- b.repos_root_url = repos_root_url;
- b.repos_uuid = repos_uuid;
- b.ctx = ctx;
-- b.moves_table = moves_table;
-+ if (moves)
-+ b.moves_table = moves_table;
- b.result_pool = result_pool;
- SVN_ERR(svn_ra__dup_session(&b.extra_ra_session, ra_session, NULL,
- scratch_pool, scratch_pool));
-@@ -2319,7 +2324,7 @@ find_revision_for_suspected_deletion(svn
- {
- struct repos_move_info *move = b.move;
-
-- if (move)
-+ if (moves && move)
- {
- *deleted_rev = move->rev;
- *deleted_rev_author = move->rev_author;
-@@ -2337,7 +2342,8 @@ find_revision_for_suspected_deletion(svn
- *deleted_rev = SVN_INVALID_REVNUM;
- *deleted_rev_author = NULL;
- *replacing_node_kind = svn_node_unknown;
-- *moves = NULL;
-+ if (moves)
-+ *moves = NULL;
- }
- return SVN_NO_ERROR;
- }
-@@ -2346,10 +2352,11 @@ find_revision_for_suspected_deletion(svn
- *deleted_rev = b.deleted_rev;
- *deleted_rev_author = b.deleted_rev_author;
- *replacing_node_kind = b.replacing_node_kind;
-- SVN_ERR(find_operative_moves(moves, moves_table,
-- b.deleted_repos_relpath, b.deleted_rev,
-- ra_session, repos_root_url,
-- result_pool, scratch_pool));
-+ if (moves)
-+ SVN_ERR(find_operative_moves(moves, moves_table,
-+ b.deleted_repos_relpath, b.deleted_rev,
-+ ra_session, repos_root_url,
-+ result_pool, scratch_pool));
- }
-
- return SVN_NO_ERROR;
-@@ -2693,7 +2700,8 @@ conflict_tree_get_details_local_missing(
- end_rev = 0; /* ### We might walk through all of history... */
-
- SVN_ERR(find_revision_for_suspected_deletion(
-- &deleted_rev, &deleted_rev_author, &replacing_node_kind, &moves,
-+ &deleted_rev, &deleted_rev_author, &replacing_node_kind,
-+ yca_loc ? &moves : NULL,
- conflict, deleted_basename, parent_repos_relpath,
- parent_peg_rev, end_rev, related_repos_relpath, related_peg_rev,
- ctx, conflict->pool, scratch_pool));
diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile
index 364637cf678f..e8bc578ffb91 100644
--- a/java/java-subversion/Makefile
+++ b/java/java-subversion/Makefile
@@ -16,7 +16,7 @@ JAVA_BUILD= yes
JAVA_RUN= yes
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
SVN_BUILD_BINDINGS= yes
diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile
index ea88c5fc524f..48e9a7921dae 100644
--- a/security/subversion-gnome-keyring/Makefile
+++ b/security/subversion-gnome-keyring/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= security gnome
MAINTAINER= lev@FreeBSD.org
COMMENT= Gnome Keyring integration for Version control system
-PORTREVISION_110= 4
+PORTREVISION_110= 0
PORTREVISION_19= 0
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
diff --git a/security/subversion-kwallet/Makefile b/security/subversion-kwallet/Makefile
index 47350ce6f564..cd91f5d56748 100644
--- a/security/subversion-kwallet/Makefile
+++ b/security/subversion-kwallet/Makefile
@@ -10,7 +10,7 @@ COMMENT= KDE KWallet integration for Version control system
USE_KDE= kdelibs runtime
USES+= kde:4
-PORTREVISION_110= 6
+PORTREVISION_110= 0
PORTREVISION_19= 0
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile
index c2e3a70fbd31..78e3a8aa4818 100644
--- a/www/mod_dav_svn/Makefile
+++ b/www/mod_dav_svn/Makefile
@@ -11,7 +11,7 @@ COMMENT= Apache module for subversion serving
USES= apache:2.2+
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-14 06:45:02 +0000