Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Sep 2020 04:22:54 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
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
Message-ID:  <202009210422.08L4MsYG082945@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009210422.08L4MsYG082945>