- update to 0.8.4

- fix plist with NOPORTDOCS set, thanks itetcu@ for pointing out

4 files changed, 90 insertions, 22 deletions

diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index 0ee7ebb2c84b..446b4535f5fa 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipython
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.4
 CATEGORIES=	devel python
 MASTER_SITES=	http://ipython.scipy.org/dist/ \
 		${MASTER_SITE_LOCAL} \
@@ -19,10 +19,28 @@ COMMENT=	An enhanced Interactive Python shell
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pexpect.py:${PORTSDIR}/misc/py-pexpect
 
+post-patch:
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e "s#('data', docdirbase, docfiles),# #g" ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e "s#('data', pjoin(docdirbase, 'manual'),manfiles),# #g" ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e "s#('data', pjoin(docdirbase, 'manual/_static'),manstatic),# #g" ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e "s#('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),# #g" ${WRKSRC}/setup.py
+.endif
+
+.if defined(NOPORTEXAMPLES)
+	${REINPLACE_CMD} -e "s#('data', pjoin(docdirbase, 'examples'),examfiles),# #g" ${WRKSRC}/setup.py
+.endif
+
+.if defined(NOPORTEXAMPLES)
+	${REINPLACE_CMD} -e "s#('data', manpagebase, manpages),# #g" ${WRKSRC}/setup.py
+.else
 MAN1=		ipython.1 pycolor.1
 MANCOMPRESSED=	yes
+.endif
 
+.ifndef	NOPORTDOCS
 PORTDOCS=	*
+.endif
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo
index d0af5f9c136a..9beb589a8557 100644
--- a/devel/ipython/distinfo
+++ b/devel/ipython/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipython-0.8.2.tar.gz) = fd5a1b6e518898a4aee8b8d8b428af70
-SHA256 (ipython-0.8.2.tar.gz) = cc673c7cdef38f7ab21ee22e7be5a591b6b6eda590b82f71a74ff8b5103831c4
-SIZE (ipython-0.8.2.tar.gz) = 1172098
+MD5 (ipython-0.8.4.tar.gz) = 9b8b439d295defa694b9fbf799203680
+SHA256 (ipython-0.8.4.tar.gz) = 8e66b67913415ecb29366e20d37929922e9df2a33e52684dd9cdfdccec867c3e
+SIZE (ipython-0.8.4.tar.gz) = 1161945
diff --git a/devel/ipython/files/patch-setup.py b/devel/ipython/files/patch-setup.py
index 17e27c1cd69c..7c2f26b89d72 100644
--- a/devel/ipython/files/patch-setup.py
+++ b/devel/ipython/files/patch-setup.py
@@ -1,12 +1,10 @@
---- setup.py.orig	Thu Jan 12 12:45:02 2006
-+++ setup.py	Thu Jan 12 12:45:29 2006
-@@ -99,8 +99,8 @@
- # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
+--- setup.py.orig	2008-06-01 06:31:42.000000000 +0800
++++ setup.py	2008-06-05 16:05:08.000000000 +0800
+@@ -107,7 +107,7 @@
  # information on how to do this more cleanly once python 2.4 can be assumed.
  # Thanks to Noel for the tip.
--docdirbase  = 'share/doc/ipython-%s' % version
+ docdirbase  = 'share/doc/ipython'
 -manpagebase = 'share/man/man1'
-+docdirbase  = 'share/doc/ipython'
 +manpagebase = 'man/man1'
  
  # We only need to exclude from this things NOT already excluded in the
diff --git a/devel/ipython/pkg-plist b/devel/ipython/pkg-plist
index 58aa34e27e6c..f17131a3e806 100644
--- a/devel/ipython/pkg-plist
+++ b/devel/ipython/pkg-plist
@@ -55,6 +55,12 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_app_completers.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_app_completers.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_app_completers.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_autoreload.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_autoreload.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_autoreload.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_bzr.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_bzr.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_bzr.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_completers.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_completers.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_completers.pyo
@@ -79,15 +85,24 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_gnuglobal.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_gnuglobal.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_gnuglobal.pyo
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_host_completers.py
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_host_completers.pyc
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_host_completers.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_greedycompleter.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_greedycompleter.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_greedycompleter.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_jot.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_jot.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_jot.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_kitcfg.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_kitcfg.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_kitcfg.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_legacy.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_legacy.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_legacy.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_leo.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_leo.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_leo.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_lookfor.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_lookfor.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_lookfor.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_p4.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_p4.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_p4.pyo
@@ -112,12 +127,12 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_rehashdir.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_rehashdir.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_rehashdir.pyo
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_remote_completer.py
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_remote_completer.pyc
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_remote_completer.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_render.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_render.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_render.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_server.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_server.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_server.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_signals.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_signals.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_signals.pyo
@@ -130,9 +145,15 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_traits_completer.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_traits_completer.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_traits_completer.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_vimserver.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_vimserver.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_vimserver.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_which.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_which.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_which.pyo
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_winpdb.py
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_winpdb.pyc
+%%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_winpdb.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_workdir.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_workdir.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/ipy_workdir.pyo
@@ -145,9 +166,6 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/numeric_formats.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/numeric_formats.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/numeric_formats.pyo
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/path.py
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/path.pyc
-%%PYTHON_SITELIBDIR%%/IPython/Extensions/path.pyo
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/pickleshare.py
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/pickleshare.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Extensions/pickleshare.pyo
@@ -197,6 +215,8 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/Shell.pyc
 %%PYTHON_SITELIBDIR%%/IPython/Shell.pyo
 %%PYTHON_SITELIBDIR%%/IPython/UserConfig/ipy_user_conf.py
