pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc use versioned py-pygemnts



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8c6d5e89a47
branches:  trunk
changeset: 449827:a8c6d5e89a47
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 06 14:23:24 2021 +0000

description:
use versioned py-pygemnts

diffstat:

 audio/lv2/Makefile                       |  6 ++++--
 databases/py-sqlalchemy-i18n/options.mk  |  7 +++----
 databases/py-sqlalchemy-utils/options.mk |  5 ++---
 devel/py-tortoisehg/Makefile             |  6 ++++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diffs (109 lines):

diff -r b0ad80d3fcff -r a8c6d5e89a47 audio/lv2/Makefile
--- a/audio/lv2/Makefile        Tue Apr 06 14:14:08 2021 +0000
+++ b/audio/lv2/Makefile        Tue Apr 06 14:23:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2021/02/05 13:34:33 nia Exp $
+# $NetBSD: Makefile,v 1.26 2021/04/06 14:23:24 adam Exp $
 
 DISTNAME=      lv2-1.18.2
 CATEGORIES=    audio
@@ -11,7 +11,6 @@
 LICENSE=       isc
 
 DEPENDS+=      ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
 PLIST_SRC+=    ${PLIST_SRC_DFLT}
 
@@ -22,6 +21,8 @@
 
 REPLACE_PYTHON+=       lv2specgen/lv2specgen.py
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 .include "options.mk"
 
 WAF_ARGS+=     ${BUILD_DEBUG} ${BUILD_DOC} ${BUILD_TESTS} ${BUILD_VALGRIND}
@@ -35,4 +36,5 @@
 BUILDLINK_API_DEPENDS.libsndfile+=     libsndfile>=1.0.0
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b0ad80d3fcff -r a8c6d5e89a47 databases/py-sqlalchemy-i18n/options.mk
--- a/databases/py-sqlalchemy-i18n/options.mk   Tue Apr 06 14:14:08 2021 +0000
+++ b/databases/py-sqlalchemy-i18n/options.mk   Tue Apr 06 14:23:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/05/18 10:45:44 adam Exp $
+# $NetBSD: options.mk,v 1.3 2021/04/06 14:23:25 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-sqlalchemy-i18n
 PKG_SUPPORTED_OPTIONS= tests
@@ -7,11 +7,10 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mtests)
-PYTHON_VERSIONED_DEPENDENCIES= test
+PYTHON_VERSIONED_DEPENDENCIES= pygments test
 .include "../../lang/python/versioned_dependencies.mk"
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
-DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-flexmock>=0.9.7:../../devel/py-flexmock
+DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2.4.6:../../databases/py-psycopg2
 .endif
diff -r b0ad80d3fcff -r a8c6d5e89a47 databases/py-sqlalchemy-utils/options.mk
--- a/databases/py-sqlalchemy-utils/options.mk  Tue Apr 06 14:14:08 2021 +0000
+++ b/databases/py-sqlalchemy-utils/options.mk  Tue Apr 06 14:23:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/05/18 10:45:19 adam Exp $
+# $NetBSD: options.mk,v 1.6 2021/04/06 14:23:25 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-sqlalchemy-utils
 PKG_SUPPORTED_OPTIONS= arrow babel color furl intervals ipaddress json password
@@ -44,9 +44,8 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)
-PYTHON_VERSIONED_DEPENDENCIES= test
+PYTHON_VERSIONED_DEPENDENCIES= pygments test
 .include "../../lang/python/versioned_dependencies.mk"
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-flexmock>=0.9.7:../../devel/py-flexmock
diff -r b0ad80d3fcff -r a8c6d5e89a47 devel/py-tortoisehg/Makefile
--- a/devel/py-tortoisehg/Makefile      Tue Apr 06 14:14:08 2021 +0000
+++ b/devel/py-tortoisehg/Makefile      Tue Apr 06 14:23:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2021/02/24 09:04:58 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2021/04/06 14:23:25 adam Exp $
 
 DISTNAME=              tortoisehg-5.7
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.3.4nb1<2:../../textproc/py-sphinx1
 DEPENDS+=      ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
 
 thg_icon=              /share/pixmaps/tortoisehg/icons/thg_logo.ico
@@ -29,6 +28,8 @@
 
 PYTHON_SELF_CONFLICT=  yes
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 pre-build:
        ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
        ${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo
@@ -43,6 +44,7 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/py-qt5-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index