Tue Apr 6 15:03:32 2021 UTC ()
use versioned py-pygemnts


(adam)
diff -r1.247 -r1.248 pkgsrc/misc/calibre/Makefile
diff -r1.10 -r1.11 pkgsrc/print/tex-minted/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/py-alabaster/Makefile
diff -r1.13 -r1.14 pkgsrc/textproc/py-m2r/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/py-sphinx1/Makefile
cvs diff -r1.247 -r1.248 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2021/03/10 18:51:51 1.247
+++ pkgsrc/misc/calibre/Makefile 2021/04/06 15:03:32 1.248
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.247 2021/03/10 18:51:51 adam Exp $ 1# $NetBSD: Makefile,v 1.248 2021/04/06 15:03:32 adam Exp $
2 2
3DISTNAME= calibre-3.40.1 3DISTNAME= calibre-3.40.1
4PKGREVISION= 23 4PKGREVISION= 23
5CATEGORIES= misc 5CATEGORIES= misc
6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
7MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ 7MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.calibre-ebook.com/ 12HOMEPAGE= https://www.calibre-ebook.com/
13COMMENT= E-book library management application 13COMMENT= E-book library management application
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
@@ -20,27 +20,27 @@ DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9 @@ -20,27 +20,27 @@ DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9
20DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser 20DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
21DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil 21DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
22DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns 22DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
23DEPENDS+= ${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree 23DEPENDS+= ${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
24DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 24DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5
25DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11 25DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11
26DEPENDS+= ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser 26DEPENDS+= ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
27DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown 27DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
28DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize 28DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
29DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack 29DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
30DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces 30DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
31DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6 31DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6
32DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil 32DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
33DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments 33DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments25
34DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex 34DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
35DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 35DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
36DEPENDS+= ${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve 36DEPENDS+= ${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve
37DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 37DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
38# for installation 38# for installation
39BUILD_DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 39BUILD_DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
40 40
41EXTRACT_USING= bsdtar 41EXTRACT_USING= bsdtar
42 42
43PYTHON_VERSIONS_ACCEPTED= 27 # as of 3.16.0 43PYTHON_VERSIONS_ACCEPTED= 27 # as of 3.16.0
44 44
45USE_LANGUAGES= c99 c++ 45USE_LANGUAGES= c99 c++
46USE_LIBTOOL= yes 46USE_LIBTOOL= yes
cvs diff -r1.10 -r1.11 pkgsrc/print/tex-minted/Makefile (expand / switch to unified diff)

--- pkgsrc/print/tex-minted/Makefile 2020/01/18 23:34:31 1.10
+++ pkgsrc/print/tex-minted/Makefile 2021/04/06 15:03:32 1.11
@@ -1,25 +1,28 @@ @@ -1,25 +1,28 @@
1# $NetBSD: Makefile,v 1.10 2020/01/18 23:34:31 rillig Exp $ 1# $NetBSD: Makefile,v 1.11 2021/04/06 15:03:32 adam Exp $
2 2
3DISTNAME= minted 3DISTNAME= minted
4PKGNAME= tex-${DISTNAME}-2.5 4PKGNAME= tex-${DISTNAME}-2.5
5PKGREVISION= 1 5PKGREVISION= 1
6TEXLIVE_REV= 44855 6TEXLIVE_REV= 44855
7 7
8MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
9HOMEPAGE= https://ctan.org/pkg/minted 9HOMEPAGE= https://ctan.org/pkg/minted
10COMMENT= Highlighted source code for LaTeX 10COMMENT= Highlighted source code for LaTeX
11LICENSE= lppl-1.3c 11LICENSE= lppl-1.3c
12 12
13DEPENDS+= tex-etoolbox-[0-9]*:../../devel/tex-etoolbox 13DEPENDS+= tex-etoolbox-[0-9]*:../../devel/tex-etoolbox
14DEPENDS+= tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb 14DEPENDS+= tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
15DEPENDS+= tex-float-[0-9]*:../../print/tex-float 15DEPENDS+= tex-float-[0-9]*:../../print/tex-float
16DEPENDS+= tex-ifplatform-[0-9]*:../../print/tex-ifplatform 16DEPENDS+= tex-ifplatform-[0-9]*:../../print/tex-ifplatform
17DEPENDS+= tex-lineno-[0-9]*:../../print/tex-lineno 17DEPENDS+= tex-lineno-[0-9]*:../../print/tex-lineno
18DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek 18DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek
19DEPENDS+= tex-xstring-[0-9]*:../../print/tex-xstring 19DEPENDS+= tex-xstring-[0-9]*:../../print/tex-xstring
20DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments 
21 20
22TEXLIVE_UNVERSIONED= yes 21TEXLIVE_UNVERSIONED= yes
23.include "../../print/texlive/package.mk" 22
 23PYTHON_VERSIONED_DEPENDENCIES= pygments
 24
24.include "../../lang/python/pyversion.mk" 25.include "../../lang/python/pyversion.mk"
 26.include "../../lang/python/versioned_dependencies.mk"
 27.include "../../print/texlive/package.mk"
25.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/py-alabaster/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-alabaster/Makefile 2018/10/07 10:20:22 1.5
+++ pkgsrc/textproc/py-alabaster/Makefile 2021/04/06 15:03:32 1.6
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.5 2018/10/07 10:20:22 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2021/04/06 15:03:32 adam Exp $
2 2
3DISTNAME= alabaster-0.7.12 3DISTNAME= alabaster-0.7.12
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=a/alabaster/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=a/alabaster/}
7 7
8MAINTAINER= kamelderouiche@yahoo.com 8MAINTAINER= kamelderouiche@yahoo.com
9HOMEPAGE= https://github.com/bitprophet/alabaster 9HOMEPAGE= https://github.com/bitprophet/alabaster
10COMMENT= Configurable sidebar-enabled Sphinx theme 10COMMENT= Configurable sidebar-enabled Sphinx theme
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13DEPENDS+= ${PYPKGPREFIX}-pygments>=0.8:../../textproc/py-pygments 
14 
15USE_LANGUAGES= # none 13USE_LANGUAGES= # none
16 14
 15PYTHON_VERSIONED_DEPENDENCIES= pygments
 16
17.include "../../lang/python/egg.mk" 17.include "../../lang/python/egg.mk"
 18.include "../../lang/python/versioned_dependencies.mk"
18.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/textproc/py-m2r/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-m2r/Attic/Makefile 2018/10/14 12:10:47 1.13
+++ pkgsrc/textproc/py-m2r/Attic/Makefile 2021/04/06 15:03:32 1.14
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile,v 1.13 2018/10/14 12:10:47 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2021/04/06 15:03:32 adam Exp $
2 2
3DISTNAME= m2r-0.2.1 3DISTNAME= m2r-0.2.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=m/m2r/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=m/m2r/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/miyakogi/m2r 9HOMEPAGE= https://github.com/miyakogi/m2r
10COMMENT= Markdown to reStructuredText converter 10COMMENT= Markdown to reStructuredText converter
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 13DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
14DEPENDS+= ${PYPKGPREFIX}-mistune-[0-9]*:../../textproc/py-mistune 14DEPENDS+= ${PYPKGPREFIX}-mistune-[0-9]*:../../textproc/py-mistune
15TEST_DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments 
16 15
17USE_LANGUAGES= # none 16USE_LANGUAGES= # none
18 17
 18PYTHON_VERSIONED_DEPENDENCIES= pygments:test
 19
19post-install: 20post-install:
20 cd ${DESTDIR}${PREFIX}/bin && ${MV} m2r m2r-${PYVERSSUFFIX} || ${TRUE} 21 cd ${DESTDIR}${PREFIX}/bin && ${MV} m2r m2r-${PYVERSSUFFIX} || ${TRUE}
21 22
22.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
 24.include "../../lang/python/versioned_dependencies.mk"
23.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/textproc/py-sphinx1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-sphinx1/Attic/Makefile 2020/05/17 21:38:46 1.2
+++ pkgsrc/textproc/py-sphinx1/Attic/Makefile 2021/04/06 15:03:32 1.3
@@ -1,53 +1,52 @@ @@ -1,53 +1,52 @@
1# $NetBSD: Makefile,v 1.2 2020/05/17 21:38:46 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2021/04/06 15:03:32 adam Exp $
2 2
3DISTNAME= Sphinx-1.8.5 3DISTNAME= Sphinx-1.8.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= textproc python 6CATEGORIES= textproc python
7MASTER_SITES= ${MASTER_SITE_PYPI:=S/Sphinx/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=S/Sphinx/}
8 8
9MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://sphinx.pocoo.org/ 10HOMEPAGE= http://sphinx.pocoo.org/
11COMMENT= Python documentation generator 11COMMENT= Python documentation generator
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14DEPENDS+= ${PYPKGPREFIX}-alabaster>=0.7:../../textproc/py-alabaster 14DEPENDS+= ${PYPKGPREFIX}-alabaster>=0.7:../../textproc/py-alabaster
15DEPENDS+= ${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel 15DEPENDS+= ${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel
16DEPENDS+= ${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils 16DEPENDS+= ${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
17DEPENDS+= ${PYPKGPREFIX}-imagesize-[0-9]*:../../graphics/py-imagesize 17DEPENDS+= ${PYPKGPREFIX}-imagesize-[0-9]*:../../graphics/py-imagesize
18DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2 18DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
19DEPENDS+= ${PYPKGPREFIX}-packaging>=19.1nb1:../../devel/py-packaging 19DEPENDS+= ${PYPKGPREFIX}-packaging>=19.1nb1:../../devel/py-packaging
20DEPENDS+= ${PYPKGPREFIX}-pygments>=2.0:../../textproc/py-pygments 
21DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 20DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
22DEPENDS+= ${PYPKGPREFIX}-requests>=2.0.0:../../devel/py-requests 21DEPENDS+= ${PYPKGPREFIX}-requests>=2.0.0:../../devel/py-requests
23DEPENDS+= ${PYPKGPREFIX}-snowballstemmer>=1.1:../../textproc/py-snowballstemmer 22DEPENDS+= ${PYPKGPREFIX}-snowballstemmer>=1.1:../../textproc/py-snowballstemmer
24DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-websupport-[0-9]*:../../textproc/py-sphinxcontrib-websupport 23DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-websupport-[0-9]*:../../textproc/py-sphinxcontrib-websupport
25DEPENDS+= ${PYPKGPREFIX}-six>=1.5:../../lang/py-six 24DEPENDS+= ${PYPKGPREFIX}-six>=1.5:../../lang/py-six
26 25
27.include "../../lang/python/pyversion.mk" 26.include "../../lang/python/pyversion.mk"
28.if ${_PYTHON_VERSION} == 27 27.if ${_PYTHON_VERSION} == 27
29DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing 28DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
30.endif 29.endif
31 30
32TEST_DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 31TEST_DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
33TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 32TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
34TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov 33TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
35 34
36PYTHON_VERSIONED_DEPENDENCIES= test:test 35PYTHON_VERSIONED_DEPENDENCIES= pygments test:test
37 36
38USE_LANGUAGES= # none 37USE_LANGUAGES= # none
39USE_TOOLS+= makeinfo 38USE_TOOLS+= makeinfo
40 39
41do-test: 40do-test:
42 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} 41 cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
43 42
44post-install: 43post-install:
45 cd ${DESTDIR}${PREFIX}/bin && \ 44 cd ${DESTDIR}${PREFIX}/bin && \
46 ${MV} sphinx-apidoc sphinx-apidoc-${PYVERSSUFFIX} && \ 45 ${MV} sphinx-apidoc sphinx-apidoc-${PYVERSSUFFIX} && \
47 ${MV} sphinx-autogen sphinx-autogen-${PYVERSSUFFIX} && \ 46 ${MV} sphinx-autogen sphinx-autogen-${PYVERSSUFFIX} && \
48 ${MV} sphinx-build sphinx-build-${PYVERSSUFFIX} && \ 47 ${MV} sphinx-build sphinx-build-${PYVERSSUFFIX} && \
49 ${MV} sphinx-quickstart sphinx-quickstart-${PYVERSSUFFIX} || ${TRUE} 48 ${MV} sphinx-quickstart sphinx-quickstart-${PYVERSSUFFIX} || ${TRUE}
50 49
51.include "../../lang/python/egg.mk" 50.include "../../lang/python/egg.mk"
52.include "../../lang/python/versioned_dependencies.mk" 51.include "../../lang/python/versioned_dependencies.mk"
53.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"