pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc *: convert py-markdown users to versioned_dependencies.mk



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbccbf643122
branches:  trunk
changeset: 768827:fbccbf643122
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Nov 01 21:05:55 2021 +0000

description:
*: convert py-markdown users to versioned_dependencies.mk

diffstat:

 audio/lv2/Makefile                 |   6 ++----
 devel/apenwarr-redo/Makefile       |   6 ++++--
 devel/py-cheetah/Makefile          |   5 +++--
 misc/calibre/Makefile              |   6 ++++--
 textproc/markdown2social/Makefile  |   6 +++---
 textproc/py-mkdocs/Makefile        |   6 ++++--
 textproc/py-ramlfications/Makefile |  17 +++++++++--------
 www/py-flask-flatpages/Makefile    |   5 ++---
 www/py-landslide/Makefile          |   5 ++---
 9 files changed, 33 insertions(+), 29 deletions(-)

diffs (253 lines):

diff -r 99933c2beada -r fbccbf643122 audio/lv2/Makefile
--- a/audio/lv2/Makefile        Mon Nov 01 20:57:24 2021 +0000
+++ b/audio/lv2/Makefile        Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/04/06 14:23:24 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/11/01 21:05:55 wiz Exp $
 
 DISTNAME=      lv2-1.18.2
 CATEGORIES=    audio
@@ -10,8 +10,6 @@
 COMMENT=       Open standard for audio plugins, used by hundreds of plugins
 LICENSE=       isc
 
-DEPENDS+=      ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
-
 PLIST_SRC+=    ${PLIST_SRC_DFLT}
 
 USE_TOOLS+=    pkg-config
@@ -21,7 +19,7 @@
 
 REPLACE_PYTHON+=       lv2specgen/lv2specgen.py
 
-PYTHON_VERSIONED_DEPENDENCIES= pygments
+PYTHON_VERSIONED_DEPENDENCIES= markdown pygments
 
 .include "options.mk"
 
diff -r 99933c2beada -r fbccbf643122 devel/apenwarr-redo/Makefile
--- a/devel/apenwarr-redo/Makefile      Mon Nov 01 20:57:24 2021 +0000
+++ b/devel/apenwarr-redo/Makefile      Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/12/04 20:45:06 nia Exp $
+# $NetBSD: Makefile,v 1.7 2021/11/01 21:05:55 wiz Exp $
 
 DISTNAME=      redo-0.42c
 PKGNAME=       apenwarr-${DISTNAME}
@@ -14,7 +14,6 @@
 LICENSE=       apache-2.0
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
 
 DEPENDS+=      dash-[0-9]*:../../shells/dash
 DEPENDS+=      ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
@@ -22,6 +21,8 @@
 
 WRKSRC=                ${WRKDIR}/redo-${DISTNAME}
 
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown:build
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     redo/whichpython.do
@@ -37,4 +38,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99933c2beada -r fbccbf643122 devel/py-cheetah/Makefile
--- a/devel/py-cheetah/Makefile Mon Nov 01 20:57:24 2021 +0000
+++ b/devel/py-cheetah/Makefile Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/02/01 19:56:21 adam Exp $
+# $NetBSD: Makefile,v 1.27 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      Cheetah-2.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,7 +11,6 @@
 COMMENT=       Python-powered template engine and code-generator
 
 CONFLICTS=     Cheetah-[0-9]*
-DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.0.1:../../textproc/py-markdown
 
 REPLACE_PYTHON+=       cheetah/DirectiveAnalyzer.py
 REPLACE_PYTHON+=       cheetah/ImportHooks.py
@@ -34,6 +33,7 @@
 REPLACE_PYTHON+=       cheetah/Utils/Misc.py
 
 PYTHON_VERSIONS_ACCEPTED=      27 # for 3.x, use py-cheetah3
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
@@ -43,4 +43,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99933c2beada -r fbccbf643122 misc/calibre/Makefile
--- a/misc/calibre/Makefile     Mon Nov 01 20:57:24 2021 +0000
+++ b/misc/calibre/Makefile     Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.255 2021/09/29 10:10:32 wiz Exp $
+# $NetBSD: Makefile,v 1.256 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      calibre-3.40.1
 PKGREVISION=   30
@@ -24,7 +24,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5
 DEPENDS+=      ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11
 DEPENDS+=      ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
-DEPENDS+=      ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
 DEPENDS+=      ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=      ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+=      ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
