Date: Thu, 25 Apr 2019 16:28:46 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500031 - in head: devel devel/p5-subversion devel/py-subversion devel/ruby-subversion devel/subversion devel/subversion-lts java/java-subversion security/subversion-gnome-keyring Message-ID: <201904251628.x3PGSkuG018938@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Thu Apr 25 16:28:46 2019 New Revision: 500031 URL: https://svnweb.freebsd.org/changeset/ports/500031 Log: Add LTS version of subversion to ports. PR: 235934 Added: head/devel/subversion-lts/ - copied from r481744, head/devel/subversion/ Deleted: head/devel/subversion-lts/Makefile.addons Modified: head/devel/Makefile head/devel/p5-subversion/Makefile head/devel/py-subversion/Makefile head/devel/ruby-subversion/Makefile head/devel/subversion-lts/Makefile head/devel/subversion-lts/Makefile.common head/devel/subversion-lts/pkg-descr head/devel/subversion/Makefile.addons head/java/java-subversion/Makefile head/security/subversion-gnome-keyring/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Apr 25 16:18:36 2019 (r500030) +++ head/devel/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -6283,6 +6283,7 @@ SUBDIR += styx SUBDIR += subversion SUBDIR += subversion-book + SUBDIR += subversion-lts SUBDIR += subversion19 SUBDIR += subversive SUBDIR += svk Modified: head/devel/p5-subversion/Makefile ============================================================================== --- head/devel/p5-subversion/Makefile Thu Apr 25 16:18:36 2019 (r500030) +++ head/devel/p5-subversion/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -11,6 +11,7 @@ USE_PERL5= build run PORTREVISION_112= 0 PORTREVISION_19= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes Modified: head/devel/py-subversion/Makefile ============================================================================== --- head/devel/py-subversion/Makefile Thu Apr 25 16:18:36 2019 (r500030) +++ head/devel/py-subversion/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -12,6 +12,7 @@ USE_PYTHON= flavors py3kplist PORTREVISION_112= 0 PORTREVISION_19= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes Modified: head/devel/ruby-subversion/Makefile ============================================================================== --- head/devel/ruby-subversion/Makefile Thu Apr 25 16:18:36 2019 (r500030) +++ head/devel/ruby-subversion/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -10,6 +10,7 @@ USE_RUBY= yes PORTREVISION_112= 0 PORTREVISION_19= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes Modified: head/devel/subversion-lts/Makefile ============================================================================== --- head/devel/subversion/Makefile Wed Oct 10 15:39:51 2018 (r481744) +++ head/devel/subversion-lts/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -2,11 +2,13 @@ # $FreeBSD$ PORTREVISION= 0 +PKGNAMESUFFIX= -lts MAINTAINER= lev@FreeBSD.org -COMMENT= Version control system +COMMENT= Version control system, long-time-support version CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \ + subversion-1.1[0-9].[0-9]* \ subversion1[0-9]-1.[0-9].[0-9]* USE_RC_SUBR= svnserve @@ -221,7 +223,7 @@ _mkrepos: .USE 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> Modified: head/devel/subversion-lts/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Wed Oct 10 15:39:51 2018 (r481744) +++ head/devel/subversion-lts/Makefile.common Thu Apr 25 16:28:46 2019 (r500031) @@ -17,7 +17,7 @@ LICENSE= APACHE20 CPE_VENDOR= apache CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]* \ - ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^1][0-9].[0-9]* + ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.1[0-9].[0-9]* LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libsqlite3.so:databases/sqlite3 \ Modified: head/devel/subversion-lts/pkg-descr ============================================================================== --- head/devel/subversion/pkg-descr Wed Oct 10 15:39:51 2018 (r481744) +++ head/devel/subversion-lts/pkg-descr Thu Apr 25 16:28:46 2019 (r500031) @@ -1,4 +1,6 @@ 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. + WWW: http://subversion.apache.org/ Modified: head/devel/subversion/Makefile.addons ============================================================================== --- head/devel/subversion/Makefile.addons Thu Apr 25 16:18:36 2019 (r500030) +++ head/devel/subversion/Makefile.addons Thu Apr 25 16:28:46 2019 (r500031) @@ -14,9 +14,10 @@ SVN_BUILD_ADDONS= yes .if ${WITH_SUBVERSION_VER} == 112 CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[^1][0-9].[0-9]* \ - ${PORTNAME}-1.1[0-1].[0-9]* + ${PORTNAME}-1.1[0-1].[0-9]* \ + ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* PORTREVISION= ${PORTREVISION_112} -PLIST_SUB+= SVN19="@comment " SVN112="" +PLIST_SUB+= SVN19="@comment " SVN112="" SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion OPTIONS_NAME= devel_subversion MASTERDIR= ${.CURDIR}/../../devel/subversion @@ -24,14 +25,24 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion .elif ${WITH_SUBVERSION_VER} == 19 PKGNAMESUFFIX:= ${PKGNAMESUFFIX}19 CONFLICTS_BUILD+= ${PORTNAME}-1.[^9].[0-9]* \ - ${PORTNAME}-1.[0-9][0-9].[0-9]* + ${PORTNAME}-1.[0-9][0-9].[0-9]* \ + ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* PORTREVISION= ${PORTREVISION_19} -PLIST_SUB+= SVN19="" SVN112="@comment " +PLIST_SUB+= SVN19="" SVN112="@comment " SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion19 OPTIONS_NAME= devel_subversion19 MASTERDIR= ${.CURDIR}/../../devel/subversion19 .include "${MASTERDIR}/Makefile.common" +.elif ${WITH_SUBVERSION_VER} == LTS +PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts +CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ + ${PORTNAME}-1.[0-9][0-9].[0-9]* +PORTREVISION= ${PORTREVISION_LTS} +PLIST_SUB+= SVN19="@comment " SVN112="@comment " SVNLTS="" +LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts +OPTIONS_NAME= devel_subversion-lts +MASTERDIR= ${.CURDIR}/../../devel/subversion-lts +.include "${MASTERDIR}/Makefile.common" .else -BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 112 (default) and 19 are supported +BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 112 (default), 19 and LTS are supported .endif - Modified: head/java/java-subversion/Makefile ============================================================================== --- head/java/java-subversion/Makefile Thu Apr 25 16:18:36 2019 (r500030) +++ head/java/java-subversion/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -18,6 +18,7 @@ JAVA_RUN= yes PORTREVISION_112= 0 PORTREVISION_19= 0 +PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes Modified: head/security/subversion-gnome-keyring/Makefile ============================================================================== --- head/security/subversion-gnome-keyring/Makefile Thu Apr 25 16:18:36 2019 (r500030) +++ head/security/subversion-gnome-keyring/Makefile Thu Apr 25 16:28:46 2019 (r500031) @@ -9,6 +9,7 @@ COMMENT= Gnome Keyring integration for Version control PORTREVISION_112= 0 PORTREVISION_19= 0 +PORTREVISION_LTS= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904251628.x3PGSkuG018938>