diff options
author | wiz <wiz@pkgsrc.org> | 2014-01-16 10:41:53 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-01-16 10:41:53 +0000 |
commit | cc73237ec760595d4676b25c14a70ca1cb96cbea (patch) | |
tree | 4db354978084188ed96a82d9dbadf1d2ccd2b120 | |
parent | ba29c2b198f1bc252e25b5f607a5228286496e95 (diff) | |
download | pkgsrc-cc73237ec760595d4676b25c14a70ca1cb96cbea.tar.gz |
Convert to use versioned_dependencies.mk.
-rw-r--r-- | editors/nts/Makefile | 7 | ||||
-rw-r--r-- | graphics/py-matplotlib/Makefile | 8 | ||||
-rw-r--r-- | math/py-pandas/Makefile | 6 | ||||
-rw-r--r-- | misc/calibre/Makefile | 7 | ||||
-rw-r--r-- | textproc/py-vobject/Makefile | 7 | ||||
-rw-r--r-- | time/etm/Makefile | 7 | ||||
-rw-r--r-- | time/py-icalendar/Makefile | 6 |
7 files changed, 28 insertions, 20 deletions
diff --git a/editors/nts/Makefile b/editors/nts/Makefile index 8741cffa3e1..455bfd79262 100644 --- a/editors/nts/Makefile +++ b/editors/nts/Makefile @@ -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,7 +11,8 @@ COMMENT= Simple GUI note taking application 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 @@ -20,4 +20,5 @@ PYDISTUTILSPKG= yes .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index be669ef9a1f..a30376ce600 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -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,7 +10,8 @@ HOMEPAGE= http://matplotlib.sourceforge.net/ 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 @@ -36,7 +36,7 @@ post-patch: .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" diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile index d17b8aae2a3..e99ef749c49 100644 --- a/math/py-pandas/Makefile +++ b/math/py-pandas/Makefile @@ -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 @@ HOMEPAGE= http://pandas.pydata.org/ 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 @@ USE_LANGUAGES+= c c++ # 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" diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile index facdde1ebdc..3c6138c7e29 100644 --- a/misc/calibre/Makefile +++ b/misc/calibre/Makefile @@ -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+= xdg-utils>=1.0.2:../../misc/xdg-utils 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}-html5lib-[0-9]*:../../textproc/py-html5lib 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 @@ 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/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index 937719489dd..571558e2cea 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -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 @@ HOMEPAGE= http://vobject.skyhouseconsulting.com/ 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" diff --git a/time/etm/Makefile b/time/etm/Makefile index 78e98d80753..603d1722deb 100644 --- a/time/etm/Makefile +++ b/time/etm/Makefile @@ -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 @@ COMMENT= Events and tasks manager using simple text files 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 @@ post-configure: .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/py-icalendar/Makefile b/time/py-icalendar/Makefile index 8c4a589839f..2b550211810 100644 --- a/time/py-icalendar/Makefile +++ b/time/py-icalendar/Makefile @@ -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 @@ HOMEPAGE= http://icalendar.readthedocs.org/en/latest/ 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" |