Date: Sat, 27 Jul 2019 21:01:05 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507474 - head/devel/subversion Message-ID: <201907272101.x6RL15tM006885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Sat Jul 27 21:01:05 2019 New Revision: 507474 URL: https://svnweb.freebsd.org/changeset/ports/507474 Log: devel/subversion: remove support for SVN 1.9 and 1.10 from Makefile.addons Modified: head/devel/subversion/Makefile.addons Modified: head/devel/subversion/Makefile.addons ============================================================================== --- head/devel/subversion/Makefile.addons Sat Jul 27 20:30:51 2019 (r507473) +++ head/devel/subversion/Makefile.addons Sat Jul 27 21:01:05 2019 (r507474) @@ -1,10 +1,6 @@ # Created by: lev@FreeBSD.org # $FreeBSD$ -# We can not use FLAVORS - pyhton uses them -#FLAVORS= svn110 svn19 -#FLAVOR?= ${FLAVORS:[1]} - WITH_SUBVERSION_VER?= 112 PKGDIR= ${.CURDIR} @@ -17,32 +13,21 @@ 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_112} -PLIST_SUB+= SVN19="@comment " SVN112="" SVNLTS="@comment " +PLIST_SUB+= SVN112="" SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion OPTIONS_NAME= devel_subversion MASTERDIR= ${.CURDIR}/../../devel/subversion .include "${MASTERDIR}/Makefile.common" -.elif ${WITH_SUBVERSION_VER} == 19 -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}19 -CONFLICTS_BUILD+= ${PORTNAME}-1.[^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 " 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="" +PLIST_SUB+= 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), 19 and LTS are supported +BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 112 (default) and LTS are supported .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907272101.x6RL15tM006885>