Index: branches/2020Q4/devel/ipython5/Makefile
===================================================================
--- branches/2020Q4/devel/ipython5/Makefile	(revision 551674)
+++ branches/2020Q4/devel/ipython5/Makefile	(revision 551675)
@@ -1,61 +1,53 @@
 # Created by: Dryice Liu
 # $FreeBSD$
 
 PORTNAME=	ipython
 PORTVERSION=	5.10.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Enhanced Interactive Python shell
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.rst
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${PY_FLAVOR} \
 		${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-25<2.6:textproc/py-pygments-25@${PY_FLAVOR} \
+		${PY_PYGMENTS} \
 		${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
 USE_GCC=	yes # To be removed - Needed as a work-around for numpy, see PR ports/188114
 
 NO_ARCH=	yes
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
 PORTSCOUT=	limit:^5\.
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size@${PY_FLAVOR}
-.endif
-.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR}
-.endif
-
 post-install:
 	@${ECHO_CMD} "/EASY-INSTALL"	> ${WRKDIR}/ex.script
 	@${ECHO_CMD} "a"		>> ${WRKDIR}/ex.script
 	@${ECHO_CMD} "import os"	>> ${WRKDIR}/ex.script
 	@${ECHO_CMD} "os.environ[\"LD_LIBRARY_PATH\"]=\"${_GCC_RUNTIME}\"" >> ${WRKDIR}/ex.script
 	@${ECHO_CMD} "."		>> ${WRKDIR}/ex.script
 	@${ECHO_CMD} "x!"		>> ${WRKDIR}/ex.script
 	@for file in ${STAGEDIR}${PREFIX}/bin/*; do \
 		ex $${file} < ${WRKDIR}/ex.script > /dev/null; \
 	done
 
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: branches/2020Q4/devel/ipython5/files/patch-setup.py
===================================================================
--- branches/2020Q4/devel/ipython5/files/patch-setup.py	(nonexistent)
+++ branches/2020Q4/devel/ipython5/files/patch-setup.py	(revision 551675)
@@ -0,0 +1,26 @@
+# Release pygments because devel/ipython5 is python:3.5+ now.
+# https://github.com/ipython/ipython/pull/12174
+#
+# This avoids some conflicts:
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250074
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=250144
+--- setup.py.orig	2020-05-01 18:12:21 UTC
++++ setup.py
+@@ -182,7 +182,7 @@ extras_require = dict(
+     parallel = ['ipyparallel'],
+     qtconsole = ['qtconsole'],
+     doc = ['Sphinx>=1.3'],
+-    test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments<2.6', 'nbformat', 'ipykernel'],
++    test = ['nose>=0.10.1', 'requests', 'testpath', 'pygments', 'nbformat', 'ipykernel'],
+     terminal = [],
+     kernel = ['ipykernel'],
+     nbformat = ['nbformat'],
+@@ -197,7 +197,7 @@ install_requires = [
+     'simplegeneric>0.8',
+     'traitlets>=4.2',
+     'prompt_toolkit>=1.0.4,<2.0.0',
+-    'pygments<2.6',
++    'pygments',
+ ]
+ 
+ # Platform-specific dependencies:

Property changes on: branches/2020Q4/devel/ipython5/files/patch-setup.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 551674)
+++ branches/2020Q4	(revision 551675)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r551605