CVS commit: pkgsrc/devel/py-trytond

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 22 23:00:59 UTC 2021

Modified Files:
        pkgsrc/devel/py-trytond: Makefile options.mk

Log Message:
py-trytond: update options.mk and actually include it


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/py-trytond/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/py-trytond/options.mk

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

Modified files:

Index: pkgsrc/devel/py-trytond/Makefile
diff -u pkgsrc/devel/py-trytond/Makefile:1.24 pkgsrc/devel/py-trytond/Makefile:1.25
--- pkgsrc/devel/py-trytond/Makefile:1.24       Wed Dec 22 22:55:48 2021
+++ pkgsrc/devel/py-trytond/Makefile    Wed Dec 22 23:00:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/12/22 22:55:48 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2021/12/22 23:00:59 wiz Exp $
 TRYTON_MODULE_NAME=    trytond
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=     devel python
@@ -30,6 +30,8 @@ post-install:
                ${DESTDIR}${PREFIX}/bin/${f}${PYVERSSUFFIX} || ${TRUE}
 .endfor
 
+.include "options.mk"
+
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-trytond/options.mk
diff -u pkgsrc/devel/py-trytond/options.mk:1.17 pkgsrc/devel/py-trytond/options.mk:1.18
--- pkgsrc/devel/py-trytond/options.mk:1.17     Wed Dec  9 01:46:07 2020
+++ pkgsrc/devel/py-trytond/options.mk  Wed Dec 22 23:00:59 2021
@@ -1,21 +1,13 @@
-# $NetBSD: options.mk,v 1.17 2020/12/09 01:46:07 gutteridge Exp $
+# $NetBSD: options.mk,v 1.18 2021/12/22 23:00:59 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-trytond
-PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx
-PKG_SUGGESTED_OPTIONS+=        psycopg pytz simplejson sphinx
+PKG_SUPPORTED_OPTIONS= levenshtein pydot psycopg
+PKG_SUGGESTED_OPTIONS+=        levenshtein pydot psycopg
 
 .include "../../mk/bsd.options.mk"
 
-# XXX Also supports converters/unoconv and textproc/py-Levenshtein options.
-
-.if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_ACCEPTED=      27 # py-cdecimal is obsolete for that version and thus not available
-DEPENDS+=              ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-PYTHON_VERSIONS_ACCEPTED=      27 # py-mysqldb
-DEPENDS+=              ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
+.if !empty(PKG_OPTIONS:Mlevenshtein)
+DEPENDS+=              ${PYPKGPREFIX}-Levenshtein-[0-9]*:../../textproc/py-Levenshtein
 .endif
 
 .if !empty(PKG_OPTIONS:Mpydot)
@@ -23,18 +15,5 @@ DEPENDS+=            ${PYPKGPREFIX}-dot-[0-9]*:../
 .endif
 
 .if !empty(PKG_OPTIONS:Mpsycopg)
-DEPENDS+=              ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
-.endif
-
-.if !empty(PKG_OPTIONS:Mpytz)
-DEPENDS+=              ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-.endif
-
-.if !empty(PKG_OPTIONS:Msimplejson)
-DEPENDS+=              ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
-.endif
-
-.if !empty(PKG_OPTIONS:Msphinx)
-PYTHON_VERSIONED_DEPENDENCIES= sphinx
-.include "../../lang/python/versioned_dependencies.mk"
+DEPENDS+=              ${PYPKGPREFIX}-psycopg2>=2.5:../../databases/py-psycopg2
 .endif