pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-*: clean up
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Aug 30 19:01:39 2016 +0200
Changeset: 940b0069256b292e8189cb63a0087c8639ab4c64
Modified Files:
bkchem/Makefile
bkchem/PLIST
bleachbit/Makefile
blink/Makefile
d-feet/Makefile
paraview/Makefile
py-Beaker/Makefile
py-PyPE/Makefile
py-aesthete/Makefile
py-algebraic/Makefile
py-ase/Makefile
py-ase/PLIST
py-astropysics/Makefile
py-behaviour/Makefile
py-bicho/Makefile
py-biskit/Makefile
py-biskit/PLIST
py-bloscpack/Makefile
py-bloscpack/PLIST
py-causalinfo/Makefile
py-conda-env/Makefile
py-conda-env/PLIST
py-django-gitrevision/Makefile
py-dolo/Makefile
py-dolo/PLIST
py-epipy/Makefile
py-etmtk/Makefile
py-etmtk/PLIST
py-event/Makefile
py-event/distinfo
py-feyn/Makefile
py-fnss/Makefile
py-fnss/PLIST
py-forthon/Makefile
py-forthon/PLIST
py-fortpy/Makefile
py-fortpy/PLIST
py-gato/Makefile
py-genesis/Makefile
py-gettext-tools/Makefile
py-gettext-tools/PLIST
py-goless/Makefile
py-gorm/Makefile
py-gosam/Makefile
py-gosam/PLIST
py-goulib/Makefile
py-gpaw/Makefile
py-gpaw/PLIST
py-graphsim/Makefile
py-gsl/Makefile
py-gsl/buildlink3.mk
py-hyperspy/Makefile
py-hyperspy/PLIST
py-irco/Makefile
py-lib/Makefile
py-locustio/Makefile
py-loggly/Makefile
py-loggly/distinfo
py-logilab-mtconverter/Makefile
py-lxmlproc/Makefile
py-lxmlproc/PLIST
py-mailingstats/Makefile
py-mailingstats/distinfo
py-mcview/Makefile
py-mcview/PLIST
py-metrics/Makefile
py-metrics/PLIST
py-minepy/Makefile
py-minepy/PLIST
py-mois/Makefile
py-mote/Makefile
py-netflowvizu/Makefile
py-ngf/Makefile
py-nuitka/Makefile
py-nuitka/PLIST
py-ocrodjvu/Makefile
py-p4/Makefile
py-pafy/Makefile
py-pafy/PLIST
py-pithos/Makefile
py-plac/Makefile
py-plac/PLIST
py-pp/Makefile
py-pp/PLIST
py-ptrace/Makefile
py-pydec/Makefile
py-pyflation/Makefile
py-pyflation/PLIST
py-pygr/Makefile
py-pyslha/Makefile
py-pyslha/PLIST
py-pythia/Makefile
py-restkit/Makefile
py-scikit-image/Makefile
py-scikits_ann/Makefile
py-scikits_hydroclimpy/Makefile
py-scitools/Makefile
py-scitools/distinfo
py-seeds/Makefile
py-shedskin/Makefile
py-shedskin/PLIST
py-smop/Makefile
py-speview/Makefile
py-srpy/Makefile
py-storm/Makefile
py-sumatra/Makefile
py-sumatra/PLIST
py-tappy/Makefile
py-theano/Makefile
py-theano/PLIST
py-tribe/Makefile
py-trimesh/Makefile
py-vespa/Makefile
py-vespa/PLIST
py-visionegg/Makefile
py-visionegg/PLIST
py-visionegg/buildlink3.mk
py-wahcade/Makefile
py-xcal-raman/Makefile
py-xcal-raman/PLIST
py-yams/Makefile
py-yapf/Makefile
py-zeitgeist/Makefile
py-zenity/Makefile
sabnzbdplus/Makefile
sickbeard/Makefile
spade/Makefile
spyder/Makefile
spyder/PLIST
Removed Files:
py-shedskin/patches/patch-aa
Log Message:
py-*: clean up
Mark as not ready for python 3 (where applicable).
Remove unneeded lines.
Fix some PLISTs and other issues.
Mark some as BROKEN.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=940b0069256b292e8189cb63a0087c8639ab4c64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bkchem/Makefile | 5 +-
bkchem/PLIST | 5 +-
bleachbit/Makefile | 1 -
blink/Makefile | 3 -
d-feet/Makefile | 1 -
paraview/Makefile | 2 -
py-Beaker/Makefile | 2 -
py-PyPE/Makefile | 1 -
py-aesthete/Makefile | 2 +-
py-algebraic/Makefile | 2 -
py-ase/Makefile | 4 +-
py-ase/PLIST | 3 +-
py-astropysics/Makefile | 5 +-
py-behaviour/Makefile | 4 +-
py-bicho/Makefile | 6 +-
py-biskit/Makefile | 5 +-
py-biskit/PLIST | 3 +-
py-bloscpack/Makefile | 11 +-
py-bloscpack/PLIST | 5 +-
py-causalinfo/Makefile | 2 +
py-conda-env/Makefile | 8 +-
py-conda-env/PLIST | 7 +-
py-django-gitrevision/Makefile | 2 -
py-dolo/Makefile | 5 +-
py-dolo/PLIST | 273 +++++++++++++++++++++++++++++++++++++++-
py-epipy/Makefile | 4 +-
py-etmtk/Makefile | 12 +-
py-etmtk/PLIST | 14 +--
py-event/Makefile | 14 ++-
py-event/distinfo | 7 +-
py-feyn/Makefile | 5 +-
py-fnss/Makefile | 3 -
py-fnss/PLIST | 78 +++++++++++-
py-forthon/Makefile | 8 +-
py-forthon/PLIST | 5 +-
py-fortpy/Makefile | 6 +-
py-fortpy/PLIST | 14 +--
py-gato/Makefile | 1 -
py-genesis/Makefile | 4 -
py-gettext-tools/Makefile | 5 +-
py-gettext-tools/PLIST | 2 +-
py-goless/Makefile | 2 +
py-gorm/Makefile | 2 +
py-gosam/Makefile | 7 +-
py-gosam/PLIST | 7 +-
py-goulib/Makefile | 15 +--
py-gpaw/Makefile | 5 +-
py-gpaw/PLIST | 11 +-
py-graphsim/Makefile | 2 +
py-gsl/Makefile | 7 +-
py-gsl/buildlink3.mk | 1 +
py-hyperspy/Makefile | 12 +-
py-hyperspy/PLIST | 5 +-
py-irco/Makefile | 1 -
py-lib/Makefile | 1 -
py-locustio/Makefile | 2 +-
py-loggly/Makefile | 6 +-
py-loggly/distinfo | 2 +-
py-logilab-mtconverter/Makefile | 1 -
py-lxmlproc/Makefile | 5 +-
py-lxmlproc/PLIST | 3 +-
py-mailingstats/Makefile | 12 +-
py-mailingstats/distinfo | 8 +-
py-mcview/Makefile | 12 +-
py-mcview/PLIST | 2 +-
py-metrics/Makefile | 7 +-
py-metrics/PLIST | 5 +-
py-minepy/Makefile | 6 +-
py-minepy/PLIST | 5 +-
py-mois/Makefile | 4 +-
py-mote/Makefile | 3 +-
py-netflowvizu/Makefile | 3 -
py-ngf/Makefile | 6 +-
py-nuitka/Makefile | 5 +-
py-nuitka/PLIST | 5 +-
py-ocrodjvu/Makefile | 2 -
py-p4/Makefile | 1 -
py-pafy/Makefile | 4 -
py-pafy/PLIST | 2 +-
py-pithos/Makefile | 5 +-
py-plac/Makefile | 4 -
py-plac/PLIST | 2 +-
py-pp/Makefile | 5 +-
py-pp/PLIST | 5 +-
py-ptrace/Makefile | 5 +-
py-pydec/Makefile | 7 +-
py-pyflation/Makefile | 13 +-
py-pyflation/PLIST | 17 +--
py-pygr/Makefile | 1 -
py-pyslha/Makefile | 8 +-
py-pyslha/PLIST | 3 +-
py-pythia/Makefile | 7 +-
py-restkit/Makefile | 2 +-
py-scikit-image/Makefile | 2 -
py-scikits_ann/Makefile | 4 +-
py-scikits_hydroclimpy/Makefile | 5 +-
py-scitools/Makefile | 9 +-
py-scitools/distinfo | 7 +-
py-seeds/Makefile | 3 +-
py-shedskin/Makefile | 9 +-
py-shedskin/PLIST | 5 +-
py-shedskin/patches/patch-aa | 17 ---
py-smop/Makefile | 2 -
py-speview/Makefile | 3 +-
py-srpy/Makefile | 4 +-
py-storm/Makefile | 2 +
py-sumatra/Makefile | 10 +-
py-sumatra/PLIST | 39 +++++-
py-tappy/Makefile | 2 +-
py-theano/Makefile | 7 +-
py-theano/PLIST | 18 +--
py-tribe/Makefile | 3 +-
py-trimesh/Makefile | 2 +
py-vespa/Makefile | 3 -
py-vespa/PLIST | 10 +-
py-visionegg/Makefile | 12 +-
py-visionegg/PLIST | 3 +-
py-visionegg/buildlink3.mk | 2 +
py-wahcade/Makefile | 3 +-
py-xcal-raman/Makefile | 4 +-
py-xcal-raman/PLIST | 3 +-
py-yams/Makefile | 1 -
py-yapf/Makefile | 3 -
py-zeitgeist/Makefile | 2 +-
py-zenity/Makefile | 4 +-
sabnzbdplus/Makefile | 1 -
sickbeard/Makefile | 1 -
spade/Makefile | 4 +-
spyder/Makefile | 7 +-
spyder/PLIST | 3 +-
130 files changed, 653 insertions(+), 388 deletions(-)
diffs:
diff --git a/bkchem/Makefile b/bkchem/Makefile
index 9b01694..38de76d 100644
--- a/bkchem/Makefile
+++ b/bkchem/Makefile
@@ -18,8 +18,7 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool msgfmt
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.13.0
PY_EXEC=${PREFIX}/bin/python${PYVERSSUFFIX}
PY_APPAPATH=${PREFIX}/${PYSITELIB}/bkchem/bkchem.py
@@ -31,7 +30,7 @@ post-extract:
${ECHO} exec ${PY_EXEC} -OO ${PY_APPAPATH} >> ${WRKSRC}/bkchem${PYVERSSUFFIX}
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../lang/python/versioned_dependencies.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/bkchem/PLIST b/bkchem/PLIST
index 5b2d8f4..e20950d 100644
--- a/bkchem/PLIST
+++ b/bkchem/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/02 12:22:32 jihbed Exp $
-bin/bkchem2.6
+@comment $NetBSD$
+bin/bkchem${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/bkchem/CDML_versions.py
${PYSITELIB}/bkchem/CDML_versions.pyc
${PYSITELIB}/bkchem/CDML_versions.pyo
diff --git a/bleachbit/Makefile b/bleachbit/Makefile
index 62696a9..fe56d8c 100644
--- a/bleachbit/Makefile
+++ b/bleachbit/Makefile
@@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-notify>=0.2.1:../../sysutils/py-notify
USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gtk2
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= bleachbit.py
INSTALLATION_DIRS+= bin share/applications share/pixmaps
diff --git a/blink/Makefile b/blink/Makefile
index 4dee911..04f5740 100644
--- a/blink/Makefile
+++ b/blink/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.8 2015/03/18 01:52:34 othyro Exp $
-#
DISTNAME= blink-1.1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -24,8 +23,6 @@ REPLACE_PYTHON+= resources/chat/styles/Stockholm/test/view.py
PY_PATCHPLIST= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-python-application, py-python-gnutls
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/blink \
${DESTDIR}${PREFIX}/bin/blink${PYVERSSUFFIX}
diff --git a/d-feet/Makefile b/d-feet/Makefile
index ba9b590..0380120 100644
--- a/d-feet/Makefile
+++ b/d-feet/Makefile
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gtk2, py-gobject
SUBST_CLASSES+= paths
diff --git a/paraview/Makefile b/paraview/Makefile
index 1429212..89d5eff 100644
--- a/paraview/Makefile
+++ b/paraview/Makefile
@@ -48,8 +48,6 @@ CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _ParaView_build
PY_PATCHPLIST= yes
-#PYDISTUTILSPKG= yes
-#PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
# to make protoc work during installation
# http://paraview.org/Bug/view.php?id=12852
diff --git a/py-Beaker/Makefile b/py-Beaker/Makefile
index 1b716f9..1440c34 100644
--- a/py-Beaker/Makefile
+++ b/py-Beaker/Makefile
@@ -14,7 +14,5 @@ LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/${EGG_NAME}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-PyPE/Makefile b/py-PyPE/Makefile
index 863fc5f..c1015a7 100644
--- a/py-PyPE/Makefile
+++ b/py-PyPE/Makefile
@@ -16,7 +16,6 @@ DEPENDS= ${PYPKGPREFIX}-wxWidgets>=2.4.2.4:../../x11/py-wxWidgets
REPLACE_PYTHON= pype.py
NO_BUILD= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PY_PATCHPLIST= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-wxWidgets
diff --git a/py-aesthete/Makefile b/py-aesthete/Makefile
index 9ad24c5..284ef1e 100644
--- a/py-aesthete/Makefile
+++ b/py-aesthete/Makefile
@@ -17,8 +17,8 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-sympy>=0.6.7:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.6:../../textproc/py-lxml
+USE_TOOLS+= pkg-config
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-imaging, py-gtk2, py-gobject
post-extract:
diff --git a/py-algebraic/Makefile b/py-algebraic/Makefile
index 445c664..c9ae9f8 100644
--- a/py-algebraic/Makefile
+++ b/py-algebraic/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2015/02/08 22:11:58 jihbed Exp $
-#
VERSION= 0.3.1.dev-20120112
DISTNAME= python-algebraic-0.3.1.dev-20120112
@@ -16,7 +15,6 @@ LICENSE= 2-clause-bsd
USE_LANGUAGES= # none
-PY_PATCHPLIST= yes
PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
.include "../../lang/python/egg.mk"
diff --git a/py-ase/Makefile b/py-ase/Makefile
index 0c0c583..d2b1ba7 100644
--- a/py-ase/Makefile
+++ b/py-ase/Makefile
@@ -13,8 +13,6 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gtk2, py-gobject
post-extract:
@@ -31,6 +29,6 @@ post-extract:
.include "../../x11/py-gtk2/buildlink3.mk"
##required for basic ASE functionality
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-ase/PLIST b/py-ase/PLIST
index 8ff98f9..3566716 100644
--- a/py-ase/PLIST
+++ b/py-ase/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/07 16:05:47 jihbed Exp $
+@comment $NetBSD$
bin/ase-build2.7
bin/ase-db2.7
bin/ase-gui2.7
@@ -1273,6 +1273,7 @@ ${PYSITELIB}/ase/visualize/vtk/volume.pyo
${PYSITELIB}/ase/xrdebye.py
${PYSITELIB}/ase/xrdebye.pyc
${PYSITELIB}/ase/xrdebye.pyo
+${PYSITELIB}/${EGG_FILE}
share/python-ase/doc/ASE.bib
share/python-ase/doc/_static/044482-glossy-black-icon-sports-hobbies-film-clapper.png
share/python-ase/doc/_static/China.png
diff --git a/py-astropysics/Makefile b/py-astropysics/Makefile
index 039a79e..2552400 100644
--- a/py-astropysics/Makefile
+++ b/py-astropysics/Makefile
@@ -16,10 +16,9 @@ DEPENDS+= ${PYPKGPREFIX}-fits>=2.3.1:../../graphics/py-fits
PYTHON_VERSIONED_DEPENDENCIES= dateutil
-#WRKSRC= ${WRKDIR}/Astropysics-0.1.dev-r596
-EGG_NAME= ${DISTNAME:S/-r596//}
+EGG_NAME= ${DISTNAME:S/-r596//}0
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.1dev-r596
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-behaviour/Makefile b/py-behaviour/Makefile
index 3bc9e63..6bd41ef 100644
--- a/py-behaviour/Makefile
+++ b/py-behaviour/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2012/10/16 07:11:12 thomasklausner Exp $
-#
DISTNAME= Behaviour-0.1a4
PKGNAME= ${PYPKGPREFIX}-behaviour-0.1
@@ -13,7 +12,8 @@ COMMENT= Behaviour Driven Development in Python
LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.1a4
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-bicho/Makefile b/py-bicho/Makefile
index 7b6f99a..d5d465a 100644
--- a/py-bicho/Makefile
+++ b/py-bicho/Makefile
@@ -13,14 +13,12 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4>=4.3.2:../../www/py-beautifulsoup4
DEPENDS+= ${PYPKGPREFIX}-storm>=0.20:../../wip/py-storm
-WRKSRC= ${WRKDIR}/bicho-0.9
-
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-storm
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
post-extract:
${MV} ${WRKSRC}/bin/bicho ${WRKSRC}/bin/bicho${PYVERSSUFFIX}
-
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-biskit/Makefile b/py-biskit/Makefile
index 89728d0..867bca5 100644
--- a/py-biskit/Makefile
+++ b/py-biskit/Makefile
@@ -22,16 +22,13 @@ USE_LANGUAGES= # none
REPLACE_PERL+= Biskit/data/spectrum.pl
REPLACE_PYTHON+= scripts/Biskit/bis2.6 Biskit/data/pdb/remediator_python.1.56.080328.py
-PYDISTUTILSPKG= yes
-PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric
post-extract:
${MV} ${WRKSRC}/scripts/Biskit/bis.py ${WRKSRC}/scripts/Biskit/bis${PYVERSSUFFIX}
.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-Numeric/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-biskit/PLIST b/py-biskit/PLIST
index b8a44b3..ad96187 100644
--- a/py-biskit/PLIST
+++ b/py-biskit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/09/07 21:27:50 noud4 Exp $
+@comment $NetBSD$
bin/bis${PYVERSSUFFIX}
${PYSITELIB}/Biskit/AmberCrdEntropist.py
${PYSITELIB}/Biskit/AmberCrdEntropist.pyc
@@ -774,3 +774,4 @@ ${PYSITELIB}/Biskit/testdata/test_multidock.zsh
${PYSITELIB}/Biskit/tools.py
${PYSITELIB}/Biskit/tools.pyc
${PYSITELIB}/Biskit/tools.pyo
+${PYSITELIB}/${EGG_FILE}
diff --git a/py-bloscpack/Makefile b/py-bloscpack/Makefile
index 35943d2..643b4e7 100644
--- a/py-bloscpack/Makefile
+++ b/py-bloscpack/Makefile
@@ -10,16 +10,15 @@ HOMEPAGE= https://github.com/esc/bloscpack
COMMENT= Command line interface to and serialization format for Blosc
LICENSE= mit
-USE_LANGUAGES= # none
+DEPENDS+= ${PYPKGPREFIX}-blosc>=1.2.3:../../wip/py-blosc
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.6.0
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYDISTUTILSPKG= yes
+USE_LANGUAGES= # none
post-extract:
${MV} ${WRKSRC}/blpk ${WRKSRC}/blpk${PYVERSSUFFIX}
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+= ${PYPKGPREFIX}-blosc>=1.2.3:../../wip/py-blosc
.include "../../mk/bsd.pkg.mk"
diff --git a/py-bloscpack/PLIST b/py-bloscpack/PLIST
index 67831ac..821cdbe 100644
--- a/py-bloscpack/PLIST
+++ b/py-bloscpack/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/09 23:11:15 jihbed Exp $
-bin/blpk2.7
+@comment $NetBSD$
+bin/blpk${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/bloscpack/__init__.py
${PYSITELIB}/bloscpack/__init__.pyc
${PYSITELIB}/bloscpack/__init__.pyo
diff --git a/py-causalinfo/Makefile b/py-causalinfo/Makefile
index 6e2abcf..160a5a9 100644
--- a/py-causalinfo/Makefile
+++ b/py-causalinfo/Makefile
@@ -12,5 +12,7 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-conda-env/Makefile b/py-conda-env/Makefile
index dd9c591..fb708ba 100644
--- a/py-conda-env/Makefile
+++ b/py-conda-env/Makefile
@@ -13,16 +13,12 @@ LICENSE= modified-bsd
USE_TOOLS+= bash
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
-REPLACE_BASH+= bin/activate${PYVERSSUFFIX} bin/deactivate${PYVERSSUFFIX}
+REPLACE_BASH+= bin/activate${PYVERSSUFFIX} bin/deactivate${PYVERSSUFFIX}
post-extract:
${MV} ${WRKSRC}/bin/activate ${WRKSRC}/bin/activate${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/conda-env ${WRKSRC}/bin/conda-env${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/deactivate ${WRKSRC}/bin/deactivate${PYVERSSUFFIX}
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-conda-env/PLIST b/py-conda-env/PLIST
index da256c0..259d39c 100644
--- a/py-conda-env/PLIST
+++ b/py-conda-env/PLIST
@@ -1,7 +1,8 @@
@comment $NetBSD$
-bin/activate2.7
-bin/conda-env2.7
-bin/deactivate2.7
+bin/activate${PYVERSSUFFIX}
+bin/conda-env${PYVERSSUFFIX}
+bin/deactivate${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/conda_env/__init__.py
${PYSITELIB}/conda_env/__init__.pyc
${PYSITELIB}/conda_env/__init__.pyo
diff --git a/py-django-gitrevision/Makefile b/py-django-gitrevision/Makefile
index 45fa47f..a77ed1e 100644
--- a/py-django-gitrevision/Makefile
+++ b/py-django-gitrevision/Makefile
@@ -18,7 +18,5 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-git
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-dolo/Makefile b/py-dolo/Makefile
index 6a03e93..fcc5589 100644
--- a/py-dolo/Makefile
+++ b/py-dolo/Makefile
@@ -14,10 +14,9 @@ LICENSE= 2-clause-bsd
DEPENDS+= ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.4.9.2
-PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+USE_LANGUAGES= # none
post-extract:
${MV} ${WRKSRC}/bin/dolo \
diff --git a/py-dolo/PLIST b/py-dolo/PLIST
index 1780f3d..ac146ea 100644
--- a/py-dolo/PLIST
+++ b/py-dolo/PLIST
@@ -1 +1,272 @@
-@comment $NetBSD: PLIST,v 1.3 2014/05/14 21:57:06 jihbed Exp $
+@comment $NetBSD$
+bin/dolo-julia${PYVERSSUFFIX}
+bin/dolo-matlab${PYVERSSUFFIX}
+bin/dolo-recs${PYVERSSUFFIX}
+bin/dolo${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/dolo/__init__.py
+${PYSITELIB}/dolo/__init__.pyc
+${PYSITELIB}/dolo/__init__.pyo
+${PYSITELIB}/dolo/algos/__init__.py
+${PYSITELIB}/dolo/algos/__init__.pyc
+${PYSITELIB}/dolo/algos/__init__.pyo
+${PYSITELIB}/dolo/algos/accuracy.py
+${PYSITELIB}/dolo/algos/accuracy.pyc
+${PYSITELIB}/dolo/algos/accuracy.pyo
+${PYSITELIB}/dolo/algos/convert.py
+${PYSITELIB}/dolo/algos/convert.pyc
+${PYSITELIB}/dolo/algos/convert.pyo
+${PYSITELIB}/dolo/algos/mfg/__init__.py
+${PYSITELIB}/dolo/algos/mfg/__init__.pyc
+${PYSITELIB}/dolo/algos/mfg/__init__.pyo
+${PYSITELIB}/dolo/algos/mfg/simulations.py
+${PYSITELIB}/dolo/algos/mfg/simulations.pyc
+${PYSITELIB}/dolo/algos/mfg/simulations.pyo
+${PYSITELIB}/dolo/algos/mfg/steady_state.py
+${PYSITELIB}/dolo/algos/mfg/steady_state.pyc
+${PYSITELIB}/dolo/algos/mfg/steady_state.pyo
+${PYSITELIB}/dolo/algos/mfg/time_iteration.py
+${PYSITELIB}/dolo/algos/mfg/time_iteration.pyc
+${PYSITELIB}/dolo/algos/mfg/time_iteration.pyo
+${PYSITELIB}/dolo/algos/perfect_foresight.py
+${PYSITELIB}/dolo/algos/perfect_foresight.pyc
+${PYSITELIB}/dolo/algos/perfect_foresight.pyo
+${PYSITELIB}/dolo/algos/perturbations.py
+${PYSITELIB}/dolo/algos/perturbations.pyc
+${PYSITELIB}/dolo/algos/perturbations.pyo
+${PYSITELIB}/dolo/algos/simulations.py
+${PYSITELIB}/dolo/algos/simulations.pyc
+${PYSITELIB}/dolo/algos/simulations.pyo
+${PYSITELIB}/dolo/algos/steady_state.py
+${PYSITELIB}/dolo/algos/steady_state.pyc
+${PYSITELIB}/dolo/algos/steady_state.pyo
+${PYSITELIB}/dolo/algos/time_iteration.py
+${PYSITELIB}/dolo/algos/time_iteration.pyc
+${PYSITELIB}/dolo/algos/time_iteration.pyo
+${PYSITELIB}/dolo/algos/vfi.py
+${PYSITELIB}/dolo/algos/vfi.pyc
+${PYSITELIB}/dolo/algos/vfi.pyo
+${PYSITELIB}/dolo/compiler/__init__.py
+${PYSITELIB}/dolo/compiler/__init__.pyc
+${PYSITELIB}/dolo/compiler/__init__.pyo
+${PYSITELIB}/dolo/compiler/codegen.py
+${PYSITELIB}/dolo/compiler/codegen.pyc
+${PYSITELIB}/dolo/compiler/codegen.pyo
+${PYSITELIB}/dolo/compiler/converter.py
+${PYSITELIB}/dolo/compiler/converter.pyc
+${PYSITELIB}/dolo/compiler/converter.pyo
+${PYSITELIB}/dolo/compiler/function_compiler.py
+${PYSITELIB}/dolo/compiler/function_compiler.pyc
+${PYSITELIB}/dolo/compiler/function_compiler.pyo
+${PYSITELIB}/dolo/compiler/function_compiler_ast.py
+${PYSITELIB}/dolo/compiler/function_compiler_ast.pyc
+${PYSITELIB}/dolo/compiler/function_compiler_ast.pyo
+${PYSITELIB}/dolo/compiler/misc.py
+${PYSITELIB}/dolo/compiler/misc.pyc
+${PYSITELIB}/dolo/compiler/misc.pyo
+${PYSITELIB}/dolo/compiler/model_advanced.py
+${PYSITELIB}/dolo/compiler/model_advanced.pyc
+${PYSITELIB}/dolo/compiler/model_advanced.pyo
+${PYSITELIB}/dolo/compiler/model_import.py
+${PYSITELIB}/dolo/compiler/model_import.pyc
+${PYSITELIB}/dolo/compiler/model_import.pyo
+${PYSITELIB}/dolo/compiler/model_numeric.py
+${PYSITELIB}/dolo/compiler/model_numeric.pyc
+${PYSITELIB}/dolo/compiler/model_numeric.pyo
+${PYSITELIB}/dolo/compiler/model_symbolic.py
+${PYSITELIB}/dolo/compiler/model_symbolic.pyc
+${PYSITELIB}/dolo/compiler/model_symbolic.pyo
+${PYSITELIB}/dolo/compiler/recipes.py
+${PYSITELIB}/dolo/compiler/recipes.pyc
+${PYSITELIB}/dolo/compiler/recipes.pyo
+${PYSITELIB}/dolo/compiler/recipes.yaml
+${PYSITELIB}/dolo/compiler/symbolic_eval.py
+${PYSITELIB}/dolo/compiler/symbolic_eval.pyc
+${PYSITELIB}/dolo/compiler/symbolic_eval.pyo
+${PYSITELIB}/dolo/compiler/triangular_solver.py
+${PYSITELIB}/dolo/compiler/triangular_solver.pyc
+${PYSITELIB}/dolo/compiler/triangular_solver.pyo
+${PYSITELIB}/dolo/config.py
+${PYSITELIB}/dolo/config.pyc
+${PYSITELIB}/dolo/config.pyo
+${PYSITELIB}/dolo/misc/__init__.py
+${PYSITELIB}/dolo/misc/__init__.pyc
+${PYSITELIB}/dolo/misc/__init__.pyo
+${PYSITELIB}/dolo/misc/caching.py
+${PYSITELIB}/dolo/misc/caching.pyc
+${PYSITELIB}/dolo/misc/caching.pyo
+${PYSITELIB}/dolo/misc/decorators.py
+${PYSITELIB}/dolo/misc/decorators.pyc
+${PYSITELIB}/dolo/misc/decorators.pyo
+${PYSITELIB}/dolo/misc/display.py
+${PYSITELIB}/dolo/misc/display.pyc
+${PYSITELIB}/dolo/misc/display.pyo
+${PYSITELIB}/dolo/misc/termcolor.py
+${PYSITELIB}/dolo/misc/termcolor.pyc
+${PYSITELIB}/dolo/misc/termcolor.pyo
+${PYSITELIB}/dolo/numeric/__init__.py
+${PYSITELIB}/dolo/numeric/__init__.pyc
+${PYSITELIB}/dolo/numeric/__init__.pyo
+${PYSITELIB}/dolo/numeric/decision_rules_markov.py
+${PYSITELIB}/dolo/numeric/decision_rules_markov.pyc
+${PYSITELIB}/dolo/numeric/decision_rules_markov.pyo
+${PYSITELIB}/dolo/numeric/discretization/__init__.py
+${PYSITELIB}/dolo/numeric/discretization/__init__.pyc
+${PYSITELIB}/dolo/numeric/discretization/__init__.pyo
+${PYSITELIB}/dolo/numeric/discretization/discretization.py
+${PYSITELIB}/dolo/numeric/discretization/discretization.pyc
+${PYSITELIB}/dolo/numeric/discretization/discretization.pyo
+${PYSITELIB}/dolo/numeric/discretization/quadrature.py
+${PYSITELIB}/dolo/numeric/discretization/quadrature.pyc
+${PYSITELIB}/dolo/numeric/discretization/quadrature.pyo
+${PYSITELIB}/dolo/numeric/extern/__init__.py
+${PYSITELIB}/dolo/numeric/extern/__init__.pyc
+${PYSITELIB}/dolo/numeric/extern/__init__.pyo
+${PYSITELIB}/dolo/numeric/extern/helpers.py
+${PYSITELIB}/dolo/numeric/extern/helpers.pyc
+${PYSITELIB}/dolo/numeric/extern/helpers.pyo
+${PYSITELIB}/dolo/numeric/extern/lmmcp.py
+${PYSITELIB}/dolo/numeric/extern/lmmcp.pyc
+${PYSITELIB}/dolo/numeric/extern/lmmcp.pyo
+${PYSITELIB}/dolo/numeric/extern/qz.py
+${PYSITELIB}/dolo/numeric/extern/qz.pyc
+${PYSITELIB}/dolo/numeric/extern/qz.pyo
+${PYSITELIB}/dolo/numeric/filters.py
+${PYSITELIB}/dolo/numeric/filters.pyc
+${PYSITELIB}/dolo/numeric/filters.pyo
+${PYSITELIB}/dolo/numeric/interpolation/__init__.py
+${PYSITELIB}/dolo/numeric/interpolation/__init__.pyc
+${PYSITELIB}/dolo/numeric/interpolation/__init__.pyo
+${PYSITELIB}/dolo/numeric/interpolation/basis_splines.py
+${PYSITELIB}/dolo/numeric/interpolation/basis_splines.pyc
+${PYSITELIB}/dolo/numeric/interpolation/basis_splines.pyo
+${PYSITELIB}/dolo/numeric/interpolation/eval_cubic_splines.py
+${PYSITELIB}/dolo/numeric/interpolation/eval_cubic_splines.pyc
+${PYSITELIB}/dolo/numeric/interpolation/eval_cubic_splines.pyo
+${PYSITELIB}/dolo/numeric/interpolation/eval_cubic_splines_numba.py
+${PYSITELIB}/dolo/numeric/interpolation/eval_cubic_splines_numba.pyc
+${PYSITELIB}/dolo/numeric/interpolation/eval_cubic_splines_numba.pyo
+${PYSITELIB}/dolo/numeric/interpolation/filter_cubic_splines.py
+${PYSITELIB}/dolo/numeric/interpolation/filter_cubic_splines.pyc
+${PYSITELIB}/dolo/numeric/interpolation/filter_cubic_splines.pyo
+${PYSITELIB}/dolo/numeric/interpolation/misc.py
+${PYSITELIB}/dolo/numeric/interpolation/misc.pyc
+${PYSITELIB}/dolo/numeric/interpolation/misc.pyo
+${PYSITELIB}/dolo/numeric/interpolation/smolyak.py
+${PYSITELIB}/dolo/numeric/interpolation/smolyak.pyc
+${PYSITELIB}/dolo/numeric/interpolation/smolyak.pyo
+${PYSITELIB}/dolo/numeric/interpolation/splines.py
+${PYSITELIB}/dolo/numeric/interpolation/splines.pyc
+${PYSITELIB}/dolo/numeric/interpolation/splines.pyo
+${PYSITELIB}/dolo/numeric/interpolation/tests/__init__.py
+${PYSITELIB}/dolo/numeric/interpolation/tests/__init__.pyc
+${PYSITELIB}/dolo/numeric/interpolation/tests/__init__.pyo
+${PYSITELIB}/dolo/numeric/interpolation/tests/test_splines.py
+${PYSITELIB}/dolo/numeric/interpolation/tests/test_splines.pyc
+${PYSITELIB}/dolo/numeric/interpolation/tests/test_splines.pyo
+${PYSITELIB}/dolo/numeric/matrix_equations.py
+${PYSITELIB}/dolo/numeric/matrix_equations.pyc
+${PYSITELIB}/dolo/numeric/matrix_equations.pyo
+${PYSITELIB}/dolo/numeric/misc.py
+${PYSITELIB}/dolo/numeric/misc.pyc
+${PYSITELIB}/dolo/numeric/misc.pyo
+${PYSITELIB}/dolo/numeric/optimize/__init__.py
+${PYSITELIB}/dolo/numeric/optimize/__init__.pyc
+${PYSITELIB}/dolo/numeric/optimize/__init__.pyo
+${PYSITELIB}/dolo/numeric/optimize/ncpsolve.py
+${PYSITELIB}/dolo/numeric/optimize/ncpsolve.pyc
+${PYSITELIB}/dolo/numeric/optimize/ncpsolve.pyo
+${PYSITELIB}/dolo/numeric/optimize/newton.py
+${PYSITELIB}/dolo/numeric/optimize/newton.pyc
+${PYSITELIB}/dolo/numeric/optimize/newton.pyo
+${PYSITELIB}/dolo/numeric/serial_operations.py
+${PYSITELIB}/dolo/numeric/serial_operations.pyc
+${PYSITELIB}/dolo/numeric/serial_operations.pyo
+${PYSITELIB}/dolo/numeric/taylor_expansion.py
+${PYSITELIB}/dolo/numeric/taylor_expansion.pyc
+${PYSITELIB}/dolo/numeric/taylor_expansion.pyo
+${PYSITELIB}/dolo/numeric/tensor.py
+${PYSITELIB}/dolo/numeric/tensor.pyc
+${PYSITELIB}/dolo/numeric/tensor.pyo
+${PYSITELIB}/dolo/numeric/timeseries.py
+${PYSITELIB}/dolo/numeric/timeseries.pyc
+${PYSITELIB}/dolo/numeric/timeseries.pyo
+${PYSITELIB}/dolo/tests/__init__.py
+${PYSITELIB}/dolo/tests/__init__.pyc
+${PYSITELIB}/dolo/tests/__init__.pyo
+${PYSITELIB}/dolo/tests/test_caching.py
+${PYSITELIB}/dolo/tests/test_caching.pyc
+${PYSITELIB}/dolo/tests/test_caching.pyo
+${PYSITELIB}/dolo/tests/test_complementarity_model.py
+${PYSITELIB}/dolo/tests/test_complementarity_model.pyc
+${PYSITELIB}/dolo/tests/test_complementarity_model.pyo
+${PYSITELIB}/dolo/tests/test_complementarity_problems.py
+${PYSITELIB}/dolo/tests/test_complementarity_problems.pyc
+${PYSITELIB}/dolo/tests/test_complementarity_problems.pyo
+${PYSITELIB}/dolo/tests/test_division.py
+${PYSITELIB}/dolo/tests/test_division.pyc
+${PYSITELIB}/dolo/tests/test_division.pyo
+${PYSITELIB}/dolo/tests/test_errors.py
+${PYSITELIB}/dolo/tests/test_errors.pyc
+${PYSITELIB}/dolo/tests/test_errors.pyo
+${PYSITELIB}/dolo/tests/test_filters.py
+${PYSITELIB}/dolo/tests/test_filters.pyc
+${PYSITELIB}/dolo/tests/test_filters.pyo
+${PYSITELIB}/dolo/tests/test_global_2.py
+${PYSITELIB}/dolo/tests/test_global_2.pyc
+${PYSITELIB}/dolo/tests/test_global_2.pyo
+${PYSITELIB}/dolo/tests/test_global_msplines.py
+${PYSITELIB}/dolo/tests/test_global_msplines.pyc
+${PYSITELIB}/dolo/tests/test_global_msplines.pyo
+${PYSITELIB}/dolo/tests/test_interpolation.py
+${PYSITELIB}/dolo/tests/test_interpolation.pyc
+${PYSITELIB}/dolo/tests/test_interpolation.pyo
+${PYSITELIB}/dolo/tests/test_mfg_model_import.py
+${PYSITELIB}/dolo/tests/test_mfg_model_import.pyc
+${PYSITELIB}/dolo/tests/test_mfg_model_import.pyo
+${PYSITELIB}/dolo/tests/test_model_import.py
+${PYSITELIB}/dolo/tests/test_model_import.pyc
+${PYSITELIB}/dolo/tests/test_model_import.pyo
+${PYSITELIB}/dolo/tests/test_multilinear_interpolation.py
+${PYSITELIB}/dolo/tests/test_multilinear_interpolation.pyc
+${PYSITELIB}/dolo/tests/test_multilinear_interpolation.pyo
+${PYSITELIB}/dolo/tests/test_numba.py
+${PYSITELIB}/dolo/tests/test_numba.pyc
+${PYSITELIB}/dolo/tests/test_numba.pyo
+${PYSITELIB}/dolo/tests/test_parallel.py
+${PYSITELIB}/dolo/tests/test_parallel.pyc
+${PYSITELIB}/dolo/tests/test_parallel.pyo
+${PYSITELIB}/dolo/tests/test_ramsey.py
+${PYSITELIB}/dolo/tests/test_ramsey.pyc
+${PYSITELIB}/dolo/tests/test_ramsey.pyo
+${PYSITELIB}/dolo/tests/test_rbc.py
+${PYSITELIB}/dolo/tests/test_rbc.pyc
+${PYSITELIB}/dolo/tests/test_rbc.pyo
+${PYSITELIB}/dolo/tests/test_serial_ncpsolve.py
+${PYSITELIB}/dolo/tests/test_serial_ncpsolve.pyc
+${PYSITELIB}/dolo/tests/test_serial_ncpsolve.pyo
+${PYSITELIB}/dolo/tests/test_serial_operations.py
+${PYSITELIB}/dolo/tests/test_serial_operations.pyc
+${PYSITELIB}/dolo/tests/test_serial_operations.pyo
+${PYSITELIB}/dolo/tests/test_smolyak.py
+${PYSITELIB}/dolo/tests/test_smolyak.pyc
+${PYSITELIB}/dolo/tests/test_smolyak.pyo
+${PYSITELIB}/dolo/tests/test_solvers.py
+${PYSITELIB}/dolo/tests/test_solvers.pyc
+${PYSITELIB}/dolo/tests/test_solvers.pyo
+${PYSITELIB}/dolo/tests/test_splines.py
+${PYSITELIB}/dolo/tests/test_splines.pyc
+${PYSITELIB}/dolo/tests/test_splines.pyo
+${PYSITELIB}/dolo/tests/test_triangular_solve.py
+${PYSITELIB}/dolo/tests/test_triangular_solve.pyc
+${PYSITELIB}/dolo/tests/test_triangular_solve.pyo
+${PYSITELIB}/dolo/tests/test_uhlig.py
+${PYSITELIB}/dolo/tests/test_uhlig.pyc
+${PYSITELIB}/dolo/tests/test_uhlig.pyo
+${PYSITELIB}/dolo/version.py
+${PYSITELIB}/dolo/version.pyc
+${PYSITELIB}/dolo/version.pyo
diff --git a/py-epipy/Makefile b/py-epipy/Makefile
index 0c55ac6..f8ed9f4 100644
--- a/py-epipy/Makefile
+++ b/py-epipy/Makefile
@@ -16,9 +16,9 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
.include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-etmtk/Makefile b/py-etmtk/Makefile
index 28502e5..ad3297c 100644
--- a/py-etmtk/Makefile
+++ b/py-etmtk/Makefile
@@ -10,19 +10,19 @@ HOMEPAGE= http://people.duke.edu/~dgraham/etmtk
COMMENT= Event and task manager
LICENSE= gnu-gpl-v3
+DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
+DEPENDS+= ${PYPKGPREFIX}-icalendar>=3.8.3:../../time/py-icalendar
+DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
+DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
+DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
+
USE_LANGUAGES= # none
#PYTHON_VERSIONS_ACCEPTED= 27
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-extract:
${MV} ${WRKSRC}/etm ${WRKSRC}/etm${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.4.0:../../time/py-dateutil
-DEPENDS+= ${PYPKGPREFIX}-icalendar>=3.8.3:../../time/py-icalendar
-DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
-DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
.include "../../mk/bsd.pkg.mk"
diff --git a/py-etmtk/PLIST b/py-etmtk/PLIST
index 017d49a..39854e9 100644
--- a/py-etmtk/PLIST
+++ b/py-etmtk/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2015/01/18 21:33:00 jihbed Exp $
-bin/etm2.7
+@comment $NetBSD$
+bin/etm${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/etmTk/CHANGES
${PYSITELIB}/etmTk/__init__.py
${PYSITELIB}/etmTk/__init__.pyc
@@ -30,11 +35,6 @@ ${PYSITELIB}/etmTk/version.pyo
${PYSITELIB}/etmTk/view.py
${PYSITELIB}/etmTk/view.pyc
${PYSITELIB}/etmTk/view.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
man/man1/etm.1
share/appdata/etm.appdata.xml
share/applications/etm.desktop
diff --git a/py-event/Makefile b/py-event/Makefile
index 8c5c338..8642c1e 100644
--- a/py-event/Makefile
+++ b/py-event/Makefile
@@ -1,16 +1,20 @@
# $NetBSD: Makefile,v 1.4 2014/02/11 18:12:46 jihbed Exp $
-DISTNAME= event-0.4.2
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+DISTNAME= pyevent-0.4.3
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
CATEGORIES= devel
-MASTER_SITES= http://pyevent.googlecode.com/files/
-EXTRACT_SUFX= .zip
+MASTER_SITES= ${MASTER_SITE_GITHUB:=jaraco/}
+GITHUB_PROJECT= pyevent
MAINTAINER= kamelderouiche%yahoo.com@localhost
-HOMEPAGE= http://code.google.com/p/pyevent/
+HOMEPAGE= https://github.com/jaraco/pyevent
COMMENT= Python extension module for libevent
LICENSE= modified-bsd
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.4.3
+BROKEN= touches libevent internals
+# event.c:4157:87: error: dereferencing pointer to incomplete type 'struct evbuffer'
+
do-test:
cd ${WRKSRC} && ${PYTHONBIN} test.py
diff --git a/py-event/distinfo b/py-event/distinfo
index 2c0a156..f340c32 100644
--- a/py-event/distinfo
+++ b/py-event/distinfo
@@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.2 2014/01/03 21:41:13 jihbed Exp $
-SHA1 (event-0.4.2.zip) = 8effe5c67dd72a617360183e0c88ea4383f10871
-RMD160 (event-0.4.2.zip) = 50ea074fbc2e4870aaa2556576466b8fe6c7891a
-Size (event-0.4.2.zip) = 56538 bytes
+SHA1 (pyevent-0.4.3.tar.gz) = 2a9978d0f3e6acbfd18bb548ccf0b65a102110b7
+RMD160 (pyevent-0.4.3.tar.gz) = 4426a3ee7b120c2f2c5acca99669f1ff94908bae
+SHA512 (pyevent-0.4.3.tar.gz) = e1c343370fe2b3b7e0d4adca179c4de43cbae2e5f7caf4b4d832a68474a86f59d8ca9eb51410fbf026820aa6a8107eacf5666f51e7acdef9bccecddad3512bfb
+Size (pyevent-0.4.3.tar.gz) = 79692 bytes
diff --git a/py-feyn/Makefile b/py-feyn/Makefile
index 9ee4ba0..d5e426d 100644
--- a/py-feyn/Makefile
+++ b/py-feyn/Makefile
@@ -13,12 +13,9 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.3.2
PYTHON_VERSIONED_DEPENDENCIES= X
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/mkfeyndiag ${WRKSRC}/mkfeyndiag${PYVERSSUFFIX}
diff --git a/py-fnss/Makefile b/py-fnss/Makefile
index 3d1c207..8dcf534 100644
--- a/py-fnss/Makefile
+++ b/py-fnss/Makefile
@@ -12,9 +12,6 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PY_PATCHPLIST= yes
-
post-extract:
${MV} ${WRKSRC}/bin/mn-fnss ${WRKSRC}/bin/mn-fnss${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/fnss-troubleshoot ${WRKSRC}/bin/fnss-troubleshoot${PYVERSSUFFIX}
diff --git a/py-fnss/PLIST b/py-fnss/PLIST
index 76a1e97..5831920 100644
--- a/py-fnss/PLIST
+++ b/py-fnss/PLIST
@@ -1 +1,77 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/20 18:20:42 jihbed Exp $
+@comment $NetBSD$
+bin/fnss-troubleshoot${PYVERSSUFFIX}
+bin/mn-fnss${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/fnss/__init__.py
+${PYSITELIB}/fnss/__init__.pyo
+${PYSITELIB}/fnss/__init__.pyc
+${PYSITELIB}/fnss/release.pyo
+${PYSITELIB}/fnss/release.pyc
+${PYSITELIB}/fnss/units.pyo
+${PYSITELIB}/fnss/units.pyc
+${PYSITELIB}/fnss/util.pyo
+${PYSITELIB}/fnss/util.pyc
+${PYSITELIB}/fnss/adapters/__init__.py
+${PYSITELIB}/fnss/adapters/__init__.pyo
+${PYSITELIB}/fnss/adapters/__init__.pyc
+${PYSITELIB}/fnss/adapters/autonetkit.pyo
+${PYSITELIB}/fnss/adapters/autonetkit.pyc
+${PYSITELIB}/fnss/adapters/mn.pyo
+${PYSITELIB}/fnss/adapters/mn.pyc
+${PYSITELIB}/fnss/adapters/ns2.pyo
+${PYSITELIB}/fnss/adapters/ns2.pyc
+${PYSITELIB}/fnss/adapters/autonetkit.py
+${PYSITELIB}/fnss/adapters/mn.py
+${PYSITELIB}/fnss/adapters/ns2.py
+${PYSITELIB}/fnss/netconfig/__init__.py
+${PYSITELIB}/fnss/netconfig/__init__.pyo
+${PYSITELIB}/fnss/netconfig/__init__.pyc
+${PYSITELIB}/fnss/netconfig/buffers.pyo
+${PYSITELIB}/fnss/netconfig/buffers.pyc
+${PYSITELIB}/fnss/netconfig/capacities.pyo
+${PYSITELIB}/fnss/netconfig/capacities.pyc
+${PYSITELIB}/fnss/netconfig/delays.pyo
+${PYSITELIB}/fnss/netconfig/delays.pyc
+${PYSITELIB}/fnss/netconfig/nodeconfig.pyo
+${PYSITELIB}/fnss/netconfig/nodeconfig.pyc
+${PYSITELIB}/fnss/netconfig/weights.pyo
+${PYSITELIB}/fnss/netconfig/weights.pyc
+${PYSITELIB}/fnss/netconfig/buffers.py
+${PYSITELIB}/fnss/netconfig/capacities.py
+${PYSITELIB}/fnss/netconfig/delays.py
+${PYSITELIB}/fnss/netconfig/nodeconfig.py
+${PYSITELIB}/fnss/netconfig/weights.py
+${PYSITELIB}/fnss/release.py
+${PYSITELIB}/fnss/topologies/__init__.py
+${PYSITELIB}/fnss/topologies/__init__.pyo
+${PYSITELIB}/fnss/topologies/__init__.pyc
+${PYSITELIB}/fnss/topologies/datacenter.pyo
+${PYSITELIB}/fnss/topologies/datacenter.pyc
+${PYSITELIB}/fnss/topologies/parsers.pyo
+${PYSITELIB}/fnss/topologies/parsers.pyc
+${PYSITELIB}/fnss/topologies/randmodels.pyo
+${PYSITELIB}/fnss/topologies/randmodels.pyc
+${PYSITELIB}/fnss/topologies/simplemodels.pyo
+${PYSITELIB}/fnss/topologies/simplemodels.pyc
+${PYSITELIB}/fnss/topologies/topology.pyo
+${PYSITELIB}/fnss/topologies/topology.pyc
+${PYSITELIB}/fnss/topologies/datacenter.py
+${PYSITELIB}/fnss/topologies/parsers.py
+${PYSITELIB}/fnss/topologies/randmodels.py
+${PYSITELIB}/fnss/topologies/simplemodels.py
+${PYSITELIB}/fnss/topologies/topology.py
+${PYSITELIB}/fnss/traffic/__init__.py
+${PYSITELIB}/fnss/traffic/__init__.pyo
+${PYSITELIB}/fnss/traffic/__init__.pyc
+${PYSITELIB}/fnss/traffic/eventscheduling.pyo
+${PYSITELIB}/fnss/traffic/eventscheduling.pyc
+${PYSITELIB}/fnss/traffic/trafficmatrices.pyo
+${PYSITELIB}/fnss/traffic/trafficmatrices.pyc
+${PYSITELIB}/fnss/traffic/eventscheduling.py
+${PYSITELIB}/fnss/traffic/trafficmatrices.py
+${PYSITELIB}/fnss/units.py
+${PYSITELIB}/fnss/util.py
diff --git a/py-forthon/Makefile b/py-forthon/Makefile
index 78b9ee1..4ea3336 100644
--- a/py-forthon/Makefile
+++ b/py-forthon/Makefile
@@ -12,17 +12,11 @@ HOMEPAGE= http://hifweb.lbl.gov/Forthon/
COMMENT= Fortran95 wrapper/code development package
LICENSE= modified-bsd
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
USE_LANGUAGES= c fortran
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/Forthon ${WRKSRC}/Forthon${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-forthon/PLIST b/py-forthon/PLIST
index db2028c..2ac7386 100644
--- a/py-forthon/PLIST
+++ b/py-forthon/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/02 16:58:52 jihbed Exp $
-bin/Forthon2.7
+@comment $NetBSD$
+bin/Forthon${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/Forthon/Forthon.c
${PYSITELIB}/Forthon/Forthon.h
${PYSITELIB}/Forthon/ForthonTimer.py
diff --git a/py-fortpy/Makefile b/py-fortpy/Makefile
index 82ca8b7..2ca949f 100644
--- a/py-fortpy/Makefile
+++ b/py-fortpy/Makefile
@@ -12,16 +12,16 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.14.0:../../security/py-paramiko
-#DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.0:../../time/py-dateutil2
+#DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.0:../../time/py-dateutil
USE_LANGUAGES= # none
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+REPLACE_PYTHON+= fortpy/scripts/*.py*
post-extract:
${MV} ${WRKSRC}/fortpy/scripts/compare.py ${WRKSRC}/fortpy/scripts/compare.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/fortpy/scripts/convert.py ${WRKSRC}/fortpy/scripts/convert.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/fortpy/scripts/runtests.py ${WRKSRC}/fortpy/scripts/runtests.py${PYVERSSUFFIX}
+.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-fortpy/PLIST b/py-fortpy/PLIST
index ce0a929..defd3e5 100644
--- a/py-fortpy/PLIST
+++ b/py-fortpy/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2014/08/06 21:34:53 jihbed Exp $
-bin/compare.py2.7
-bin/convert.py2.7
-bin/runtests.py2.7
+@comment $NetBSD$
+bin/compare.py${PYVERSSUFFIX}
+bin/convert.py${PYVERSSUFFIX}
+bin/runtests.py${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -87,9 +87,9 @@ ${PYSITELIB}/fortpy/printing/__init__.pyo
${PYSITELIB}/fortpy/printing/docs.py
${PYSITELIB}/fortpy/printing/docs.pyc
${PYSITELIB}/fortpy/printing/docs.pyo
-${PYSITELIB}/fortpy/scripts/compare.py2.7
-${PYSITELIB}/fortpy/scripts/convert.py2.7
-${PYSITELIB}/fortpy/scripts/runtests.py2.7
+${PYSITELIB}/fortpy/scripts/compare.py${PYVERSSUFFIX}
+${PYSITELIB}/fortpy/scripts/convert.py${PYVERSSUFFIX}
+${PYSITELIB}/fortpy/scripts/runtests.py${PYVERSSUFFIX}
${PYSITELIB}/fortpy/serialize.py
${PYSITELIB}/fortpy/serialize.pyc
${PYSITELIB}/fortpy/serialize.pyo
diff --git a/py-gato/Makefile b/py-gato/Makefile
index b4717d1..36ffbdc 100644
--- a/py-gato/Makefile
+++ b/py-gato/Makefile
@@ -14,7 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 1.2.2
REPLACE_PYTHON+= *.py
diff --git a/py-genesis/Makefile b/py-genesis/Makefile
index e83dc09..6e863ba 100644
--- a/py-genesis/Makefile
+++ b/py-genesis/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.3 2012/10/27 16:52:10 noud4 Exp $
-#
DISTNAME= genesis-0.1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,8 +13,5 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gettext-tools/Makefile b/py-gettext-tools/Makefile
index f5c1f6a..22f57fb 100644
--- a/py-gettext-tools/Makefile
+++ b/py-gettext-tools/Makefile
@@ -13,10 +13,7 @@ AUTO_MKDIRS= yes
EXTRACT_ELEMENTS= ${PYSUBDIR}/Tools/i18n/*
REPLACE_PYTHON= Tools/i18n/msgfmt.py Tools/i18n/pygettext.py
-
-# Why the hell it is not declared in python/pyvers.mk ?!
-# -- tech-pkg%NetBSD.org@localhost
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
do-patch:
@echo "Patches ignored"
diff --git a/py-gettext-tools/PLIST b/py-gettext-tools/PLIST
index 32faf33..98bc164 100644
--- a/py-gettext-tools/PLIST
+++ b/py-gettext-tools/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/18 05:35:01 mpasternak Exp $
+@comment $NetBSD$
bin/msgfmt.py-${PYVERSSUFFIX}
bin/pygettext.py-${PYVERSSUFFIX}
diff --git a/py-goless/Makefile b/py-goless/Makefile
index 0078e02..da3847e 100644
--- a/py-goless/Makefile
+++ b/py-goless/Makefile
@@ -14,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-gevent>=1.0.2:../../net/py-gevent
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gevent
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gorm/Makefile b/py-gorm/Makefile
index a91ee65..13728d6 100644
--- a/py-gorm/Makefile
+++ b/py-gorm/Makefile
@@ -14,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gosam/Makefile b/py-gosam/Makefile
index 38bc2b6..7c5d778 100644
--- a/py-gosam/Makefile
+++ b/py-gosam/Makefile
@@ -14,10 +14,9 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
WRKSRC= ${WRKDIR}/${DISTNAME:S/-700//}
-USE_LANGUAGES= c c++
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 2.0.0-700
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+USE_LANGUAGES= c c++
post-extract:
${MV} ${WRKSRC}/src/python/golem/gosam-config.py \
@@ -25,5 +24,5 @@ post-extract:
${MV} ${WRKSRC}/src/python/golem/gosam.py \
${WRKSRC}/src/python/golem/gosam.py${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gosam/PLIST b/py-gosam/PLIST
index 7684260..6a04d7e 100644
--- a/py-gosam/PLIST
+++ b/py-gosam/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/06 23:08:58 jihbed Exp $
-bin/gosam-config.py2.7
-bin/gosam.py2.7
+@comment $NetBSD$
+bin/gosam-config.py${PYVERSSUFFIX}
+bin/gosam.py${PYVERSSUFFIX}
${PYSITELIB}/golem/__init__.py
${PYSITELIB}/golem/__init__.pyc
${PYSITELIB}/golem/__init__.pyo
@@ -154,3 +154,4 @@ ${PYSITELIB}/golem/util/path.pyo
${PYSITELIB}/golem/util/tools.py
${PYSITELIB}/golem/util/tools.pyc
${PYSITELIB}/golem/util/tools.pyo
+${PYSITELIB}/gosam-2.0.0_701-py${PYVERSSUFFIX}.egg-info
diff --git a/py-goulib/Makefile b/py-goulib/Makefile
index 93f9f33..ca70ed3 100644
--- a/py-goulib/Makefile
+++ b/py-goulib/Makefile
@@ -11,17 +11,18 @@ HOMEPAGE= http://github.com/goulu/goulib
COMMENT= Library of useful Python code for scientific + technical applications
LICENSE= gnu-lgpl-v3
-USE_LANGUAGES= # none
-
-PYDISTUTILSPKG= yes
-
-.include "../../graphics/py-matplotlib/buildlink3.mk"
#DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.4.0:../../graphics/py-Pillow
-.include "../../lang/python/extension.mk"
DEPENDS+= ${PYPKGPREFIX}-six>=1.7.2:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.8.1:../../math/py-networkx
-.include "../../math/py-numpy/buildlink3.mk"
DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-lxml>=3.3.5:../../textproc/py-lxml
DEPENDS+= ${PYPKGPREFIX}-xlrd>=0.9.2:../../textproc/py-xlrd
+
+USE_LANGUAGES= # none
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
+
+.include "../../graphics/py-matplotlib/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
+.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gpaw/Makefile b/py-gpaw/Makefile
index d86e5e0..b433581 100644
--- a/py-gpaw/Makefile
+++ b/py-gpaw/Makefile
@@ -15,8 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-ase-[0-9]*:../../wip/py-ase
USE_LANGUAGES= c c99
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+EGG_NAME= gpaw-0.9.0
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gtk2 and py-gobject via py-ase
post-extract:
@@ -26,6 +25,6 @@ post-extract:
${MV} ${WRKSRC}/tools/gpaw-setup ${WRKSRC}/tools/gpaw-setup${PYVERSSUFFIX}
${MV} ${WRKSRC}/tools/gpaw-test ${WRKSRC}/tools/gpaw-test${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gpaw/PLIST b/py-gpaw/PLIST
index 999fb3e..1537211 100644
--- a/py-gpaw/PLIST
+++ b/py-gpaw/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/07 16:17:32 jihbed Exp $
-bin/gpaw-basis2.7
-bin/gpaw-mpisim2.7
-bin/gpaw-setup2.7
-bin/gpaw2.7
+@comment $NetBSD$
+bin/gpaw-basis${PYVERSSUFFIX}
+bin/gpaw-mpisim${PYVERSSUFFIX}
+bin/gpaw-setup${PYVERSSUFFIX}
+bin/gpaw${PYVERSSUFFIX}
${PYSITELIB}/_gpaw.so
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/gpaw/__init__.py
${PYSITELIB}/gpaw/__init__.pyc
${PYSITELIB}/gpaw/__init__.pyo
diff --git a/py-graphsim/Makefile b/py-graphsim/Makefile
index 11ed417..6948ea7 100644
--- a/py-graphsim/Makefile
+++ b/py-graphsim/Makefile
@@ -13,6 +13,8 @@ LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.10:../../math/py-networkx
DEPENDS+= ${PYPKGPREFIX}-typedecorator>=0.0.4:../../wip/py-typedecorator
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
+
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-gsl/Makefile b/py-gsl/Makefile
index b2293b5..ca54ad4 100644
--- a/py-gsl/Makefile
+++ b/py-gsl/Makefile
@@ -10,7 +10,8 @@ HOMEPAGE= http://pygsl.sourceforge.net/
COMMENT= Python interface for the GNU scientific library
LICENSE= gnu-gpl-v3
-PYDISTUTILSPKG= yes
+USE_TOOLS+= pkg-config
+
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric, py-numarray
do-test:
@@ -21,8 +22,8 @@ INSTALLATION_DIRS= share/doc/py-gsl/ref
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/html/ref/* ${DESTDIR}${PREFIX}/share/doc/py-gsl/ref
-.include "../../lang/python/extension.mk"
-BUILDLINK_API_DEPENDS.gsl+= gsl>=1.4
+.include "../../lang/python/distutils.mk"
+BUILDLINK_API_DEPENDS.gsl+= gsl>=1.9
.include "../../math/gsl/buildlink3.mk"
# furur replace py-Numeric; py-numarray by py-numpy
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/py-gsl/buildlink3.mk b/py-gsl/buildlink3.mk
index aecfc44..410e83a 100644
--- a/py-gsl/buildlink3.mk
+++ b/py-gsl/buildlink3.mk
@@ -8,6 +8,7 @@ PY_GSL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.py-gsl+= ${PYPKGPREFIX}-gsl>=0.9.5
BUILDLINK_PKGSRCDIR.py-gsl?= ../../wip/py-gsl
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric, py-numarray via py-gsl
.include "../../math/gsl/buildlink3.mk"
#.include "../../math/py-numpy/buildlink3.mk"
.endif # PY_GSL_BUILDLINK3_MK
diff --git a/py-hyperspy/Makefile b/py-hyperspy/Makefile
index cc1b97d..d73b193 100644
--- a/py-hyperspy/Makefile
+++ b/py-hyperspy/Makefile
@@ -10,21 +10,17 @@ HOMEPAGE= http://hyperspy.org/
COMMENT= Multidimensional data analysis toolbox
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/hyperspy-0.7.2
+#DEPENDS+= ${PYPKGPREFIX}-ipython1>=1.2.1:../../devel/py-ipython1
+DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.7.2
post-extract:
${MV} ${WRKSRC}/bin/hyperspy ${WRKSRC}/bin/hyperspy${PYVERSSUFFIX}
-
-#DEPENDS+= ${PYPKGPREFIX}-ipython1>=1.2.1:../../devel/py-ipython1
.include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
.include "../../mk/bsd.pkg.mk"
diff --git a/py-hyperspy/PLIST b/py-hyperspy/PLIST
index 65016d6..4d6f1d7 100644
--- a/py-hyperspy/PLIST
+++ b/py-hyperspy/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2014/08/22 21:57:16 jihbed Exp $
-bin/hyperspy2.7
+@comment $NetBSD$
+bin/hyperspy${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/hyperspy/Release.py
${PYSITELIB}/hyperspy/Release.pyc
${PYSITELIB}/hyperspy/Release.pyo
diff --git a/py-irco/Makefile b/py-irco/Makefile
index ce4b591..90558a9 100644
--- a/py-irco/Makefile
+++ b/py-irco/Makefile
@@ -27,7 +27,6 @@ DEPENDS+= ${PYPKGPREFIX}-raven>=4.2.1:../../wip/py-raven
USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx, py-tablib-garetjax
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/irco-convert \
diff --git a/py-lib/Makefile b/py-lib/Makefile
index 8b0dee4..56e0d4c 100644
--- a/py-lib/Makefile
+++ b/py-lib/Makefile
@@ -15,7 +15,6 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-docutils>=0.5:../../textproc/py-docutils
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-docutils
REPLACE_PYTHON+= py/cmdline/pycleanup.py
diff --git a/py-locustio/Makefile b/py-locustio/Makefile
index fccb06e..c5a23d3 100644
--- a/py-locustio/Makefile
+++ b/py-locustio/Makefile
@@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.4.2:../../devel/py-msgpack
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gevent
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/locust \
diff --git a/py-loggly/Makefile b/py-loggly/Makefile
index 8a675dd..f5f838b 100644
--- a/py-loggly/Makefile
+++ b/py-loggly/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2013/06/19 14:12:22 noud4 Exp $
-#
DISTNAME= loggly-0.1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,12 +13,10 @@ LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.6.1:../../converters/py-simplejson
-WRKSRC= ${WRKDIR}/loggly-0.1.2
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.1.2 (uses urllib2)
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/scripts/loggly-add-device ${WRKSRC}/scripts/loggly-add-device${PYVERSSUFFIX}
${MV} ${WRKSRC}/scripts/loggly-create-input ${WRKSRC}/scripts/loggly-create-input${PYVERSSUFFIX}
@@ -27,6 +24,5 @@ post-extract:
${MV} ${WRKSRC}/scripts/loggly-describe-input ${WRKSRC}/scripts/loggly-describe-input${PYVERSSUFFIX}
${MV} ${WRKSRC}/scripts/loggly-remove-device ${WRKSRC}/scripts/loggly-remove-device${PYVERSSUFFIX}
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-loggly/distinfo b/py-loggly/distinfo
index 11b639b..ea08a1d 100644
--- a/py-loggly/distinfo
+++ b/py-loggly/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.1 2012/10/02 00:10:26 jihbed Exp $
SHA1 (loggly-0.1.2.tar.gz) = a81ae69163db92d4aeb2a1d944f36bff598c56f3
RMD160 (loggly-0.1.2.tar.gz) = 4b14c20142c463d44b4c36c27a0a134faed80814
Size (loggly-0.1.2.tar.gz) = 5671 bytes
-SHA1 (patch-setup.py) = b435d7f476e489731dbaf582277772ad32f60ef7
+SHA1 (patch-setup.py) = bc107b4901c35d2cf8ba3699afdd4e1983d9f5b8
diff --git a/py-logilab-mtconverter/Makefile b/py-logilab-mtconverter/Makefile
index 352cbf2..95a83a4 100644
--- a/py-logilab-mtconverter/Makefile
+++ b/py-logilab-mtconverter/Makefile
@@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-logilab-common>=0.53.0:../../devel/py-logilab-common
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-mxDateTime via py-logilab-common
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-lxmlproc/Makefile b/py-lxmlproc/Makefile
index ea1ff54..4316639 100644
--- a/py-lxmlproc/Makefile
+++ b/py-lxmlproc/Makefile
@@ -15,11 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-lxml>=2.3.2:../../textproc/py-lxml
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/src/lxmlproc ${WRKSRC}/src/lxmlproc${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-lxmlproc/PLIST b/py-lxmlproc/PLIST
index 816e9fc..3ae66f8 100644
--- a/py-lxmlproc/PLIST
+++ b/py-lxmlproc/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2012/11/16 23:48:40 noud4 Exp $
+@comment $NetBSD$
bin/lxmlproc${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
diff --git a/py-mailingstats/Makefile b/py-mailingstats/Makefile
index 5a7a1c4..7c84ead 100644
--- a/py-mailingstats/Makefile
+++ b/py-mailingstats/Makefile
@@ -1,12 +1,11 @@
# $NetBSD$
-GITHUB_PROJECT= MailingListStats
EGG_NAME= mlstats-0.4
-DISTNAME= 0.4.1
-PKGNAME= ${PYPKGPREFIX}-${GITHUB_PROJECT:tl}-${DISTNAME}
+DISTNAME= MailingListStats-0.4.1
+PKGNAME= ${PYPKGPREFIX}--${DISTNAME}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=MetricsGrimoire/}
-DIST_SUBDIR= ${GITHUB_PROJECT}
+GITHUB_PROJECT= MailingListStats
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= https://github.com/MetricsGrimoire/MailingListStats
@@ -15,12 +14,9 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=1.0.9:../../databases/py-sqlalchemy
-WRKSRC= ${WRKDIR}/MailingListStats-0.4.1
-
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.4.1
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/mlstats ${WRKSRC}/mlstats${PYVERSSUFFIX}
diff --git a/py-mailingstats/distinfo b/py-mailingstats/distinfo
index ad71239..b9b82c6 100644
--- a/py-mailingstats/distinfo
+++ b/py-mailingstats/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-SHA1 (MailingListStats/0.4.1.tar.gz) = 2696873c75016f1767da1c602a945ef88c91ffdb
-RMD160 (MailingListStats/0.4.1.tar.gz) = a65b014e4c66ee3d54c05693e5c74daeba08ab5f
-SHA512 (MailingListStats/0.4.1.tar.gz) = 94f5786c34baf03284561c45f51fe9d436a46d901bbe760183750f3f88af66273d4cfc56f0ad0e749ea0b61e4e8c32521a706fe1f5f88d04a345af2ec01a6a82
-Size (MailingListStats/0.4.1.tar.gz) = 74898 bytes
+SHA1 (MailingListStats-0.4.1.tar.gz) = 2696873c75016f1767da1c602a945ef88c91ffdb
+RMD160 (MailingListStats-0.4.1.tar.gz) = a65b014e4c66ee3d54c05693e5c74daeba08ab5f
+SHA512 (MailingListStats-0.4.1.tar.gz) = 94f5786c34baf03284561c45f51fe9d436a46d901bbe760183750f3f88af66273d4cfc56f0ad0e749ea0b61e4e8c32521a706fe1f5f88d04a345af2ec01a6a82
+Size (MailingListStats-0.4.1.tar.gz) = 74898 bytes
SHA1 (patch-setup.py) = 3b676ad83b10b2b86db79d977401e9ba1fed5576
diff --git a/py-mcview/Makefile b/py-mcview/Makefile
index a9f4452..9e1baa9 100644
--- a/py-mcview/Makefile
+++ b/py-mcview/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.2 2012/10/07 12:25:17 asau Exp $
-#
DISTNAME= mcview-0.4.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -8,16 +7,15 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=m/mcview/}
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= http://pypi.python.org/pypi?%3Aaction=search&term=mcview&submit=search
-COMMENT= 3D/graph event viewer for high-energy physics event simulations
+COMMENT= 3D/graph event viewer for high-energy physics event simulations
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/mcview-0.4.0
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
USE_LANGUAGES= # none
-post-extract:
- ${MV} ${WRKSRC}/mcview ${WRKSRC}/mcview${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.4.0
+
+post-install:
+ cd ${DESTDIR}${PREFIX}/bin && ${MV} mcview mcview-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-mcview/PLIST b/py-mcview/PLIST
index aa57ce4..e08cffd 100644
--- a/py-mcview/PLIST
+++ b/py-mcview/PLIST
@@ -1,5 +1,5 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2011/03/07 10:17:26 jihbed Exp $
-bin/mcview
+bin/mcview-${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/py-metrics/Makefile b/py-metrics/Makefile
index c6edfa6..b8782e0 100644
--- a/py-metrics/Makefile
+++ b/py-metrics/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2015/03/14 17:49:21 jihbed Exp $
-#
DISTNAME= pymetrics-0.8.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,13 +11,11 @@ COMMENT= Metrics for python files
LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.8.1
post-extract:
${MV} ${WRKSRC}/pymetrics ${WRKSRC}/pymetrics${PYVERSSUFFIX}
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-metrics/PLIST b/py-metrics/PLIST
index 42425fb..f41cab5 100644
--- a/py-metrics/PLIST
+++ b/py-metrics/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2015/03/14 17:49:21 jihbed Exp $
-bin/pymetrics2.7
+@comment $NetBSD$
+bin/pymetrics${PYVERSSUFFIX}
+${PYSITELIB}/PyMetrics-PYMETRICS_VERSION-py${PYVERSSUFFIX}.egg-info
${PYSITELIB}/PyMetrics/PyMetrics.py
${PYSITELIB}/PyMetrics/PyMetrics.pyc
${PYSITELIB}/PyMetrics/PyMetrics.pyo
diff --git a/py-minepy/Makefile b/py-minepy/Makefile
index 36bc3d5..2358310 100644
--- a/py-minepy/Makefile
+++ b/py-minepy/Makefile
@@ -10,15 +10,11 @@ HOMEPAGE= minepy.sourceforge.net
COMMENT= Maximal Information-based Nonparametric Exploration
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/minepy-1.0.0
-
USE_LANGUAGES= c c++
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-extract:
${MV} ${WRKSRC}/minepy/scripts/mine ${WRKSRC}/minepy/scripts/mine${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-minepy/PLIST b/py-minepy/PLIST
index 61ad49d..ff80d08 100644
--- a/py-minepy/PLIST
+++ b/py-minepy/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/14 17:52:32 jihbed Exp $
-bin/mine2.7
+@comment $NetBSD$
+bin/mine${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/minepy/__init__.py
${PYSITELIB}/minepy/__init__.pyc
${PYSITELIB}/minepy/__init__.pyo
diff --git a/py-mois/Makefile b/py-mois/Makefile
index 482ddc3..b56f87e 100644
--- a/py-mois/Makefile
+++ b/py-mois/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.2 2012/10/07 12:25:24 asau Exp $
-#
DISTNAME= PyMois-0.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/S/M/m/}
@@ -12,7 +11,8 @@ COMMENT= Applications for interactive visualization of numerical methods
LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric, py-numarray via py-gsl
post-extract:
${MV} ${WRKSRC}/pymois/chebychev_app.py ${WRKSRC}/pymois/chebychev${PYVERSSUFFIX}
diff --git a/py-mote/Makefile b/py-mote/Makefile
index 04de3b6..cc7f3b9 100644
--- a/py-mote/Makefile
+++ b/py-mote/Makefile
@@ -12,12 +12,13 @@ COMMENT= Python library for simulation of distributed algorithms
LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-ipython>=3.2.1:../../devel/py-ipython
-
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
DEPENDS+= ${PYPKGPREFIX}-scipy>=0.15.0:../../math/py-scipy
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
+
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../lang/python/egg.mk"
diff --git a/py-netflowvizu/Makefile b/py-netflowvizu/Makefile
index bc696fa..3a4f729 100644
--- a/py-netflowvizu/Makefile
+++ b/py-netflowvizu/Makefile
@@ -12,11 +12,8 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-WRKSRC= ${WRKDIR}/NetFlowVizu-0.6
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-xml
post-extract:
diff --git a/py-ngf/Makefile b/py-ngf/Makefile
index bc20acd..a31f7ed 100644
--- a/py-ngf/Makefile
+++ b/py-ngf/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE= https://files.pythonhosted.org/packages/source/P/PyNFG/
COMMENT= Python package for implementing and solving Network form games
LICENSE= gnu-agpl-v3
-WRKSRC= ${WRKDIR}/PyNFG-0.1.2
+DEPENDS+= ${PYPKGPREFIX}-networkx>=1.8.1:../../math/py-networkx
+DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
post-extract:
@@ -23,7 +23,5 @@ post-extract:
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../lang/python/egg.mk"
-DEPENDS+= ${PYPKGPREFIX}-networkx>=1.8.1:../../math/py-networkx
.include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
.include "../../mk/bsd.pkg.mk"
diff --git a/py-nuitka/Makefile b/py-nuitka/Makefile
index 69482a6..5f8377a 100644
--- a/py-nuitka/Makefile
+++ b/py-nuitka/Makefile
@@ -12,12 +12,11 @@ LICENSE= apache-2.0
USE_LANGUAGES= c++
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # 0.5.13.4 includes and installs old scons version
post-extract:
${MV} ${WRKSRC}/bin/nuitka ${WRKSRC}/bin/nuitka${PYVERSSUFFIX}
.include "../../devel/py-cython/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-nuitka/PLIST b/py-nuitka/PLIST
index fa03c62..2db0c25 100644
--- a/py-nuitka/PLIST
+++ b/py-nuitka/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2015/08/01 22:15:24 jihbed Exp $
-bin/nuitka2.7
+@comment $NetBSD$
+bin/nuitka${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/nuitka/Builtins.py
${PYSITELIB}/nuitka/Builtins.pyc
${PYSITELIB}/nuitka/Builtins.pyo
diff --git a/py-ocrodjvu/Makefile b/py-ocrodjvu/Makefile
index 8eb17aa..251c358 100644
--- a/py-ocrodjvu/Makefile
+++ b/py-ocrodjvu/Makefile
@@ -13,8 +13,6 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-djvulibre-[0-9]*:../../wip/py-djvulibre
DEPENDS+= djvulibre-tools-[0-9]*:../../graphics/djvulibre-tools
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-djvulibre
-
REPLACE_PYTHON+= lib/logger.py
.include "../../lang/python/application.mk"
diff --git a/py-p4/Makefile b/py-p4/Makefile
index a9d132e..6784124 100644
--- a/py-p4/Makefile
+++ b/py-p4/Makefile
@@ -10,7 +10,6 @@ COMMENT= Perforce SCM Python API
.include "../../wip/p4/Makefile.common"
USE_LANGUAGES= c c++
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYSETUPARGS+= --apidir ${BUILDLINK_DIR}/share/examples/p4
EGG_NAME= ${DISTNAME}-${P4_VER}.${P4_VER_PL}
diff --git a/py-pafy/Makefile b/py-pafy/Makefile
index c670ad0..6d65e90 100644
--- a/py-pafy/Makefile
+++ b/py-pafy/Makefile
@@ -10,12 +10,8 @@ HOMEPAGE= http://np1.github.io/pafy/
COMMENT= Retrieve YouTube content and metadata
LICENSE= gnu-lgpl-v3
-WRKSRC= ${WRKDIR}/pafy-0.3.74
-
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/scripts/ytdl ${WRKSRC}/scripts/ytdl${PYVERSSUFFIX}
diff --git a/py-pafy/PLIST b/py-pafy/PLIST
index 9a86244..268b82a 100644
--- a/py-pafy/PLIST
+++ b/py-pafy/PLIST
@@ -1,5 +1,5 @@
@comment $NetBSD$
-bin/ytdl2.7
+bin/ytdl${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/py-pithos/Makefile b/py-pithos/Makefile
index 0c6e1e7..d7e996c 100644
--- a/py-pithos/Makefile
+++ b/py-pithos/Makefile
@@ -1,8 +1,10 @@
# $NetBSD$
-DISTNAME= ${PYPKGPREFIX}-pithos-1.1.2
+DISTNAME= pithos-1.1.2
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_GITHUB:=pithos/}
+GITHUB_PROJECT= pithos
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://pithos.github.io/
@@ -29,7 +31,6 @@ DEPENDS+= gnome-icon-theme-symbolic-[0-9]*:../../graphics/gnome-icon-theme-symbo
USE_LANGUAGES= # none
USE_TOOLS+= intltool
PYTHON_VERSIONS_INCOMPATIBLE= 27
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
SUBST_CLASSES+= prefix
SUBST_SED.prefix+= -e "s,/usr,${PREFIX},g"
diff --git a/py-plac/Makefile b/py-plac/Makefile
index 92dfc7d..46fb1f2 100644
--- a/py-plac/Makefile
+++ b/py-plac/Makefile
@@ -10,12 +10,8 @@ HOMEPAGE= https://github.com/micheles/plac
COMMENT= The smartest command line arguments parser in the world
LICENSE= modified-bsd
-WRKSRC= ${WRKDIR}/plac-0.9.6
-
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/plac_runner.py ${WRKSRC}/plac_runner.py${PYVERSSUFFIX}
diff --git a/py-plac/PLIST b/py-plac/PLIST
index 641efe8..abdd50b 100644
--- a/py-plac/PLIST
+++ b/py-plac/PLIST
@@ -1,5 +1,5 @@
@comment $NetBSD$
-bin/plac_runner.py2.7
+bin/plac_runner.py${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/py-pp/Makefile b/py-pp/Makefile
index 6ec16ba..3dd56f1 100644
--- a/py-pp/Makefile
+++ b/py-pp/Makefile
@@ -12,8 +12,7 @@ LICENSE= 2-clause-bsd
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 1.6.4
INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/py-pp
@@ -26,5 +25,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/ppdoc.html\
${DESTDIR}${PREFIX}/share/doc/py-pp
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pp/PLIST b/py-pp/PLIST
index 0f67c96..e56cb26 100644
--- a/py-pp/PLIST
+++ b/py-pp/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2014/02/11 20:51:01 jihbed Exp $
-bin/ppserver2.7
+@comment $NetBSD$
+bin/ppserver${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/pp.py
${PYSITELIB}/pp.pyc
${PYSITELIB}/pp.pyo
diff --git a/py-ptrace/Makefile b/py-ptrace/Makefile
index a018553..01ab441 100644
--- a/py-ptrace/Makefile
+++ b/py-ptrace/Makefile
@@ -15,12 +15,9 @@ DEPENDS+= ${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
ONLY_FOR_PLATFORM= FreeBSD-*-x86_64 FreeBSD-*-i386 Linux-*-*
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYDISTUTILSPKG= yes
-
post-extract:
${MV} ${WRKSRC}/strace.py ${WRKSRC}/strace.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/gdb.py ${WRKSRC}/gdb.py${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pydec/Makefile b/py-pydec/Makefile
index 657e1ac..03e71eb 100644
--- a/py-pydec/Makefile
+++ b/py-pydec/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.6 2012/11/14 00:16:15 othyro Exp $
-#
DISTNAME= ${PYPKGPREFIX}-pydec-0.67.0
PKGREVISION= 3
@@ -7,19 +6,21 @@ EGG_NAME= pydec-1.0.0.dev29
CATEGORIES= math python
MAINTAINER= jihbed.research%gmail.com@localhost
-HOMEPAGE= http://code.google.com/p/pydec/
+#HOMEPAGE= http://code.google.com/p/pydec/
COMMENT= Python Library for Discrete Exterior Calculus
LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
+BROKEN= googlecode shut down.
+
# Get it from Subversion repository:
+# XXX is down since googlecode shut down
SVN_REPOSITORIES= pydec
SVN_ROOT.pydec= http://pydec.googlecode.com/svn/trunk
SVN_MODULE.pydec= pydec
WRKSRC= ${WRKDIR}/pydec
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
.include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/py-pyflation/Makefile b/py-pyflation/Makefile
index a532ad7..19372c2 100644
--- a/py-pyflation/Makefile
+++ b/py-pyflation/Makefile
@@ -3,15 +3,17 @@
DISTNAME= pyflation-0.2.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= math python
-MASTER_SITES= http://pyflation.ianhuston.net/files/pyflation/
+MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyflation/}
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= http://pyflation.ianhuston.net/
COMMENT= Calculating cosmological perturbations during an inflationary
LICENSE= modified-bsd
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
+DEPENDS+= ${PYPKGPREFIX}-pytables>=2.4.0:../../math/py-pytables
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.2.3
post-extract:
${MV} ${WRKSRC}/bin/pyflation_combine.py ${WRKSRC}/bin/pyflation_combine.py${PYVERSSUFFIX}
@@ -22,10 +24,7 @@ post-extract:
${MV} ${WRKSRC}/bin/pyflation_source.py ${WRKSRC}/bin/pyflation_source.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/pyflation_srcmerge.py ${WRKSRC}/bin/pyflation_srcmerge.py${PYVERSSUFFIX}
-
.include "../../devel/py-cython/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
-DEPENDS+= ${PYPKGPREFIX}-pytables>=2.4.0:../../math/py-pytables
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pyflation/PLIST b/py-pyflation/PLIST
index 1dd6940..f5b7cce 100644
--- a/py-pyflation/PLIST
+++ b/py-pyflation/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/02 16:06:17 jihbed Exp $
-bin/pyflation_combine.py2.7
-bin/pyflation_firstorder.py2.7
-bin/pyflation_newrun.py2.7
-bin/pyflation_qsubstart.py2.7
-bin/pyflation_secondorder.py2.7
-bin/pyflation_source.py2.7
-bin/pyflation_srcmerge.py2.7
+@comment $NetBSD$
+bin/pyflation_combine.py${PYVERSSUFFIX}
+bin/pyflation_firstorder.py${PYVERSSUFFIX}
+bin/pyflation_newrun.py${PYVERSSUFFIX}
+bin/pyflation_qsubstart.py${PYVERSSUFFIX}
+bin/pyflation_secondorder.py${PYVERSSUFFIX}
+bin/pyflation_source.py${PYVERSSUFFIX}
+bin/pyflation_srcmerge.py${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/pyflation/__init__.py
${PYSITELIB}/pyflation/__init__.pyc
${PYSITELIB}/pyflation/__init__.pyo
diff --git a/py-pygr/Makefile b/py-pygr/Makefile
index c0d4a69..6355171 100644
--- a/py-pygr/Makefile
+++ b/py-pygr/Makefile
@@ -16,7 +16,6 @@ DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
DEPENDS+= ${PYPKGPREFIX}-pyrex-[0-9]*:../../lang/py-pyrex
USE_LANGUAGES= c c++
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-mysqldb, py-pyrex
.include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/py-pyslha/Makefile b/py-pyslha/Makefile
index bff9047..cd675c1 100644
--- a/py-pyslha/Makefile
+++ b/py-pyslha/Makefile
@@ -11,16 +11,14 @@ HOMEPAGE= http://www.insectnation.org/projects/pyslha
COMMENT= Parsing, manipulating, and visualising SUSY Les Houches Accord data
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/pyslha-1.2.3
-
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 1.2.3
post-extract:
${MV} ${WRKSRC}/isawig2slha ${WRKSRC}/isawig2slha${PYVERSSUFFIX}
${MV} ${WRKSRC}/slha2isawig ${WRKSRC}/slha2isawig${PYVERSSUFFIX}
${MV} ${WRKSRC}/slhaplot ${WRKSRC}/slhaplot${PYVERSSUFFIX}
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pyslha/PLIST b/py-pyslha/PLIST
index bfdd4bf..1b47795 100644
--- a/py-pyslha/PLIST
+++ b/py-pyslha/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2012/11/16 23:27:26 noud4 Exp $
+@comment $NetBSD$
bin/isawig2slha${PYVERSSUFFIX}
bin/slha2isawig${PYVERSSUFFIX}
bin/slhaplot${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/pyslha.py
${PYSITELIB}/pyslha.pyc
${PYSITELIB}/pyslha.pyo
diff --git a/py-pythia/Makefile b/py-pythia/Makefile
index 9ec523f..55bbb9a 100644
--- a/py-pythia/Makefile
+++ b/py-pythia/Makefile
@@ -8,20 +8,17 @@ MASTER_SITES= http://www.geodynamics.org/cig/software/pythia/
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= http://www.geodynamics.org/cig/software/pythia
-COMMENT=Framework for specifying and staging complex,multi-physics simulations
+COMMENT= Framework for specifying and staging complex, multi-physics simulations
LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-ipython>=0.10.2:../../devel/py-ipython
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-ipython
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/bin/idd.py ${WRKSRC}/bin/idd.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/ipad.py ${WRKSRC}/bin/ipad.py${PYVERSSUFFIX}
- ${MV} ${WRKSRC}/bin/journald.py ${WRKSRC}/bin/journald.py${PYVERSSUFFIX}
-
+ ${MV} ${WRKSRC}/bin/journald.py ${WRKSRC}/bin/journald.py${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-restkit/Makefile b/py-restkit/Makefile
index d521ce0..7a9fac6 100644
--- a/py-restkit/Makefile
+++ b/py-restkit/Makefile
@@ -24,7 +24,7 @@ REPLACE_PYTHON+= restkit/contrib/webob_api.py
DOCDIR= share/doc/${PKGBASE:S/${PYPKGPREFIX}/py/1}
INSTALLATION_DIRS+= ${DOCDIR}
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-socketpool
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-socketpool, py-gevent
post-install:
${INSTALL_DATA} ${DESTDIR}${PREFIX}/restkit/README.rst \
diff --git a/py-scikit-image/Makefile b/py-scikit-image/Makefile
index fe1692c..4f17ca8 100644
--- a/py-scikit-image/Makefile
+++ b/py-scikit-image/Makefile
@@ -17,8 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
-WRKSRC= ${WRKDIR}/scikit-image-0.11.3
-
.include "../../devel/py-cython/buildlink3.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../lang/python/egg.mk"
diff --git a/py-scikits_ann/Makefile b/py-scikits_ann/Makefile
index bbe3b58..360c2e3 100644
--- a/py-scikits_ann/Makefile
+++ b/py-scikits_ann/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2012/10/16 08:32:49 thomasklausner Exp $
-#
DISTNAME= scikits.ann-${PYPKGVERSION}
EGG_NAME= ${DISTNAME}
@@ -15,12 +14,11 @@ LICENSE= gnu-lgpl-v3
BUILD_DEPENDS+= swig-[0-9]*:../../devel/swig
-#WRKSRC= ${WRKDIR}/scikits.ann-0.2.dev-r803
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.2.dev-r803, uses ConfigParser
USE_LANGUAGES= c c++
PYPKGVERSION= 0.2.dev-r803
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= PYPKGVERSION=${PYPKGVERSION:S|-|_|}
do-test:
diff --git a/py-scikits_hydroclimpy/Makefile b/py-scikits_hydroclimpy/Makefile
index 14a3c45..3c6e0c9 100644
--- a/py-scikits_hydroclimpy/Makefile
+++ b/py-scikits_hydroclimpy/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2012/11/14 00:16:16 othyro Exp $
-#
DISTNAME= ${PYPKGPREFIX}-scikits_hydroclimpy-0.67.1
EGG_NAME= ${DISTNAME:S|${PYPKGPREFIX}-||:S|kits_|kits.|:Q}
@@ -13,6 +12,8 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
USE_LANGUAGES+= c fortran
+BROKEN= SVN repository got shut down.
+
# Get it from Subversion repository:
SVN_REPOSITORIES= hydroclimpy
SVN_ROOT.hydroclimpy= http://svn.scipy.org/svn/scikits/trunk/hydroclimpy
@@ -20,8 +21,6 @@ SVN_MODULE.hydroclimpy= hydroclimpy
WRKSRC= ${WRKDIR}/hydroclimpy
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../lang/python/egg.mk"
BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.0
diff --git a/py-scitools/Makefile b/py-scitools/Makefile
index 848ec4a..a8fc900 100644
--- a/py-scitools/Makefile
+++ b/py-scitools/Makefile
@@ -5,10 +5,12 @@ PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
EGG_NAME= ${DISTNAME:S|scitools|SciTools|:Q}
PKGREVISION= 4
CATEGORIES= math python
-MASTER_SITES= http://scitools.googlecode.com/files/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=hplgit/}
+GITHUB_PROJECT= scitools
+GITHUB_TAG= ${DISTNAME}
MAINTAINER= jihbed.research%gmail.com@localhost
-HOMEPAGE= http://code.google.com/p/scitools/
+HOMEPAGE= https://github.com/hplgit/scitools
COMMENT= Python library for scientific computing
LICENSE= modified-bsd
@@ -17,10 +19,9 @@ DEPENDS+= ${PYPKGPREFIX}-matplotlib-gtk>=1.1.1:../../graphics/py-matplotlib-gtk2
USE_TOOLS+= gzip
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 35 35 34 34 # py-gtk2 via py-matplotlib-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-gtk2 via py-matplotlib-gtk2
post-extract:
gzip -d ${WRKSRC}/doc/man/man1/*.gz
diff --git a/py-scitools/distinfo b/py-scitools/distinfo
index bd30495..3f1e585 100644
--- a/py-scitools/distinfo
+++ b/py-scitools/distinfo
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.2 2012/10/11 14:25:00 jihbed Exp $
-SHA1 (scitools-0.9.0.tar.gz) = 68f774a5580689dbecc95cd4a4dc28f56dfeca01
-RMD160 (scitools-0.9.0.tar.gz) = c0c57bc2f248ca1721e66210c00df4241a7dd4ac
-Size (scitools-0.9.0.tar.gz) = 16419259 bytes
+SHA1 (scitools-0.9.0.tar.gz) = 5017e917a15a9fa469784584dbb3633f91466699
+RMD160 (scitools-0.9.0.tar.gz) = 6dd520ceaed097e5140209ca4cc006b0c3815488
+SHA512 (scitools-0.9.0.tar.gz) = 90ff58136e0d9e6b13018c5f31db9cb68e37938f00e9f07c828c814ed065c8fc14aa6a795170f2616d95e3d39f1e72cfbebc328ee7e489e500d9481f458b6545
+Size (scitools-0.9.0.tar.gz) = 16572053 bytes
SHA1 (patch-setup.py) = 1f79fa957abe8eb4922b09fd7e522ee32ef763fb
diff --git a/py-seeds/Makefile b/py-seeds/Makefile
index 7c598c6..726048b 100644
--- a/py-seeds/Makefile
+++ b/py-seeds/Makefile
@@ -14,8 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-networkx>=1.7:../../math/py-networkx
USE_LANGUAGES= c
-PYDISTUTILSPKG= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-shedskin/Makefile b/py-shedskin/Makefile
index bdc3bdd..46b8ce4 100644
--- a/py-shedskin/Makefile
+++ b/py-shedskin/Makefile
@@ -4,7 +4,7 @@ DISTNAME= shedskin-0.9.4
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 1
CATEGORIES= lang python
-MASTER_SITES= http://shedskin.googlecode.com/files/
+MASTER_SITES= https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shedskin/
EXTRACT_SUFX= .tgz
MAINTAINER= kamelderouiche%yahoo.com@localhost
@@ -14,9 +14,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c++
-PYDISTUTILSPKG=yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.9.4
post-extract:
cd ${WRKSRC}/scripts && ${MV} shedskin shedskin${PYVERSSUFFIX}
@@ -24,6 +22,5 @@ post-extract:
do-test:
cd ${WRKSRC} && ${PYTHONBIN} test.py
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-shedskin/PLIST b/py-shedskin/PLIST
index 6052ba4..55fe1a6 100644
--- a/py-shedskin/PLIST
+++ b/py-shedskin/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2014/02/11 20:31:14 jihbed Exp $
-bin/shedskin2.7
+@comment $NetBSD$
+bin/shedskin${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/shedskin/FLAGS
${PYSITELIB}/shedskin/FLAGS.mingw
${PYSITELIB}/shedskin/FLAGS.msvc
diff --git a/py-shedskin/patches/patch-aa b/py-shedskin/patches/patch-aa
deleted file mode 100644
index 1301db0..0000000
--- a/py-shedskin/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- setup.py.orig 2010-06-20 10:10:45.000000000 +0000
-+++ setup.py 2010-07-16 23:33:38.000000000 +0000
-@@ -1,12 +1,13 @@
- #!/usr/bin/env python
-
- from distutils.core import setup
-+import sys
-
- setup(name='shedskin',
- version='0.5',
- description='Shed Skin is an experimental compiler, that can translate pure, but implicitly statically typed Python programs into optimized C++. It can generate stand-alone programs or extension modules that can be imported and used in larger Python programs.',
- url='http://code.google.com/p/shedskin/',
-- scripts=['scripts/shedskin'],
-+ scripts=['scripts/shedskin' + sys.version[0:3]],
- packages=['shedskin'],
- package_data={'shedskin': ['lib/*.cpp', 'lib/*.hpp', 'lib/*.py', 'lib/os/*.cpp', 'lib/os/*.hpp', 'lib/os/*.py', 'FLAGS']},
- )
diff --git a/py-smop/Makefile b/py-smop/Makefile
index df071b4..a08c433 100644
--- a/py-smop/Makefile
+++ b/py-smop/Makefile
@@ -11,8 +11,6 @@ COMMENT= Matlab/Octave to Python compiler
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.2:../../math/py-networkx
-WRKSRC= ${WRKDIR}/smop-0.1.5
-
USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
diff --git a/py-speview/Makefile b/py-speview/Makefile
index 67fca2c..3435007 100644
--- a/py-speview/Makefile
+++ b/py-speview/Makefile
@@ -15,8 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-zenity>=0.1.4:../../wip/py-zenity
DEPENDS+= ${PYPKGPREFIX}-xcal-raman>=0.1.5:../../wip/py-xcal-raman
USE_LANGUAGES= # none
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-xcal-raman
post-extract:
${MV} ${WRKSRC}/speview.py ${WRKSRC}/speview.py${PYVERSSUFFIX}
diff --git a/py-srpy/Makefile b/py-srpy/Makefile
index 7ebe0cb..540f37d 100644
--- a/py-srpy/Makefile
+++ b/py-srpy/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.8 2012/10/12 11:47:00 asau Exp $
-#
DISTNAME= srpy-0.2.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,13 +17,12 @@ DEPENDS+= ${PYPKGPREFIX}-Pyro4>=-3.4:../../devel/py-Pyro
USE_TOOLS+= pax
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.2.3
HTMLDIR= ${PREFIX}/share/doc/html/py-srpy
INSTALLATION_DIRS+= share/doc/py-srpy ${HTMLDIR}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
post-install:
${INSTALL_DATA} ${WRKSRC}/README.txt \
${DESTDIR}${PREFIX}/share/doc/py-srpy
diff --git a/py-storm/Makefile b/py-storm/Makefile
index 598bf70..89e5359 100644
--- a/py-storm/Makefile
+++ b/py-storm/Makefile
@@ -12,6 +12,8 @@ HOMEPAGE= https://storm.canonical.com/
COMMENT= Object-relational mapper (ORM) for Python
LICENSE= gnu-lgpl-v2.1
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.20
+
do-test:
( cd ${WRKSRC} && ${PYTHONBIN} test )
diff --git a/py-sumatra/Makefile b/py-sumatra/Makefile
index e13c96c..73cdb1d 100644
--- a/py-sumatra/Makefile
+++ b/py-sumatra/Makefile
@@ -22,16 +22,12 @@ DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
DEPENDS+= ${PYPKGPREFIX}-django-tagging>=0.2.1:../../www/py-django-tagging
DEPENDS+= ${PYPKGPREFIX}-httplib2>=0.6.0:../../www/py-httplib2
-DEPENDS+= ${PYPKGPREFIX}-mpi4py>=1.2.1:../../wip/py-mpich4py
-DEPENDS+= ${PYPKGPREFIX}-genesis>=0:../../wip/py-genesis
+DEPENDS+= ${PYPKGPREFIX}-mpi4py>=1.2.1:../../wip/py-mpi4py
+DEPENDS+= ${PYPKGPREFIX}-genesis-[0-9]*:../../wip/py-genesis
-WRKSRC= ${WRKDIR}/Sumatra-${VER}
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-django-tagging
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PLIST_SUBST+= THIS_EGG_INFODIR=${EGG_NAME:S|.tar||}-py${PYVERSSUFFIX}.egg-info
INSTALLATION_DIRS= share/doc/py-sumatra
@@ -39,7 +35,7 @@ post-extract:
${MV} ${WRKSRC}/bin/smt ${WRKSRC}/bin/smt${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/smtweb ${WRKSRC}/bin/smtweb${PYVERSSUFFIX}
-# test requers devel/py-coverage
+# test requires devel/py-coverage
do-test:
${RUN} cd ${WRKSRC}/test/unittests; ${TEST_ENV} ${SH} all_tests.sh
diff --git a/py-sumatra/PLIST b/py-sumatra/PLIST
index 7764b9f..872aaa3 100644
--- a/py-sumatra/PLIST
+++ b/py-sumatra/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2012/11/16 11:13:16 slitvinov Exp $
+@comment $NetBSD$
bin/smt${PYVERSSUFFIX}
bin/smtweb${PYVERSSUFFIX}
-${PYSITELIB}/${THIS_EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${THIS_EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${THIS_EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${THIS_EGG_INFODIR}/requires.txt
-${PYSITELIB}/${THIS_EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/sumatra/__init__.py
${PYSITELIB}/sumatra/__init__.pyc
${PYSITELIB}/sumatra/__init__.pyo
@@ -27,6 +27,9 @@ ${PYSITELIB}/sumatra/datastore/base.pyo
${PYSITELIB}/sumatra/datastore/filesystem.py
${PYSITELIB}/sumatra/datastore/filesystem.pyc
${PYSITELIB}/sumatra/datastore/filesystem.pyo
+${PYSITELIB}/sumatra/datastore/mirroredfs.py
+${PYSITELIB}/sumatra/datastore/mirroredfs.pyc
+${PYSITELIB}/sumatra/datastore/mirroredfs.pyo
${PYSITELIB}/sumatra/decorators.py
${PYSITELIB}/sumatra/decorators.pyc
${PYSITELIB}/sumatra/decorators.pyo
@@ -78,6 +81,25 @@ ${PYSITELIB}/sumatra/programs.pyo
${PYSITELIB}/sumatra/projects.py
${PYSITELIB}/sumatra/projects.pyc
${PYSITELIB}/sumatra/projects.pyo
+${PYSITELIB}/sumatra/publishing/__init__.py
+${PYSITELIB}/sumatra/publishing/__init__.pyc
+${PYSITELIB}/sumatra/publishing/__init__.pyo
+${PYSITELIB}/sumatra/publishing/latex/__init__.py
+${PYSITELIB}/sumatra/publishing/latex/__init__.pyc
+${PYSITELIB}/sumatra/publishing/latex/__init__.pyo
+${PYSITELIB}/sumatra/publishing/latex/includefigure.py
+${PYSITELIB}/sumatra/publishing/latex/includefigure.pyc
+${PYSITELIB}/sumatra/publishing/latex/includefigure.pyo
+${PYSITELIB}/sumatra/publishing/latex/sumatra.sty
+${PYSITELIB}/sumatra/publishing/sphinxext/__init__.py
+${PYSITELIB}/sumatra/publishing/sphinxext/__init__.pyc
+${PYSITELIB}/sumatra/publishing/sphinxext/__init__.pyo
+${PYSITELIB}/sumatra/publishing/sphinxext/sumatra_rst.py
+${PYSITELIB}/sumatra/publishing/sphinxext/sumatra_rst.pyc
+${PYSITELIB}/sumatra/publishing/sphinxext/sumatra_rst.pyo
+${PYSITELIB}/sumatra/publishing/utils.py
+${PYSITELIB}/sumatra/publishing/utils.pyc
+${PYSITELIB}/sumatra/publishing/utils.pyo
${PYSITELIB}/sumatra/records.py
${PYSITELIB}/sumatra/records.pyc
${PYSITELIB}/sumatra/records.pyo
@@ -105,6 +127,9 @@ ${PYSITELIB}/sumatra/recordstore/shelve_store.pyo
${PYSITELIB}/sumatra/tee.py
${PYSITELIB}/sumatra/tee.pyc
${PYSITELIB}/sumatra/tee.pyo
+${PYSITELIB}/sumatra/users.py
+${PYSITELIB}/sumatra/users.pyc
+${PYSITELIB}/sumatra/users.pyo
${PYSITELIB}/sumatra/versioncontrol/__init__.py
${PYSITELIB}/sumatra/versioncontrol/__init__.pyc
${PYSITELIB}/sumatra/versioncontrol/__init__.pyo
@@ -198,6 +223,7 @@ ${PYSITELIB}/sumatra/web/templates/show_file.html
${PYSITELIB}/sumatra/web/templates/show_file_base.html
${PYSITELIB}/sumatra/web/templates/show_image.html
${PYSITELIB}/sumatra/web/templates/tag_list.html
+${PYSITELIB}/sumatra/web/templates/timeline.html
${PYSITELIB}/sumatra/web/templatetags/__init__.py
${PYSITELIB}/sumatra/web/templatetags/__init__.pyc
${PYSITELIB}/sumatra/web/templatetags/__init__.pyo
@@ -227,6 +253,7 @@ share/doc/py-sumatra/managing_a_project.txt
share/doc/py-sumatra/migration.txt
share/doc/py-sumatra/parallel_computations.txt
share/doc/py-sumatra/parameter_files.txt
+share/doc/py-sumatra/publishing.txt
share/doc/py-sumatra/release_notes.txt
share/doc/py-sumatra/support.txt
share/doc/py-sumatra/upgrading.txt
diff --git a/py-tappy/Makefile b/py-tappy/Makefile
index 215bce5..c1fff17 100644
--- a/py-tappy/Makefile
+++ b/py-tappy/Makefile
@@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.8.3
post-extract:
${MV} ${WRKSRC}/tappy.py ${WRKSRC}/tappy${PYVERSSUFFIX}
diff --git a/py-theano/Makefile b/py-theano/Makefile
index b011ac9..e66e81c 100644
--- a/py-theano/Makefile
+++ b/py-theano/Makefile
@@ -3,7 +3,7 @@
DISTNAME= Theano-0.8.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
CATEGORIES= math python
-MASTER_SITES= ${MASTER_SITE_PYPI:=t/Theano/}
+MASTER_SITES= ${MASTER_SITE_PYPI:=T/Theano/}
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= http://deeplearning.net/software/theano/
@@ -11,11 +11,10 @@ COMMENT= Optimizing compiler for evaluating mathematical expressions
LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
+DEPENDS+= ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
USE_TOOLS+= bash
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
REPLACE_BASH+= theano/misc/check_blas_many.sh
post-extract:
@@ -26,8 +25,6 @@ post-extract:
do-test:
${RUN} cd {WRKSRC}/theano/tests ; ${SETENV} {TEST_ENV} ${PYTHONBIN} main.py
-
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+= ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
.include "../../mk/bsd.pkg.mk"
diff --git a/py-theano/PLIST b/py-theano/PLIST
index 401c178..d72c645 100644
--- a/py-theano/PLIST
+++ b/py-theano/PLIST
@@ -1,13 +1,13 @@
@comment $NetBSD$
-bin/theano-cache2.7
-bin/theano-nose2.7
-bin/theano-test2.7
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/pbr.json
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+bin/theano-cache${PYVERSSUFFIX}
+bin/theano-nose${PYVERSSUFFIX}
+bin/theano-test${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/pbr.json
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/theano/__init__.py
${PYSITELIB}/theano/__init__.pyc
${PYSITELIB}/theano/__init__.pyo
diff --git a/py-tribe/Makefile b/py-tribe/Makefile
index bf01b46..3b5b915 100644
--- a/py-tribe/Makefile
+++ b/py-tribe/Makefile
@@ -13,10 +13,9 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
-WRKSRC= ${WRKDIR}/tribe-1.3
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
post-extract:
${MV} ${WRKSRC}/tribe-admin.py ${WRKSRC}/tribe-admin.py${PYVERSSUFFIX}
diff --git a/py-trimesh/Makefile b/py-trimesh/Makefile
index 34d562f..fc0ffb5 100644
--- a/py-trimesh/Makefile
+++ b/py-trimesh/Makefile
@@ -12,6 +12,8 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.10:../../math/py-networkx
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-networkx
+
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
diff --git a/py-vespa/Makefile b/py-vespa/Makefile
index e9c2b2d..9f95e9e 100644
--- a/py-vespa/Makefile
+++ b/py-vespa/Makefile
@@ -14,8 +14,6 @@ LICENSE= mit
USE_TOOLS+= perl
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
REPLACE_PERL= scripts/get_trilegal${PYVERSSUFFIX}
post-extract:
@@ -25,7 +23,6 @@ post-extract:
${MV} ${WRKSRC}/scripts/calcfpp ${WRKSRC}/scripts/calcfpp${PYVERSSUFFIX}
${MV} ${WRKSRC}/scripts/koifpp-config ${WRKSRC}/scripts/koifpp-config${PYVERSSUFFIX}
-
.include "../../devel/py-cython/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-vespa/PLIST b/py-vespa/PLIST
index 8f884fe..ef71b1d 100644
--- a/py-vespa/PLIST
+++ b/py-vespa/PLIST
@@ -1,9 +1,9 @@
@comment $NetBSD$
-bin/batch_koifpp_condor2.7
-bin/calcfpp2.7
-bin/get_trilegal2.7
-bin/koifpp-config2.7
-bin/koifpp2.7
+bin/batch_koifpp_condor${PYVERSSUFFIX}
+bin/calcfpp${PYVERSSUFFIX}
+bin/get_trilegal${PYVERSSUFFIX}
+bin/koifpp-config${PYVERSSUFFIX}
+bin/koifpp${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/py-visionegg/Makefile b/py-visionegg/Makefile
index bd8123e..7f3b421 100644
--- a/py-visionegg/Makefile
+++ b/py-visionegg/Makefile
@@ -17,13 +17,15 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
USE_LANGUAGES= c c++
-PY_PATCHPLIST= yes
-PYDISTUTILSPKG= yes
-
MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric
+REPLACE_PYTHON+= check-config.py
+REPLACE_PYTHON+= test/display_dc_restoration.py
+REPLACE_PYTHON+= test/opengl_info.py
.include "../../devel/py-game/buildlink3.mk"
.include "../../math/py-Numeric/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-visionegg/PLIST b/py-visionegg/PLIST
index b9c7f27..7c976f0 100644
--- a/py-visionegg/PLIST
+++ b/py-visionegg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/01/30 03:49:47 noud4 Exp $
+@comment $NetBSD$
${PYSITELIB}/VisionEgg/Configuration.py
${PYSITELIB}/VisionEgg/Configuration.pyc
${PYSITELIB}/VisionEgg/Configuration.pyo
@@ -157,6 +157,7 @@ ${PYSITELIB}/VisionEgg/win32_getrefresh.pyo
${PYSITELIB}/VisionEgg/win32_maxpriority.py
${PYSITELIB}/VisionEgg/win32_maxpriority.pyc
${PYSITELIB}/VisionEgg/win32_maxpriority.pyo
+${PYSITELIB}/${EGG_FILE}
share/VisionEgg-${PYVERSSUFFIX}/LICENSE.txt
share/VisionEgg-${PYVERSSUFFIX}/README.txt
share/VisionEgg-${PYVERSSUFFIX}/VisionEgg.cfg
diff --git a/py-visionegg/buildlink3.mk b/py-visionegg/buildlink3.mk
index 6e98ee1..dea5fb8 100644
--- a/py-visionegg/buildlink3.mk
+++ b/py-visionegg/buildlink3.mk
@@ -11,6 +11,8 @@ BUILDLINK_API_DEPENDS.pyvisionegg+= ${PYPKGPREFIX}-visionegg>=0.9.9
BUILDLINK_ABI_DEPENDS.pyvisionegg?= ${PYPKGPREFIX}-visionegg>=0.9.9nb2
BUILDLINK_PKGSRCDIR.pyvisionegg?= ../../wip/py-visionegg
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric
+
.if exists(../../mk/opengl.buildlink3.mk)
# see PR 23845 for details
.include "../../mk/opengl.buildlink3.mk"
diff --git a/py-wahcade/Makefile b/py-wahcade/Makefile
index c5e7593..5172235 100644
--- a/py-wahcade/Makefile
+++ b/py-wahcade/Makefile
@@ -15,7 +15,6 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
USE_TOOLS+= bash
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-imaging
REPLACE_BASH+= doc/samples/run_mess.sh
@@ -46,5 +45,5 @@ DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/py-imaging/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-xcal-raman/Makefile b/py-xcal-raman/Makefile
index 14d11fb..ada9ad4 100644
--- a/py-xcal-raman/Makefile
+++ b/py-xcal-raman/Makefile
@@ -12,9 +12,9 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 0.1.5
.include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-xcal-raman/PLIST b/py-xcal-raman/PLIST
index f66498e..ab16a34 100644
--- a/py-xcal-raman/PLIST
+++ b/py-xcal-raman/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/03 18:48:15 jihbed Exp $
+@comment $NetBSD$
${PYSITELIB}/winspec.py
${PYSITELIB}/winspec.pyc
${PYSITELIB}/winspec.pyo
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/xcal_raman.py
${PYSITELIB}/xcal_raman.pyc
${PYSITELIB}/xcal_raman.pyo
diff --git a/py-yams/Makefile b/py-yams/Makefile
index 936606b..4fa0031 100644
--- a/py-yams/Makefile
+++ b/py-yams/Makefile
@@ -13,7 +13,6 @@ COMMENT= Entity / relation schema
USE_LANGUAGES= # none
DEPENDS+= ${PYPKGPREFIX}-logilab-common-[0-9]*:../../devel/py-logilab-common
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-logilab-common
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-yapf/Makefile b/py-yapf/Makefile
index 97a7e3c..aed0a13 100644
--- a/py-yapf/Makefile
+++ b/py-yapf/Makefile
@@ -13,9 +13,6 @@ COMMENT= Python files formatter
LICENSE= apache-2.0
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYTHON_VERSIONS_ACCEPTED= 34 27
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/yapf ${DESTDIR}${PREFIX}/bin/yapf${PYVERSSUFFIX}
diff --git a/py-zeitgeist/Makefile b/py-zeitgeist/Makefile
index 76aa1e5..908e098 100644
--- a/py-zeitgeist/Makefile
+++ b/py-zeitgeist/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c
USE_TOOLS+= gmake intltool
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-ORBit via py-gnome2, py-gtk2, py-gobject
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-ORBit via py-gnome2, py-gtk2, py-gobject, py-storm
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
diff --git a/py-zenity/Makefile b/py-zenity/Makefile
index c3b69d5..ec8b11d 100644
--- a/py-zenity/Makefile
+++ b/py-zenity/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
+BROKEN= Distfile not available.
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sabnzbdplus/Makefile b/sabnzbdplus/Makefile
index 5c9b7f7..2ddc3b7 100644
--- a/sabnzbdplus/Makefile
+++ b/sabnzbdplus/Makefile
@@ -33,7 +33,6 @@ OWN_DIRS_PERMS= ${PREFIX}/sabnzbd sabnzbd sabnzbd 0755
INSTALLATION_DIRS+= cherrypy gntp interfaces locale po tools util
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON= *.py */*.py */*/*.py
SUBST_CLASSES+= fix-paths
diff --git a/sickbeard/Makefile b/sickbeard/Makefile
index 27ebc71..bf0da4c 100644
--- a/sickbeard/Makefile
+++ b/sickbeard/Makefile
@@ -28,7 +28,6 @@ INSTALL_FILES+= SickBeard.py CHANGELOG.txt CONTRIBUTING.md COPYING.txt
AUTO_MKDIRS= yes
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON= *.py */*.py */*/*.py
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-cheetah
diff --git a/spade/Makefile b/spade/Makefile
index c5ad2b6..f8928fd 100644
--- a/spade/Makefile
+++ b/spade/Makefile
@@ -20,8 +20,6 @@ DEPENDS+= jython>=2.5.1:../../wip/jython
WRKSRC= ${WRKDIR}/spade
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-m2crypto, py-twisted
SUBST_CLASSES+= paths
@@ -44,5 +42,5 @@ do-test:
${SETENV} ${TEST_ENV} ${PYTHONBIN} unittests.py
.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/spyder/Makefile b/spyder/Makefile
index d5c729d..5bf99db 100644
--- a/spyder/Makefile
+++ b/spyder/Makefile
@@ -13,18 +13,17 @@ LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-rope>=0.9.3:../../devel/py-rope
DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2.3:../../textproc/py-sphinx
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-rope
+
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/scripts/spyder ${WRKSRC}/scripts/spyder${PYVERSSUFFIX}
.include "options.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/py-qt4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/spyder/PLIST b/spyder/PLIST
index 153a915..43012fd 100644
--- a/spyder/PLIST
+++ b/spyder/PLIST
@@ -1,6 +1,7 @@
@comment $NetBSD$
-bin/spyder2.7
+bin/spyder${PYVERSSUFFIX}
bin/spyder_win_post_install.py
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/spyderlib/__init__.py
${PYSITELIB}/spyderlib/__init__.pyc
${PYSITELIB}/spyderlib/__init__.pyo
Home |
Main Index |
Thread Index |
Old Index