Update a couple of comments that reference Python packages Those comments were written before converters/unoconv and textproc/ py-Levenshtein were imported. Point to what's in pkgsrc, rather than to upstream URLs (in the case of py-Levenshtein, an older, unmaintained version). (I'm not going to change anything to do with Tryton right now, given the recent related build breakage.)diff -r1.10 -r1.11 pkgsrc/devel/py-proteus/options.mk
(gutteridge)
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | # $NetBSD: options.mk,v 1.10 2019/11/03 10:18:29 rillig Exp $ | 1 | # $NetBSD: options.mk,v 1.11 2020/12/09 01:46:07 gutteridge Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.py-proteus | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.py-proteus | |
4 | PKG_SUPPORTED_OPTIONS+= cdecimal simplejson | 4 | PKG_SUPPORTED_OPTIONS+= cdecimal simplejson | |
5 | # track py-trytond for cdecimal suggested option selection | 5 | # track py-trytond for cdecimal suggested option selection | |
6 | PKG_SUGGESTED_OPTIONS+= ${PKG_DEFAULT_OPTIONS:Mcdecimal} ${PKG_OPTIONS.py-trytond:Mcdecimal} | 6 | PKG_SUGGESTED_OPTIONS+= ${PKG_DEFAULT_OPTIONS:Mcdecimal} ${PKG_OPTIONS.py-trytond:Mcdecimal} | |
7 | PKG_SUGGESTED_OPTIONS+= simplejson | 7 | PKG_SUGGESTED_OPTIONS+= simplejson | |
8 | 8 | |||
9 | .include "../../mk/bsd.options.mk" | 9 | .include "../../mk/bsd.options.mk" | |
10 | 10 | |||
11 | # XXX Supports unoconv http://dag.wieers.com/home-made/unoconv/) and | 11 | # XXX Also supports converters/unoconv and textproc/py-Levenshtein options. | |
12 | # XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options | |||
13 | 12 | |||
14 | .if !empty(PKG_OPTIONS:Mcdecimal) | 13 | .if !empty(PKG_OPTIONS:Mcdecimal) | |
15 | PYTHON_VERSIONS_ACCEPTED= 27 # py-cdecimal is obsolete for that version and thus not available | 14 | PYTHON_VERSIONS_ACCEPTED= 27 # py-cdecimal is obsolete for that version and thus not available | |
16 | DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal | 15 | DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal | |
17 | .endif | 16 | .endif | |
18 | 17 | |||
19 | .if !empty(PKG_OPTIONS:Msimplejson) | 18 | .if !empty(PKG_OPTIONS:Msimplejson) | |
20 | DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson | 19 | DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson | |
21 | .endif | 20 | .endif |
@@ -1,23 +1,22 @@ | @@ -1,23 +1,22 @@ | |||
1 | # $NetBSD: options.mk,v 1.16 2019/10/21 21:45:40 adam Exp $ | 1 | # $NetBSD: options.mk,v 1.17 2020/12/09 01:46:07 gutteridge Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond | |
4 | PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx | 4 | PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx | |
5 | PKG_SUGGESTED_OPTIONS+= psycopg pytz simplejson sphinx | 5 | PKG_SUGGESTED_OPTIONS+= psycopg pytz simplejson sphinx | |
6 | 6 | |||
7 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
8 | 8 | |||
9 | # XXX: Supports unoconv http://dag.wieers.com/home-made/unoconv/) option and | 9 | # XXX Also supports converters/unoconv and textproc/py-Levenshtein options. | |
10 | # XXX: python-Levenshtein (http://github.com/miohtama/python-Levenshtein) option | |||
11 | 10 | |||
12 | .if !empty(PKG_OPTIONS:Mcdecimal) | 11 | .if !empty(PKG_OPTIONS:Mcdecimal) | |
13 | PYTHON_VERSIONS_ACCEPTED= 27 # py-cdecimal is obsolete for that version and thus not available | 12 | PYTHON_VERSIONS_ACCEPTED= 27 # py-cdecimal is obsolete for that version and thus not available | |
14 | DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal | 13 | DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal | |
15 | .endif | 14 | .endif | |
16 | 15 | |||
17 | .if !empty(PKG_OPTIONS:Mmysql) | 16 | .if !empty(PKG_OPTIONS:Mmysql) | |
18 | PYTHON_VERSIONS_ACCEPTED= 27 # py-mysqldb | 17 | PYTHON_VERSIONS_ACCEPTED= 27 # py-mysqldb | |
19 | DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb | 18 | DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb | |
20 | .endif | 19 | .endif | |
21 | 20 | |||
22 | .if !empty(PKG_OPTIONS:Mpydot) | 21 | .if !empty(PKG_OPTIONS:Mpydot) | |
23 | DEPENDS+= ${PYPKGPREFIX}-dot-[0-9]*:../../graphics/py-dot | 22 | DEPENDS+= ${PYPKGPREFIX}-dot-[0-9]*:../../graphics/py-dot |