Skip to content

Commit

Permalink
Update subversion to 1.11.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
@blacklion
blacklion committed Nov 1, 2018
1 parent 4667b98 commit 78d0353
Show file tree
Hide file tree
Showing 15 changed files with 139 additions and 290 deletions.
2 changes: 1 addition & 1 deletion devel/p5-subversion/Makefile
View file
Expand Up @@ -9,7 +9,7 @@ COMMENT= Perl bindings for Version control system
USES= perl5
USE_PERL5= build run

PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

SVN_BUILD_BINDINGS= yes
Expand Down
2 changes: 1 addition & 1 deletion devel/py-subversion/Makefile
View file
Expand Up @@ -10,7 +10,7 @@ COMMENT= Python bindings for version control system
USES+= python
USE_PYTHON= flavors py3kplist

PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

SVN_BUILD_BINDINGS= yes
Expand Down
2 changes: 1 addition & 1 deletion devel/ruby-subversion/Makefile
View file
Expand Up @@ -10,7 +10,7 @@ BROKEN_powerpc64= fails to compile: swigutil_rb.c: 'ruby_errinfo' undeclared

USE_RUBY= yes

PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

SVN_BUILD_BINDINGS= yes
Expand Down
4 changes: 2 additions & 2 deletions devel/subversion/Makefile
View file
Expand Up @@ -7,6 +7,7 @@ MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system

CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \
subversion-1.10.[0-9]* \
subversion1[0-9]-1.[0-9].[0-9]*

USE_RC_SUBR= svnserve
Expand Down Expand Up @@ -220,8 +221,7 @@ _mkrepos: .USE
.endif

svn-build-outputs-hack:
(cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf)
(cd ${WRKSRC} && python2 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} && 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)
${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons

.include <bsd.port.post.mk>
15 changes: 8 additions & 7 deletions devel/subversion/Makefile.addons
View file
Expand Up @@ -5,17 +5,18 @@
#FLAVORS= svn110 svn19
#FLAVOR?= ${FLAVORS:[1]}

WITH_SUBVERSION_VER?= 110
WITH_SUBVERSION_VER?= 111

PKGDIR= ${.CURDIR}

SVN_BUILD_ADDONS= yes

.if ${WITH_SUBVERSION_VER} == 110
.if ${WITH_SUBVERSION_VER} == 111
CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \
${PORTNAME}-1.[^1][0-9].[0-9]*
PORTREVISION= ${PORTREVISION_110}
PLIST_SUB+= SVN19="@comment " SVN110=""
${PORTNAME}-1.[^1][0-9].[0-9]* \
${PORTNAME}-1.10.[0-9]*
PORTREVISION= ${PORTREVISION_111}
PLIST_SUB+= SVN19="@comment " SVN111=""
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
OPTIONS_NAME= devel_subversion
MASTERDIR= ${.CURDIR}/../../devel/subversion
Expand All @@ -25,12 +26,12 @@ PKGNAMESUFFIX:= ${PKGNAMESUFFIX}19
CONFLICTS_BUILD+= ${PORTNAME}-1.[^9].[0-9]* \
${PORTNAME}-1.[0-9][0-9].[0-9]*
PORTREVISION= ${PORTREVISION_19}
PLIST_SUB+= SVN19="" SVN110="@comment "
PLIST_SUB+= SVN19="" SVN111="@comment "
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion19
OPTIONS_NAME= devel_subversion19
MASTERDIR= ${.CURDIR}/../../devel/subversion19
.include "${MASTERDIR}/Makefile.common"
.else
BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 110 (default) and 19 are supported
BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 111 (default) and 19 are supported
.endif

2 changes: 1 addition & 1 deletion devel/subversion/Makefile.common
View file
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME?= subversion
PORTVERSION= 1.10.3
PORTVERSION= 1.11.0
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
Expand Down
6 changes: 3 additions & 3 deletions devel/subversion/distinfo
View file
@@ -1,3 +1,3 @@
TIMESTAMP = 1539183639
SHA256 (subversion-1.10.3.tar.bz2) = 9f0daac8b84aefaa77ad54dd05ab578ecc939d8e72d08c0cd4f61315921dd9fc
SIZE (subversion-1.10.3.tar.bz2) = 8374465
TIMESTAMP = 1540997392
SHA256 (subversion-1.11.0.tar.bz2) = 87c44344b074ac2e9ed7ca9675fb1e5b197051c3deecfe5934e5f6aefbf83e56
SIZE (subversion-1.11.0.tar.bz2) = 8490744
366 changes: 113 additions & 253 deletions devel/subversion/files/build-outputs.mk.addons
View file

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions devel/subversion/files/extra-patch-build.conf
View file

This file was deleted.

9 changes: 4 additions & 5 deletions devel/subversion/pkg-plist
View file
Expand Up @@ -233,11 +233,6 @@ libdata/pkgconfig/libsvn_wc.pc
%%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
Expand All @@ -259,6 +254,7 @@ libdata/pkgconfig/libsvn_wc.pc
%%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
Expand Down Expand Up @@ -358,6 +354,7 @@ libdata/pkgconfig/libsvn_wc.pc
%%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
Expand All @@ -366,8 +363,10 @@ libdata/pkgconfig/libsvn_wc.pc
%%DATADIR%%/dist/backport.pl
%%DATADIR%%/dist/backport_tests.py
%%DATADIR%%/dist/checksums.py
%%DATADIR%%/dist/create-minor-release-branch.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
Expand Down
2 changes: 1 addition & 1 deletion java/java-subversion/Makefile
View file
Expand Up @@ -16,7 +16,7 @@ JAVA_BUILD= yes
JAVA_RUN= yes


PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

SVN_BUILD_BINDINGS= yes
Expand Down
2 changes: 1 addition & 1 deletion java/java-subversion/pkg-plist
View file
Expand Up @@ -3,4 +3,4 @@ lib/libsvnjavahl-1.so
lib/libsvnjavahl-1.so.0
lib/libsvnjavahl-1.so.0.0.0
lib/svn-javahl/svn-javahl.jar
@dir lib/svn-javahl/include

2 changes: 1 addition & 1 deletion security/subversion-gnome-keyring/Makefile
View file
Expand Up @@ -7,7 +7,7 @@ CATEGORIES= security gnome
MAINTAINER= lev@FreeBSD.org
COMMENT= Gnome Keyring integration for Version control system

PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
Expand Down
2 changes: 1 addition & 1 deletion security/subversion-kwallet/Makefile
View file
Expand Up @@ -10,7 +10,7 @@ COMMENT= KDE KWallet integration for Version control system
USE_KDE= kdelibs runtime
USES+= kde:4

PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
Expand Down
2 changes: 1 addition & 1 deletion www/mod_dav_svn/Makefile
View file
Expand Up @@ -11,7 +11,7 @@ COMMENT= Apache module for subversion serving

USES= apache:2.2+

PORTREVISION_110= 0
PORTREVISION_111= 0
PORTREVISION_19= 0

.include "${.CURDIR}/../../devel/subversion/Makefile.addons"
Expand Down

0 comments on commit 78d0353

Please sign in to comment.