+%%PYTHON_SITELIBDIR%%/IPython/UserConfig/ipy_user_conf.pyc
+%%PYTHON_SITELIBDIR%%/IPython/UserConfig/ipy_user_conf.pyo
 %%PYTHON_SITELIBDIR%%/IPython/UserConfig/ipythonrc
 %%PYTHON_SITELIBDIR%%/IPython/UserConfig/ipythonrc-math
 %%PYTHON_SITELIBDIR%%/IPython/UserConfig/ipythonrc-numeric
@@ -218,6 +238,9 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/demo.py
 %%PYTHON_SITELIBDIR%%/IPython/demo.pyc
 %%PYTHON_SITELIBDIR%%/IPython/demo.pyo
+%%PYTHON_SITELIBDIR%%/IPython/dtutils.py
+%%PYTHON_SITELIBDIR%%/IPython/dtutils.pyc
+%%PYTHON_SITELIBDIR%%/IPython/dtutils.pyo
 %%PYTHON_SITELIBDIR%%/IPython/excolors.py
 %%PYTHON_SITELIBDIR%%/IPython/excolors.pyc
 %%PYTHON_SITELIBDIR%%/IPython/excolors.pyo
@@ -227,6 +250,9 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/external/mglob.py
 %%PYTHON_SITELIBDIR%%/IPython/external/mglob.pyc
 %%PYTHON_SITELIBDIR%%/IPython/external/mglob.pyo
+%%PYTHON_SITELIBDIR%%/IPython/external/path.py
+%%PYTHON_SITELIBDIR%%/IPython/external/path.pyc
+%%PYTHON_SITELIBDIR%%/IPython/external/path.pyo
 %%PYTHON_SITELIBDIR%%/IPython/external/simplegeneric.py
 %%PYTHON_SITELIBDIR%%/IPython/external/simplegeneric.pyc
 %%PYTHON_SITELIBDIR%%/IPython/external/simplegeneric.pyo
@@ -236,6 +262,27 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/genutils.py
 %%PYTHON_SITELIBDIR%%/IPython/genutils.pyc
 %%PYTHON_SITELIBDIR%%/IPython/genutils.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/__init__.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/__init__.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/__init__.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipshell_nonblocking.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipshell_nonblocking.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipshell_nonblocking.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipython_history.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipython_history.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipython_history.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipython_view.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipython_view.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/ipython_view.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/thread_ex.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/thread_ex.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/thread_ex.pyo
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/wxIPython.py
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/wxIPython.pyc
+%%PYTHON_SITELIBDIR%%/IPython/gui/wx/wxIPython.pyo
 %%PYTHON_SITELIBDIR%%/IPython/history.py
 %%PYTHON_SITELIBDIR%%/IPython/history.pyc
 %%PYTHON_SITELIBDIR%%/IPython/history.pyo
@@ -284,18 +331,21 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/shadowns.py
 %%PYTHON_SITELIBDIR%%/IPython/shadowns.pyc
 %%PYTHON_SITELIBDIR%%/IPython/shadowns.pyo
+%%PYTHON_SITELIBDIR%%/IPython/shellglobals.py
+%%PYTHON_SITELIBDIR%%/IPython/shellglobals.pyc
+%%PYTHON_SITELIBDIR%%/IPython/shellglobals.pyo
 %%PYTHON_SITELIBDIR%%/IPython/strdispatch.py
 %%PYTHON_SITELIBDIR%%/IPython/strdispatch.pyc
 %%PYTHON_SITELIBDIR%%/IPython/strdispatch.pyo
+%%PYTHON_SITELIBDIR%%/IPython/twshell.py
+%%PYTHON_SITELIBDIR%%/IPython/twshell.pyc
+%%PYTHON_SITELIBDIR%%/IPython/twshell.pyo
 %%PYTHON_SITELIBDIR%%/IPython/ultraTB.py
 %%PYTHON_SITELIBDIR%%/IPython/ultraTB.pyc
 %%PYTHON_SITELIBDIR%%/IPython/ultraTB.pyo
 %%PYTHON_SITELIBDIR%%/IPython/upgrade_dir.py
 %%PYTHON_SITELIBDIR%%/IPython/upgrade_dir.pyc
 %%PYTHON_SITELIBDIR%%/IPython/upgrade_dir.pyo
-%%PYTHON_SITELIBDIR%%/IPython/usage-fp.py
-%%PYTHON_SITELIBDIR%%/IPython/usage-fp.pyc
-%%PYTHON_SITELIBDIR%%/IPython/usage-fp.pyo
 %%PYTHON_SITELIBDIR%%/IPython/usage.py
 %%PYTHON_SITELIBDIR%%/IPython/usage.pyc
 %%PYTHON_SITELIBDIR%%/IPython/usage.pyo
@@ -306,6 +356,8 @@ bin/pycolor
 %%PYTHON_SITELIBDIR%%/IPython/winconsole.pyc
 %%PYTHON_SITELIBDIR%%/IPython/winconsole.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/IPython/external
+@dirrm %%PYTHON_SITELIBDIR%%/IPython/gui/wx
+@dirrm %%PYTHON_SITELIBDIR%%/IPython/gui
 @dirrm %%PYTHON_SITELIBDIR%%/IPython/UserConfig
 @dirrm %%PYTHON_SITELIBDIR%%/IPython/Extensions
 @dirrm %%PYTHON_SITELIBDIR%%/IPython