@@ -38,6 +37,8 @@
 # for installation
 BUILD_DEPENDS+=        xdg-utils>=1.0.2:../../misc/xdg-utils
 
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown
+
 EXTRACT_USING= bsdtar
 
 PYTHON_VERSIONS_ACCEPTED=      27 # as of 3.16.0
@@ -142,4 +143,5 @@
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/py-qt5/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99933c2beada -r fbccbf643122 textproc/markdown2social/Makefile
--- a/textproc/markdown2social/Makefile Mon Nov 01 20:57:24 2021 +0000
+++ b/textproc/markdown2social/Makefile Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/04 21:43:39 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      markdown2social-0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,11 +11,11 @@
 COMMENT=       Converts simple Markdown documents to Google+ posts
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.6:../../textproc/py-markdown
-
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99933c2beada -r fbccbf643122 textproc/py-mkdocs/Makefile
--- a/textproc/py-mkdocs/Makefile       Mon Nov 01 20:57:24 2021 +0000
+++ b/textproc/py-mkdocs/Makefile       Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/10/03 10:33:25 adam Exp $
+# $NetBSD: Makefile,v 1.5 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      mkdocs-1.0.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-click>=3.3:../../devel/py-click
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.7.1:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-livereload>=2.5.1:../../www/py-livereload
-DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.3.1:../../textproc/py-markdown
 DEPENDS+=      ${PYPKGPREFIX}-tornado>=5.0:../../www/py-tornado
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown
+
 USE_LANGUAGES= # none
 
 post-install:
@@ -24,4 +25,5 @@
                ${MV} mkdocs mkdocs-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99933c2beada -r fbccbf643122 textproc/py-ramlfications/Makefile
--- a/textproc/py-ramlfications/Makefile        Mon Nov 01 20:57:24 2021 +0000
+++ b/textproc/py-ramlfications/Makefile        Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/09/29 21:20:16 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      ramlfications-0.1.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,13 +10,14 @@
 COMMENT=       Python RAML parser
 LICENSE=       apache-2.0
 
-# Test dependencies
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-termcolor-[0-9]*:../../devel/py-termcolor
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-jsonref-[0-9]*:../../textproc/py-jsonref
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-markdown2-[0-9]*:../../textproc/py-markdown2
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-xmltodict-[0-9]*:../../textproc/py-xmltodict
+TEST_DEPENDS+=         ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
+TEST_DEPENDS+=         ${PYPKGPREFIX}-termcolor-[0-9]*:../../devel/py-termcolor
+TEST_DEPENDS+=         ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
+TEST_DEPENDS+=         ${PYPKGPREFIX}-jsonref-[0-9]*:../../textproc/py-jsonref
+TEST_DEPENDS+=         ${PYPKGPREFIX}-xmltodict-[0-9]*:../../textproc/py-xmltodict
+
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown:test
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99933c2beada -r fbccbf643122 www/py-flask-flatpages/Makefile
--- a/www/py-flask-flatpages/Makefile   Mon Nov 01 20:57:24 2021 +0000
+++ b/www/py-flask-flatpages/Makefile   Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/05/02 11:16:49 kleink Exp $
+# $NetBSD: Makefile,v 1.13 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      Flask-FlatPages-0.7.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -14,7 +14,6 @@
 
 DEPENDS+=      ${PYPKGPREFIX}-flask>1.0:../../www/py-flask
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.10.2:../../textproc/py-jinja2
-DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.5:../../textproc/py-markdown
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-yaml>5.3.1:../../textproc/py-yaml
@@ -22,7 +21,7 @@
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES+=        pygments:test
+PYTHON_VERSIONED_DEPENDENCIES+=        markdown kygments:test
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff -r 99933c2beada -r fbccbf643122 www/py-landslide/Makefile
--- a/www/py-landslide/Makefile Mon Nov 01 20:57:24 2021 +0000
+++ b/www/py-landslide/Makefile Mon Nov 01 21:05:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/04/06 15:22:38 adam Exp $
+# $NetBSD: Makefile,v 1.7 2021/11/01 21:05:56 wiz Exp $
 
 DISTNAME=      landslide-1.1.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,12 +12,11 @@
 
 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}-six>=1.11.0:../../lang/py-six
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONED_DEPENDENCIES= pygments
+PYTHON_VERSIONED_DEPENDENCIES= markdown pygments
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \



Home | Main Index | Thread Index | Old Index