Thu Mar 26 22:11:47 2015 UTC ()
No need to list the same PYTHON_VERSIONS_INCOMPATIBLE version mulitple times.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/devel/py-proteus/options.mk
diff -r1.5 -r1.6 pkgsrc/devel/py-trytond/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/devel/py-proteus/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-proteus/options.mk 2015/03/15 00:21:45 1.1
+++ pkgsrc/devel/py-proteus/options.mk 2015/03/26 22:11:47 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.1 2015/03/15 00:21:45 rodent Exp $ 1# $NetBSD: options.mk,v 1.2 2015/03/26 22:11:47 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.py-proteus 3PKG_OPTIONS_VAR= PKG_OPTIONS.py-proteus
4PKG_SUPPORTED_OPTIONS+= cdecimal simplejson 4PKG_SUPPORTED_OPTIONS+= cdecimal simplejson
5# track py-trytond for cdecimal suggested option selection 5# track py-trytond for cdecimal suggested option selection
6PKG_SUGGESTED_OPTIONS+= ${PKG_DEFAULT_OPTIONS:Mcdecimal} ${PKG_OPTIONS.py-trytond:Mcdecimal} 6PKG_SUGGESTED_OPTIONS+= ${PKG_DEFAULT_OPTIONS:Mcdecimal} ${PKG_OPTIONS.py-trytond:Mcdecimal}
7PKG_SUGGESTED_OPTIONS+= simplejson 7PKG_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 Supports unoconv http://dag.wieers.com/home-made/unoconv/) and
12# XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options 12# XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options
13 13
14.if !empty(PKG_OPTIONS:Mcdecimal) 14.if !empty(PKG_OPTIONS:Mcdecimal)
15PYTHON_VERSIONS_INCOMPATIBLE= 33 34 34 34 34 # py-cdecimal is obsolete for that version and thus not available 15PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-cdecimal is obsolete for that version and thus not available
16DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal 16DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
17.endif 17.endif
18 18
19.if !empty(PKG_OPTIONS:Msimplejson) 19.if !empty(PKG_OPTIONS:Msimplejson)
20DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson 20DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
21.endif 21.endif
cvs diff -r1.5 -r1.6 pkgsrc/devel/py-trytond/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-trytond/options.mk 2014/05/09 07:37:03 1.5
+++ pkgsrc/devel/py-trytond/options.mk 2015/03/26 22:11:47 1.6
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1# $NetBSD: options.mk,v 1.5 2014/05/09 07:37:03 wiz Exp $ 1# $NetBSD: options.mk,v 1.6 2015/03/26 22:11:47 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond 3PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond
4PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx 4PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx
5PKG_SUPPORTED_OPTIONS+= webdav 5PKG_SUPPORTED_OPTIONS+= webdav
6PKG_SUGGESTED_OPTIONS+= psycopg pytz simplejson sphinx 6PKG_SUGGESTED_OPTIONS+= psycopg pytz simplejson sphinx
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10# XXX Supports unoconv http://dag.wieers.com/home-made/unoconv/) and 10# XXX Supports unoconv http://dag.wieers.com/home-made/unoconv/) and
11# XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options 11# XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options
12 12
13.if !empty(PKG_OPTIONS:Mcdecimal) 13.if !empty(PKG_OPTIONS:Mcdecimal)
14PYTHON_VERSIONS_INCOMPATIBLE= 33 34 34 34 34 # py-cdecimal is obsolete for that version and thus not available 14PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-cdecimal is obsolete for that version and thus not available
15DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal 15DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
16.endif 16.endif
17 17
18.if !empty(PKG_OPTIONS:Mmysql) 18.if !empty(PKG_OPTIONS:Mmysql)
19PYTHON_VERSIONS_INCOMPATIBLE= 33 34 34 34 34 # py-mysqldb 19PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-mysqldb
20DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb 20DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
21.endif 21.endif
22 22
23.if !empty(PKG_OPTIONS:Mpydot) 23.if !empty(PKG_OPTIONS:Mpydot)
24PYTHON_VERSIONS_INCOMPATIBLE= 33 34 34 34 34 # py-dot 24PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-dot
25DEPENDS+= ${PYPKGPREFIX}-dot-[0-9]*:../../graphics/py-dot 25DEPENDS+= ${PYPKGPREFIX}-dot-[0-9]*:../../graphics/py-dot
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mpsycopg) 28.if !empty(PKG_OPTIONS:Mpsycopg)
29DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2 29DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mpytz) 32.if !empty(PKG_OPTIONS:Mpytz)
33DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 33DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Msimplejson) 36.if !empty(PKG_OPTIONS:Msimplejson)
37DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson 37DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
38.endif 38.endif
39 39
40.if !empty(PKG_OPTIONS:Msphinx) 40.if !empty(PKG_OPTIONS:Msphinx)
41DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 41DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
42.endif 42.endif
43 43
44.if !empty(PKG_OPTIONS:Mwebdav) 44.if !empty(PKG_OPTIONS:Mwebdav)
45PYTHON_VERSIONS_INCOMPATIBLE= 33 34 34 34 34 # py-pywebdav 45PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-pywebdav
46DEPENDS+= ${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav 46DEPENDS+= ${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav
47.endif 47.endif