CVS commit: pkgsrc/www

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr  6 15:22:38 UTC 2021

Modified Files:
        pkgsrc/www/py-flask-flatpages: Makefile options.mk
        pkgsrc/www/py-landslide: Makefile
        pkgsrc/www/qutebrowser: Makefile

Log Message:
use versioned py-pygemnts


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/py-flask-flatpages/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-flask-flatpages/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-landslide/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/qutebrowser/Makefile

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

Modified files:

Index: pkgsrc/www/py-flask-flatpages/Makefile
diff -u pkgsrc/www/py-flask-flatpages/Makefile:1.10 pkgsrc/www/py-flask-flatpages/Makefile:1.11
--- pkgsrc/www/py-flask-flatpages/Makefile:1.10 Sun May 17 09:39:27 2020
+++ pkgsrc/www/py-flask-flatpages/Makefile      Tue Apr  6 15:22:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/05/17 09:39:27 kleink Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/06 15:22:38 adam Exp $
 
 DISTNAME=      Flask-FlatPages-0.7.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,9 +17,11 @@ DEPENDS+=    ${PYPKGPREFIX}-jinja2>=2.10.2:
 DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.5:../../textproc/py-markdown
 DEPENDS+=      ${PYPKGPREFIX}-yaml>3.12:../../textproc/py-yaml
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES+=        pygments:test
+
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-flask-flatpages/options.mk
diff -u pkgsrc/www/py-flask-flatpages/options.mk:1.1 pkgsrc/www/py-flask-flatpages/options.mk:1.2
--- pkgsrc/www/py-flask-flatpages/options.mk:1.1        Tue May 12 10:49:35 2020
+++ pkgsrc/www/py-flask-flatpages/options.mk    Tue Apr  6 15:22:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/05/12 10:49:35 kleink Exp $
+# $NetBSD: options.mk,v 1.2 2021/04/06 15:22:38 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-flask-flatpages
 PKG_SUPPORTED_OPTIONS= pygments
@@ -7,5 +7,5 @@ PKG_SUGGESTED_OPTIONS+= pygments
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpygments)
-DEPENDS+=              ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
+PYTHON_VERSIONED_DEPENDENCIES= pygments
 .endif

Index: pkgsrc/www/py-landslide/Makefile
diff -u pkgsrc/www/py-landslide/Makefile:1.5 pkgsrc/www/py-landslide/Makefile:1.6
--- pkgsrc/www/py-landslide/Makefile:1.5        Tue Dec 15 09:07:41 2020
+++ pkgsrc/www/py-landslide/Makefile    Tue Apr  6 15:22:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/12/15 09:07:41 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/06 15:22:38 adam Exp $
 
 DISTNAME=      landslide-1.1.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,11 +13,12 @@ LICENSE=    apache-2.0
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.14:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.10.1:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.6.11:../../textproc/py-markdown
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=2.2.0:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} landslide landslide-${PYVERSSUFFIX} || ${TRUE}
@@ -26,4 +27,5 @@ do-test:
        cd ${WRKSRC} && ${PYTHONBIN} tests.py
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/qutebrowser/Makefile
diff -u pkgsrc/www/qutebrowser/Makefile:1.7 pkgsrc/www/qutebrowser/Makefile:1.8
--- pkgsrc/www/qutebrowser/Makefile:1.7 Fri Dec  4 20:45:49 2020
+++ pkgsrc/www/qutebrowser/Makefile     Tue Apr  6 15:22:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/12/04 20:45:49 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/06 15:22:38 adam Exp $
 
 DISTNAME=      qutebrowser-1.13.1
 PKGREVISION=   3
@@ -11,25 +11,21 @@ HOMEPAGE=   https://qutebrowser.org/
 COMMENT=       Keyboard-driven, vim-like browser based on PyQt5
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= # none
-
-DEPENDS+=      ${PYPKGPREFIX}-peg2-[0-9]*:../../textproc/py-peg2
 DEPENDS+=      ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-cssutils-[0-9]*:../../textproc/py-cssutils
 DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+=      ${PYPKGPREFIX}-peg2-[0-9]*:../../textproc/py-peg2
 DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools:tool
-
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 
+USE_LANGUAGES= # none
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../x11/py-qt5/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"