From owner-svn-ports-head@freebsd.org Mon Sep 21 04:22:55 2020 Return-Path: Delivered-To: svn-ports-head@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 815683E5111; Mon, 21 Sep 2020 04:22:55 +0000 (UTC) (envelope-from yuri@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bvrrv2tdFz3SfQ; Mon, 21 Sep 2020 04:22:55 +0000 (UTC) (envelope-from yuri@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 2C1FD8C86; Mon, 21 Sep 2020 04:22:55 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08L4MtI4082949; Mon, 21 Sep 2020 04:22:55 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08L4MsYG082945; Mon, 21 Sep 2020 04:22:54 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009210422.08L4MsYG082945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 21 Sep 2020 04:22:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549418 - in head: devel/ipython5 textproc textproc/py-pygments textproc/py-pygments-25 X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head: devel/ipython5 textproc textproc/py-pygments textproc/py-pygments-25 X-SVN-Commit-Revision: 549418 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2020 04:22:55 -0000 Author: yuri Date: Mon Sep 21 04:22:54 2020 New Revision: 549418 URL: https://svnweb.freebsd.org/changeset/ports/549418 Log: devel/ipython5: Fix build after the recent update of textproc/py-pygments by adding textproc/py-pygments-25 because ipython5 requires this version Reported by: linimon Added: head/textproc/py-pygments-25/ - copied from r544739, head/textproc/py-pygments/ Modified: head/devel/ipython5/Makefile head/textproc/Makefile head/textproc/py-pygments-25/Makefile head/textproc/py-pygments/Makefile Modified: head/devel/ipython5/Makefile ============================================================================== --- head/devel/ipython5/Makefile Mon Sep 21 03:45:27 2020 (r549417) +++ head/devel/ipython5/Makefile Mon Sep 21 04:22:54 2020 (r549418) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit1>=1.0.4<2.0.0:devel/py-prompt_toolkit1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments<2.6:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments-25<2.6:textproc/py-pygments-25@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR} Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Mon Sep 21 03:45:27 2020 (r549417) +++ head/textproc/Makefile Mon Sep 21 04:22:54 2020 (r549418) @@ -1324,6 +1324,7 @@ SUBDIR += py-pycountry SUBDIR += py-pygccxml SUBDIR += py-pygments + SUBDIR += py-pygments-25 SUBDIR += py-pygtail SUBDIR += py-pyhamcrest SUBDIR += py-pyjade Modified: head/textproc/py-pygments-25/Makefile ============================================================================== --- head/textproc/py-pygments/Makefile Wed Aug 12 09:36:33 2020 (r544739) +++ head/textproc/py-pygments-25/Makefile Mon Sep 21 04:22:54 2020 (r549418) @@ -7,6 +7,7 @@ PORTREVISION= 0 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= -25 DISTNAME= Pygments-${PORTVERSION} MAINTAINER= nivit@FreeBSD.org @@ -17,6 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python USE_PYTHON= distutils concurrent autoplist + +CONFLICTS_INSTALL= py??-pygments NO_ARCH= yes Modified: head/textproc/py-pygments/Makefile ============================================================================== --- head/textproc/py-pygments/Makefile Mon Sep 21 03:45:27 2020 (r549417) +++ head/textproc/py-pygments/Makefile Mon Sep 21 04:22:54 2020 (r549418) @@ -18,6 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python USE_PYTHON= distutils concurrent autoplist +CONFLICTS_INSTALL= py??-pygments-25 + NO_ARCH= yes .include