irc/py-irc: update to 8.3.1

- Update to 8.3.1
- Use PORTEXAMPLES instead of pkg-plist entries
- Unmute install examples
- Patch setup.py to extract egg file

3 files changed, 88 insertions, 20 deletions

diff --git a/irc/py-irc/Makefile b/irc/py-irc/Makefile
index 3d7aa69a7ccd..e34751e50527 100644
--- a/irc/py-irc/Makefile
+++ b/irc/py-irc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	irc
-PORTVERSION=	8.3
+PORTVERSION=	8.3.1
 CATEGORIES=	irc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,23 +19,27 @@ USE_ZIP=	yes
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
 
-EXAMPLEFILES=	irccat.py irccat2.py servermap.py testbot.py \
+PORTEXAMPLES=	irccat.py irccat2.py servermap.py testbot.py \
 		dccreceive.py dccsend.py
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-.for file in ${EXAMPLEFILES}
-	@${INSTALL_SCRIPT} ${WRKSRC}/scripts/${file} ${EXAMPLESDIR}/
-.endfor
-.endif
-
 .if ${PYTHON_REL} < 270
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib>0:${PORTSDIR}/devel/py-importlib
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+                's|use_2to3=True,|use_2to3=True, 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
+
 .include <bsd.port.post.mk>
diff --git a/irc/py-irc/distinfo b/irc/py-irc/distinfo
index 9d9a180832e0..bcc947eaefe0 100644
--- a/irc/py-irc/distinfo
+++ b/irc/py-irc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irc-8.3.zip) = f58b378f1750a5888c8938436542e7a34a3f2f76d63612b80e2f14c9182bd507
-SIZE (irc-8.3.zip) = 110335
+SHA256 (irc-8.3.1.zip) = bdfe7595ef0ebdba7b9ff630a85c1f707e9d3e8699323eccc6dbe27042ae6985
+SIZE (irc-8.3.1.zip) = 111480
diff --git a/irc/py-irc/pkg-plist b/irc/py-irc/pkg-plist
index a4165ad75531..2e0556a79979 100644
--- a/irc/py-irc/pkg-plist
+++ b/irc/py-irc/pkg-plist
@@ -1,8 +1,72 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dccreceive.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dccsend.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/irccat.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/irccat2.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/servermap.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testbot.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%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/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/_py2_compat.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/_py2_compat.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/irc/_py2_compat.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%%