use versioned py-pygemnts

4 files changed, 12 insertions, 10 deletions

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 1535d49e57b..13a09203f3a 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2021/02/07 06:30:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=	cppcheck-2.1
 PKGREVISION=	6
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v3
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
 USE_LANGUAGES=		c c++0x
 USE_TOOLS+=		gmake
@@ -42,6 +41,8 @@ REPLACE_PYTHON+=	htmlreport/cppcheck-htmlreport
 
 TEST_TARGET=		test
 
+PYTHON_VERSIONED_DEPENDENCIES=	pygments
+
 .include "options.mk"
 
 .PHONY: man-install
@@ -49,7 +50,8 @@ post-install: man-install
 man-install:
 	${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../lang/python/application.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../math/z3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 33fd461272d..7a4a457d27c 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/01/01 09:05:07 taca Exp $
+# $NetBSD: Makefile,v 1.17 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=		phabricator-20170609
 PKGREVISION=		1
@@ -31,7 +31,6 @@ DEPENDS+=		${PHP_PKG_PREFIX}-apcu<5:../../www/php-apcu4
 .else
 DEPENDS+=		${PHP_PKG_PREFIX}-apcu>=5:../../www/php-apcu
 .endif
-#DEPENDS+=		:../../textproc/py-pygments?
 DEPENDS+=		libphutil-[0-9]*:../../devel/libphutil
 DEPENDS+=		arcanist-[0-9]*:../../devel/arcanist
 
diff --git a/devel/py-ipython5/Makefile b/devel/py-ipython5/Makefile
index 78a7d31a763..c564fdbb72d 100644
--- a/devel/py-ipython5/Makefile
+++ b/devel/py-ipython5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/08/31 23:07:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=	ipython-5.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,12 +22,11 @@ DEPENDS+=	${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
 DEPENDS+=	${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 DEPENDS+=	${PYPKGPREFIX}-pickleshare-[0-9]*:../../databases/py-pickleshare
 DEPENDS+=	${PYPKGPREFIX}-prompt_toolkit>=1.0.4:../../devel/py-prompt_toolkit
-DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-simplegeneric>0.8:../../devel/py-simplegeneric
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-traitlets>=4.2:../../devel/py-traitlets
 
-PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+PYTHON_VERSIONED_DEPENDENCIES+=	pygments setuptools
 
 USE_LANGUAGES=	# none
 
diff --git a/devel/py-path.py/Makefile b/devel/py-path.py/Makefile
index 73f9c621409..6be0dfa9b46 100644
--- a/devel/py-path.py/Makefile
+++ b/devel/py-path.py/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/04/09 08:10:46 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=	path.py-11.5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,15 +13,17 @@ LICENSE=	mit
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 TEST_DEPENDS+=	${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
 TEST_DEPENDS+=	${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
-TEST_DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.5:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES=	pygments:test
+
 do-test:
 	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_path.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"