[pkgsrc/trunk]: pkgsrc/devel/py-ipython1 Fix interpreter path in installed fi...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1301fe89b5b
branches:  trunk
changeset: 629631:c1301fe89b5b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 25 08:19:44 2014 +0000

description:
Fix interpreter path in installed files.
Bump PKGREVISION.
Fix build and PLIST for python-3.x

XXX: strangely, this isn't happy with py-distribute for python-3.x.
XXX: I don't understand why, but a build dependency on setuptools fixes
XXX: installation, so I've done that.

diffstat:

 devel/py-ipython1/Makefile |  67 +++++++++++++++++++++++++++++++++++++++++++--
 devel/py-ipython1/PLIST    |  35 +++++++++++++++++------
 2 files changed, 88 insertions(+), 14 deletions(-)

diffs (136 lines):

diff -r fa5838570304 -r c1301fe89b5b devel/py-ipython1/Makefile
--- a/devel/py-ipython1/Makefile        Sat Jan 25 05:07:04 2014 +0000
+++ b/devel/py-ipython1/Makefile        Sat Jan 25 08:19:44 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/01/22 10:58:37 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/01/25 08:19:44 wiz Exp $
 
 DISTNAME=      ipython-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel lang
 MASTER_SITES=  http://archive.ipython.org/release/1.1.0/
 
@@ -12,11 +12,70 @@
 LICENSE=       modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
-
-#PYTHON_VERSIONS_INCLUDE_3X=   yes
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 USE_LANGUAGES= # none
 USE_TOOLS+=    gunzip
 
