From owner-svn-ports-all@freebsd.org Sat Jul 27 21:01:05 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C75E5C1E96; Sat, 27 Jul 2019 21:01:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2CD66E4B6; Sat, 27 Jul 2019 21:01:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A123533E; Sat, 27 Jul 2019 21:01:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6RL15ao006886; Sat, 27 Jul 2019 21:01:05 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6RL15tM006885; Sat, 27 Jul 2019 21:01:05 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201907272101.x6RL15tM006885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 27 Jul 2019 21:01:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507474 - head/devel/subversion X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/devel/subversion X-SVN-Commit-Revision: 507474 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A2CD66E4B6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jul 2019 21:01:05 -0000 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