3 files changed, 7 insertions, 78 deletions

diff --git a/irc/py-irc/Makefile b/irc/py-irc/Makefile
index 0951e4165942..b7e153db11d7 100644
--- a/irc/py-irc/Makefile
+++ b/irc/py-irc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	irc
-PORTVERSION=	8.5.3
+PORTVERSION=	8.5.4
 CATEGORIES=	irc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,13 +18,14 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
+PYDISTUTILS_AUTOPLIST=	yes
 USE_ZIP=	yes
 
 PORTEXAMPLES=	irccat.py irccat2.py servermap.py testbot.py \
 		dccreceive.py dccsend.py
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.pre.mk>
 
@@ -37,10 +38,8 @@ post-patch:
 		's|license="MIT",|license="MIT", zip_safe=False,|' ${WRKSRC}/setup.py
 	${CHMOD} -R o-w ${WRKSRC}/irc.egg-info
 
-.if ${PORT_OPTIONS:MEXAMPLES}
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${PORTEXAMPLES:S,^,${WRKSRC}/scripts/,} ${EXAMPLESDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${PORTEXAMPLES:S,^,${WRKSRC}/scripts/,} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/irc/py-irc/distinfo b/irc/py-irc/distinfo
index ddaae6a3720b..be7a68d16e60 100644
--- a/irc/py-irc/distinfo
+++ b/irc/py-irc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irc-8.5.3.zip) = 80454990b8b6ce2c8747cc92be817e1fe3eb2963b4659a70850d765b3a42773e
-SIZE (irc-8.5.3.zip) = 113424
+SHA256 (irc-8.5.4.zip) = 92eaa2287240e770ba5fd34327aa69612cf27caba9f51e3116d5951b438f470e
+SIZE (irc-8.5.4.zip) = 113715
diff --git a/irc/py-irc/pkg-plist b/irc/py-irc/pkg-plist
deleted file mode 100644
index 95737870b980..000000000000
--- a/irc/py-irc/pkg-plist
+++ /dev/null
@@ -1,70 +0,0 @@
-%%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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/bot.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/bot.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/bot.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/buffer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/buffer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/buffer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/connection.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/connection.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/connection.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/dict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/dict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/dict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/events.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/events.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/features.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/features.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/features.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/functools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/functools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/functools.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/logging.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/logging.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/logging.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/modes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/modes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/modes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/rfc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/rfc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/rfc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/schedule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/schedule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/schedule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/strings.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/strings.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/strings.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_bot.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_bot.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_bot.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_schedule.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_schedule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests/test_schedule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%