CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 6 Apr 2021 14:36:48 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr  6 14:36:48 UTC 2021

Modified Files:
        pkgsrc/devel/cppcheck: Makefile
        pkgsrc/devel/phabricator: Makefile
        pkgsrc/devel/py-ipython5: Makefile
        pkgsrc/devel/py-path.py: Makefile
        pkgsrc/math/py-infinity: Makefile
        pkgsrc/math/py-intervals: Makefile

Log Message:
use versioned py-pygemnts


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/cppcheck/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/phabricator/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-ipython5/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-path.py/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-infinity/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/py-intervals/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cppcheck/Makefile
diff -u pkgsrc/devel/cppcheck/Makefile:1.76 pkgsrc/devel/cppcheck/Makefile:1.77
--- pkgsrc/devel/cppcheck/Makefile:1.76 Sun Feb  7 06:30:17 2021
+++ pkgsrc/devel/cppcheck/Makefile      Tue Apr  6 14:36:48 2021
@@ -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-htm
 
 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"

Index: pkgsrc/devel/phabricator/Makefile
diff -u pkgsrc/devel/phabricator/Makefile:1.16 pkgsrc/devel/phabricator/Makefile:1.17
--- pkgsrc/devel/phabricator/Makefile:1.16      Fri Jan  1 09:05:07 2021
+++ pkgsrc/devel/phabricator/Makefile   Tue Apr  6 14:36:48 2021
@@ -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:../.
 .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
 

Index: pkgsrc/devel/py-ipython5/Makefile
diff -u pkgsrc/devel/py-ipython5/Makefile:1.7 pkgsrc/devel/py-ipython5/Makefile:1.8
--- pkgsrc/devel/py-ipython5/Makefile:1.7       Mon Aug 31 23:07:01 2020
+++ pkgsrc/devel/py-ipython5/Makefile   Tue Apr  6 14:36:48 2021
@@ -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]
 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
 

Index: pkgsrc/devel/py-path.py/Makefile
diff -u pkgsrc/devel/py-path.py/Makefile:1.7 pkgsrc/devel/py-path.py/Makefile:1.8
--- pkgsrc/devel/py-path.py/Makefile:1.7        Tue Apr  9 08:10:46 2019
+++ pkgsrc/devel/py-path.py/Makefile    Tue Apr  6 14:36:48 2021
@@ -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"

Index: pkgsrc/math/py-infinity/Makefile
diff -u pkgsrc/math/py-infinity/Makefile:1.5 pkgsrc/math/py-infinity/Makefile:1.6
--- pkgsrc/math/py-infinity/Makefile:1.5        Sun May 17 18:57:26 2020
+++ pkgsrc/math/py-infinity/Makefile    Tue Apr  6 14:36:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/17 18:57:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      infinity-1.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,15 +12,14 @@ LICENSE=    modified-bsd
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
 TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pygments:test test:test
 
 USE_LANGUAGES= # none
 
 do-test:
-       cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"

Index: pkgsrc/math/py-intervals/Makefile
diff -u pkgsrc/math/py-intervals/Makefile:1.6 pkgsrc/math/py-intervals/Makefile:1.7
--- pkgsrc/math/py-intervals/Makefile:1.6       Sun May 17 18:57:26 2020
+++ pkgsrc/math/py-intervals/Makefile   Tue Apr  6 14:36:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/05/17 18:57:26 adam Exp $
+# $NetBSD: Makefile,v 1.7 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      intervals-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,8 @@ LICENSE=      modified-bsd
 DEPENDS+=      ${PYPKGPREFIX}-infinity>=0.1.3:../../math/py-infinity
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pygments:test test:test
 
 USE_LANGUAGES= # none

Prev by Date: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc/net/py-softlayer
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc/net/py-softlayer
Indexes:

Home | Main Index | Thread Index | Old Index