svn commit: r481744 - in head: devel/p5-subversion devel/py-subversion devel/ruby-subversion devel/subversion devel/subversion/files java/java-subversion security/subversion-gnome-keyring security/...
Lev A. Serebryakov
lev at FreeBSD.org
Wed Oct 10 15:39:54 UTC 2018
Author: lev
Date: Wed Oct 10 15:39:51 2018
New Revision: 481744
URL: https://svnweb.freebsd.org/changeset/ports/481744
Log:
(1) Update to 1.10.3.
(2) Fix STATIC build.
(3) Expand FreeBSD template for better explanation of "Sponsored by"
PR: (2) 220660, (3) 228362
Deleted:
head/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c
Modified:
head/devel/p5-subversion/Makefile
head/devel/py-subversion/Makefile
head/devel/ruby-subversion/Makefile
head/devel/subversion/Makefile
head/devel/subversion/Makefile.common
head/devel/subversion/distinfo
head/devel/subversion/files/extra-patch-fbsd-template
head/java/java-subversion/Makefile
head/security/subversion-gnome-keyring/Makefile
head/security/subversion-kwallet/Makefile
head/www/mod_dav_svn/Makefile
Modified: head/devel/p5-subversion/Makefile
==============================================================================
--- head/devel/p5-subversion/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/p5-subversion/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -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
Modified: head/devel/py-subversion/Makefile
==============================================================================
--- head/devel/py-subversion/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/py-subversion/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -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
Modified: head/devel/ruby-subversion/Makefile
==============================================================================
--- head/devel/ruby-subversion/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/ruby-subversion/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -10,7 +10,7 @@ BROKEN_powerpc64= fails to compile: swigutil_rb.c: 'ru
USE_RUBY= yes
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
SVN_BUILD_BINDINGS= yes
Modified: head/devel/subversion/Makefile
==============================================================================
--- head/devel/subversion/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/subversion/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -1,7 +1,7 @@
# Created by: rooneg at electricjellyfish.net
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
MAINTAINER= lev at 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:
Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/subversion/Makefile.common Wed Oct 10 15:39:51 2018 (r481744)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= subversion
-PORTVERSION= 1.10.2
+PORTVERSION= 1.10.3
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
Modified: head/devel/subversion/distinfo
==============================================================================
--- head/devel/subversion/distinfo Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/subversion/distinfo Wed Oct 10 15:39:51 2018 (r481744)
@@ -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
Modified: head/devel/subversion/files/extra-patch-fbsd-template
==============================================================================
--- head/devel/subversion/files/extra-patch-fbsd-template Wed Oct 10 15:39:30 2018 (r481743)
+++ head/devel/subversion/files/extra-patch-fbsd-template Wed Oct 10 15:39:51 2018 (r481744)
@@ -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);
Modified: head/java/java-subversion/Makefile
==============================================================================
--- head/java/java-subversion/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/java/java-subversion/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -16,7 +16,7 @@ JAVA_BUILD= yes
JAVA_RUN= yes
-PORTREVISION_110= 1
+PORTREVISION_110= 0
PORTREVISION_19= 0
SVN_BUILD_BINDINGS= yes
Modified: head/security/subversion-gnome-keyring/Makefile
==============================================================================
--- head/security/subversion-gnome-keyring/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/security/subversion-gnome-keyring/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -7,7 +7,7 @@ CATEGORIES= security gnome
MAINTAINER= lev at 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"
Modified: head/security/subversion-kwallet/Makefile
==============================================================================
--- head/security/subversion-kwallet/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/security/subversion-kwallet/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -10,7 +10,7 @@ COMMENT= KDE KWallet integration for Version control s
USE_KDE= kdelibs runtime
USES+= kde:4
-PORTREVISION_110= 6
+PORTREVISION_110= 0
PORTREVISION_19= 0
.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
Modified: head/www/mod_dav_svn/Makefile
==============================================================================
--- head/www/mod_dav_svn/Makefile Wed Oct 10 15:39:30 2018 (r481743)
+++ head/www/mod_dav_svn/Makefile Wed Oct 10 15:39:51 2018 (r481744)
@@ -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"
More information about the svn-ports-head
mailing list