Switch py-dateutils to plain DEPENDS.

It supports both python 2 and 3 nowadays.

3 files changed, 6 insertions, 13 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index a6f44470ff5..5e7f8662499 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.173 2017/02/17 15:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.174 2017/02/20 17:00:36 wiz Exp $
 
 DISTNAME=	calibre-2.79.1
 CATEGORIES=	misc
@@ -19,6 +19,7 @@ DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 #DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=	${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+=	${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
@@ -33,9 +34,6 @@ DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=	${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
 DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
 
-# dateutil>=1.4.1
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-
 EXTRACT_USING=	bsdtar
 
 USE_LANGUAGES=			c c++
@@ -115,7 +113,6 @@ post-install:
 	${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.chmlib+=	chmlib>=0.40
 .include "../../devel/chmlib/buildlink3.mk"
diff --git a/misc/calibre1/Makefile b/misc/calibre1/Makefile
index 08f5ce4dc8e..9e0f35893b6 100644
--- a/misc/calibre1/Makefile
+++ b/misc/calibre1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/01/27 10:24:56 kleink Exp $
+# $NetBSD: Makefile,v 1.26 2017/02/20 17:00:36 wiz Exp $
 
 DISTNAME=	calibre-1.48.0
 PKGREVISION=	23
@@ -18,6 +18,7 @@ DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=	${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
@@ -29,8 +30,6 @@ DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
 DEPENDS+=	${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-
 # We also need the distfile for qt4-libs to extract some private header files
 # If QTVERSION changes, the distinfo file needs to be updated too.
 QTVERSION=	4.8.5	# from ../../x11/qt4/Makefile.common
@@ -119,7 +118,6 @@ post-install:
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/chmlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12
diff --git a/misc/py-trytond-stock-forecast/Makefile b/misc/py-trytond-stock-forecast/Makefile
index e5725e69675..98c7c9955e1 100644
--- a/misc/py-trytond-stock-forecast/Makefile
+++ b/misc/py-trytond-stock-forecast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/01/04 23:45:29 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2017/02/20 17:00:36 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_stock_forecast
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	misc python
@@ -8,6 +8,7 @@ HOMEPAGE=	http://www.tryton.org/
 COMMENT=	Stock forecast module of the Tryton application platform
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-python-sql>=0.4:../../databases/py-python-sql
 #projrev
 DEPENDS+=	${PYPKGPREFIX}-trytond-company>=${TRYTON_BASEVER}:../../misc/py-trytond-company
@@ -15,11 +16,8 @@ DEPENDS+=	${PYPKGPREFIX}-trytond-product>=${TRYTON_BASEVER}:../../misc/py-tryton
 DEPENDS+=	${PYPKGPREFIX}-trytond-stock>=${TRYTON_BASEVER}:../../misc/py-trytond-stock
 DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
-PYTHON_VERSIONED_DEPENDENCIES+=	dateutil
-
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"