+REPLACE_PYTHON+=       IPython/core/tests/test_inputtransformer.py
+REPLACE_PYTHON+=       IPython/external/mathjax.py
+REPLACE_PYTHON+=       IPython/kernel/zmq/ipkernel.py
+REPLACE_PYTHON+=       IPython/lib/irunner.py
+REPLACE_PYTHON+=       IPython/nbconvert/nbconvertapp.py
+REPLACE_PYTHON+=       IPython/nbformat/v3/validator.py
+REPLACE_PYTHON+=       IPython/parallel/apps/ipclusterapp.py
+REPLACE_PYTHON+=       IPython/parallel/apps/ipcontrollerapp.py
+REPLACE_PYTHON+=       IPython/parallel/apps/ipengineapp.py
+REPLACE_PYTHON+=       IPython/parallel/apps/iploggerapp.py
+REPLACE_PYTHON+=       IPython/parallel/controller/heartmonitor.py
+REPLACE_PYTHON+=       IPython/parallel/scripts/ipcluster
+REPLACE_PYTHON+=       IPython/parallel/scripts/ipcontroller
+REPLACE_PYTHON+=       IPython/parallel/scripts/ipengine
+REPLACE_PYTHON+=       IPython/parallel/scripts/iplogger
+REPLACE_PYTHON+=       IPython/scripts/iptest
+REPLACE_PYTHON+=       IPython/scripts/ipython
+REPLACE_PYTHON+=       IPython/scripts/irunner
+REPLACE_PYTHON+=       IPython/scripts/pycolor
+REPLACE_PYTHON+=       IPython/terminal/ipapp.py
+REPLACE_PYTHON+=       IPython/testing/mkdoctests.py
+REPLACE_PYTHON+=       IPython/testing/plugin/iptest.py
+REPLACE_PYTHON+=       IPython/testing/plugin/setup.py
+REPLACE_PYTHON+=       IPython/utils/_process_posix.py
+REPLACE_PYTHON+=       IPython/utils/pickleshare.py
+REPLACE_PYTHON+=       docs/autogen_api.py
+REPLACE_PYTHON+=       docs/do_sphinx.py
+REPLACE_PYTHON+=       docs/gh-pages.py
+REPLACE_PYTHON+=       examples/core/example-embed.py
+REPLACE_PYTHON+=       examples/core/ipython-get-history.py
+REPLACE_PYTHON+=       examples/lib/gui-glut.py
+REPLACE_PYTHON+=       examples/lib/gui-gtk.py
+REPLACE_PYTHON+=       examples/lib/gui-gtk3.py
+REPLACE_PYTHON+=       examples/lib/gui-pyglet.py
+REPLACE_PYTHON+=       examples/lib/gui-qt.py
+REPLACE_PYTHON+=       examples/lib/gui-tk.py
+REPLACE_PYTHON+=       examples/lib/gui-wx.py
+REPLACE_PYTHON+=       examples/lib/ipkernel_qtapp.py
+REPLACE_PYTHON+=       examples/lib/ipkernel_wxapp.py
+# next two need to be quoted somehow
+#REPLACE_PYTHON+=      examples/notebooks/Part 1 - Running Code.ipynb
+#REPLACE_PYTHON+=      examples/notebooks/Part 3 - Plotting with Matplotlib.ipynb
+REPLACE_PYTHON+=       examples/parallel/davinci/pwordfreq.py
+REPLACE_PYTHON+=       examples/parallel/interengine/bintree_script.py
+REPLACE_PYTHON+=       examples/parallel/task2.py
+REPLACE_PYTHON+=       examples/parallel/task_profiler.py
+REPLACE_PYTHON+=       examples/parallel/wave2D/RectPartitioner.py
+REPLACE_PYTHON+=       examples/parallel/wave2D/communicator.py
+REPLACE_PYTHON+=       examples/parallel/wave2D/parallelwave-mpi.py
+REPLACE_PYTHON+=       examples/parallel/wave2D/parallelwave.py
+REPLACE_PYTHON+=       examples/parallel/wave2D/wavesolver.py
+REPLACE_PYTHON+=       examples/parallel/workflow/job_wrapper.py
+REPLACE_PYTHON+=       setup.py
+REPLACE_PYTHON+=       setupegg.py
+
+CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/IPython/html/static/components/less.js/bin/lessc
+CHECK_INTERPRETER_SKIP+=       ${PYSITELIB}/IPython/html/static/components/marked/bin/marked
+
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
+#.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fa5838570304 -r c1301fe89b5b devel/py-ipython1/PLIST
--- a/devel/py-ipython1/PLIST   Sat Jan 25 05:07:04 2014 +0000
+++ b/devel/py-ipython1/PLIST   Sat Jan 25 08:19:44 2014 +0000
@@ -1,12 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/22 10:58:37 drochner Exp $
-bin/ipcluster
-bin/ipcontroller
-bin/ipengine
-bin/iplogger
-bin/iptest
-bin/ipython
-bin/irunner
-bin/pycolor
+@comment $NetBSD: PLIST,v 1.2 2014/01/25 08:19:44 wiz Exp $
+${PLIST.py2x}bin/ipcluster
+${PLIST.py2x}bin/ipcontroller
+${PLIST.py2x}bin/ipengine
+${PLIST.py2x}bin/iplogger
+${PLIST.py2x}bin/iptest
+${PLIST.py2x}bin/ipython
+${PLIST.py2x}bin/irunner
+${PLIST.py2x}bin/pycolor
+${PLIST.py3x}bin/ipcluster3
+${PLIST.py3x}bin/ipcontroller3
+${PLIST.py3x}bin/ipengine3
+${PLIST.py3x}bin/iplogger3
+${PLIST.py3x}bin/iptest3
+${PLIST.py3x}bin/ipython3
+${PLIST.py3x}bin/irunner3
+${PLIST.py3x}bin/pycolor3
+${PLIST.py2x}${PYSITELIB}/${EGG_FILE}
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/entry_points.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/not-zip-safe
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/requires.txt
+${PLIST.py3x}${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/IPython/__init__.py
 ${PYSITELIB}/IPython/__init__.pyc
 ${PYSITELIB}/IPython/__init__.pyo
@@ -2282,7 +2298,6 @@
 ${PYSITELIB}/IPython/utils/zmqrelated.py
 ${PYSITELIB}/IPython/utils/zmqrelated.pyc
 ${PYSITELIB}/IPython/utils/zmqrelated.pyo
-${PYSITELIB}/${EGG_FILE}
 man/man1/ipcluster.1
 man/man1/ipcontroller.1
 man/man1/ipengine.1