Thu Jan 16 10:41:53 2014 UTC ()
Convert to use versioned_dependencies.mk.
(wiz)
diff -r1.4 -r1.5 pkgsrc/editors/nts/Makefile
diff -r1.39 -r1.40 pkgsrc/graphics/py-matplotlib/Makefile
diff -r1.5 -r1.6 pkgsrc/math/py-pandas/Makefile
diff -r1.62 -r1.63 pkgsrc/misc/calibre/Makefile
diff -r1.10 -r1.11 pkgsrc/textproc/py-vobject/Makefile
diff -r1.28 -r1.29 pkgsrc/time/etm/Makefile
diff -r1.15 -r1.16 pkgsrc/time/py-icalendar/Makefile
--- pkgsrc/editors/nts/Attic/Makefile 2012/10/03 11:43:38 1.4
+++ pkgsrc/editors/nts/Attic/Makefile 2014/01/16 10:41:53 1.5
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 11:43:38 asau Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/16 10:41:53 wiz Exp $
DISTNAME= nts-78
PKGREVISION= 1
@@ -12,12 +11,14 @@
LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.5:../../time/py-dateutil
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/graphics/py-matplotlib/Makefile 2013/07/24 11:13:11 1.39
+++ pkgsrc/graphics/py-matplotlib/Makefile 2014/01/16 10:41:53 1.40
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2013/07/24 11:13:11 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.40 2014/01/16 10:41:53 wiz Exp $
DISTNAME= matplotlib-1.2.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,8 +10,9 @@
COMMENT= Matlab-style plotting package for Python
DEPENDS+= ${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.2:../../time/py-dateutil
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
PY_PATCHPLIST= yes
@@ -36,7 +36,7 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
-
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
--- pkgsrc/math/py-pandas/Makefile 2013/12/10 13:00:30 1.5
+++ pkgsrc/math/py-pandas/Makefile 2014/01/16 10:41:53 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/12/10 13:00:30 bad Exp $
+# $NetBSD: Makefile,v 1.6 2014/01/16 10:41:53 wiz Exp $
DISTNAME= pandas-0.12.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,12 +10,13 @@
COMMENT= Python Data Analysis Library
LICENSE= modified-bsd
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.5:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-pytz>=1.5:../../time/py-pytz
DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-pytables>=2.2:../../math/py-pytables
BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.6.1
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
PYDISTUTILSPKG= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
USE_LANGUAGES+= c c++
@@ -25,6 +26,7 @@
# XXX want py-bottleneck
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../math/py-numexpr/buildlink3.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
--- pkgsrc/misc/calibre/Makefile 2013/12/06 13:23:46 1.62
+++ pkgsrc/misc/calibre/Makefile 2014/01/16 10:41:53 1.63
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2013/12/06 13:23:46 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.63 2014/01/16 10:41:53 wiz Exp $
DISTNAME= calibre-0.9.7
PKGREVISION= 15
@@ -18,7 +17,6 @@
DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
@@ -30,6 +28,8 @@
DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config pax
PYTHON_VERSIONS_ACCEPTED= 27
@@ -179,6 +179,7 @@
${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
--- pkgsrc/textproc/py-vobject/Makefile 2012/10/25 06:56:52 1.10
+++ pkgsrc/textproc/py-vobject/Makefile 2014/01/16 10:41:53 1.11
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/25 06:56:52 asau Exp $
-#
+# $NetBSD: Makefile,v 1.11 2014/01/16 10:41:53 wiz Exp $
DISTNAME= vobject-0.8.1c
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,11 +11,13 @@
COMMENT= Python iCalendar (ics) and vCard library
LICENSE= apache-2.0
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.1:../../time/py-dateutil
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
PYTHON_SELF_CONFLICT= yes
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/time/etm/Attic/Makefile 2013/04/06 03:45:26 1.28
+++ pkgsrc/time/etm/Attic/Makefile 2014/01/16 10:41:53 1.29
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/04/06 03:45:26 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.29 2014/01/16 10:41:53 wiz Exp $
DISTNAME= etm-877
PKGREVISION= 1
@@ -12,9 +11,10 @@
LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-icalendar>=2.0.1:../../time/py-icalendar
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
USE_LANGUAGES= # none
REPLACE_PYTHON+= etm/etmWX.py
@@ -26,4 +26,5 @@
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/time/py-icalendar/Makefile 2013/07/08 08:49:16 1.15
+++ pkgsrc/time/py-icalendar/Makefile 2014/01/16 10:41:53 1.16
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/07/08 08:49:16 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2014/01/16 10:41:53 wiz Exp $
DISTNAME= icalendar-3.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,12 @@
COMMENT= Python parser/generator for iCalendar files, as per RFC2445
LICENSE= 2-clause-bsd
-DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
+
USE_LANGUAGES= # empty
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"