2 files changed, 3 insertions, 113 deletions

diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index 83ffea6b4232..301f075e949f 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bpython
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
 		http://bpython-interpreter.org/releases/
@@ -19,9 +20,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments
 OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SUB=	yes
 
+PYDISTUTILS_AUTOPLIST=	yes
+USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
-PYDISTUTILS_BUILD_TARGET=	build bdist_egg
 
 PORTEXAMPLES=	light.theme sample-config sample.theme
 
diff --git a/devel/bpython/pkg-plist b/devel/bpython/pkg-plist
index db74bbbec270..fe6b7495c08d 100644
--- a/devel/bpython/pkg-plist
+++ b/devel/bpython/pkg-plist
@@ -1,108 +1,3 @@
-bin/bpython
-bin/bpython-gtk
-bin/bpython-urwid
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/debugger.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/debugger.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/debugger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/_internal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/_internal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/_internal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/_py3compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/_py3compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/_py3compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/args.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/args.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/args.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/autocomplete.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/autocomplete.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/autocomplete.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/cli.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/cli.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/cli.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/formatter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/formatter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/formatter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/gtk_.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/gtk_.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/gtk_.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/importcompletion.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/importcompletion.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/importcompletion.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/inspection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/inspection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/inspection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/keys.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/keys.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/keys.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/logo.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/pager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/pager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/pager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/repl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/repl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/repl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test.theme
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_args.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_args.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_args.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_bpython.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_bpython.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_bpython.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_crashers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_crashers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_crashers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_formatter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_formatter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_formatter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_gtk_.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_gtk_.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_gtk_.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_importcompletion.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_importcompletion.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_importcompletion.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_inspection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_inspection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_inspection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_keys.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_keys.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_keys.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_pager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_pager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_pager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_repl.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_repl.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_repl.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_wizard.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_wizard.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test/test_wizard.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/translations/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/translations/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/translations/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/urwid.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/urwid.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/urwid.pyo
 man/man1/bpython.1.gz
 man/man5/bpython-config.5.gz
 share/applications/bpython.desktop
@@ -114,9 +9,3 @@ share/applications/bpython.desktop
 %%NLS%%@dirrmtry share/locale/nl_NL
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/translations
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/test
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%