Upgrade to version 0.95.

3 files changed, 63 insertions, 46 deletions

diff --git a/devel/py_otp_interface/Makefile b/devel/py_otp_interface/Makefile
index 0569350dd9cd..bc7d77769b4c 100644
--- a/devel/py_otp_interface/Makefile
+++ b/devel/py_otp_interface/Makefile
@@ -6,38 +6,35 @@
 #
 
 PORTNAME=	py_otp_interface
-PORTVERSION=	0.93
+PORTVERSION=	0.95
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.lysator.liu.se/~tab/erlang/py_interface/
 DISTNAME=	py_interface-${PORTVERSION}
 DIST_SUBDIR=	erlang
 
 MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	A native python implementation of an Erlang/OTP node
+COMMENT=	A native Python implementation of an Erlang/OTP node
 
 USE_PYTHON=	yes
 
-PORTDOCS=	COPYING.LIB README py_interface.pub
-
-OTP_LIBS=	erl_async_conn.py erl_common.py erl_epmd.py \
-		erl_eventhandler.py erl_node.py erl_node_conn.py \
-		erl_opts.py erl_term.py
-OTP_EXAMPLES=	test_erl_node.py test_erl_node_conn.py test_erl_epmd.py \
-		test_erl_node_tk_1.py
-OTP_DOCS=	COPYING.LIB README py_interface.pub
+OTP_LIBS=	__init__.py erl_async_conn.py erl_common.py erl_epmd.py \
+		erl_eventhandler.py erl_node.py erl_node_conn.py erl_opts.py \
+		erl_term.py
+OTP_DOCS=	COPYING.LIB README
 
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
+	@${MKDIR} ${PYTHON_SITELIBDIR}/py_interface
 	@for FILE in ${OTP_LIBS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${FILE}* ${PYTHON_SITELIBDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/py_interface/$${FILE}* ${PYTHON_SITELIBDIR}/py_interface; \
 	done
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	@for FILE in ${OTP_EXAMPLES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${EXAMPLESDIR}; \
-	done
+	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR};
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@for FILE in ${OTP_DOCS}; do \
diff --git a/devel/py_otp_interface/distinfo b/devel/py_otp_interface/distinfo
index 3d7279e98a2d..9ce1b0434cf0 100644
--- a/devel/py_otp_interface/distinfo
+++ b/devel/py_otp_interface/distinfo
@@ -1,3 +1,3 @@
-MD5 (erlang/py_interface-0.93.tar.gz) = 5a8d8fd87df34aa8df3e584a96c75c62
-SHA256 (erlang/py_interface-0.93.tar.gz) = 1b472feecfdb0aa9237e7eaec1027d66c29474bdea9cf5099ed28b93a742a9d1
-SIZE (erlang/py_interface-0.93.tar.gz) = 56308
+MD5 (erlang/py_interface-0.95.tar.gz) = 92e4f4cec19d083da2d70ac8ec058765
+SHA256 (erlang/py_interface-0.95.tar.gz) = 49d21be14e791201cfd86ddc46b1b1ea647cbe8345391dbcff3c3b486082a04f
+SIZE (erlang/py_interface-0.95.tar.gz) = 68323
diff --git a/devel/py_otp_interface/pkg-plist b/devel/py_otp_interface/pkg-plist
index ddae39382bc2..4ab1408b2a74 100644
--- a/devel/py_otp_interface/pkg-plist
+++ b/devel/py_otp_interface/pkg-plist
@@ -1,29 +1,49 @@
-%%PYTHON_SITELIBDIR%%/erl_async_conn.py
-%%PYTHON_SITELIBDIR%%/erl_async_conn.pyc
-%%PYTHON_SITELIBDIR%%/erl_async_conn.pyo
-%%PYTHON_SITELIBDIR%%/erl_common.py
-%%PYTHON_SITELIBDIR%%/erl_common.pyc
-%%PYTHON_SITELIBDIR%%/erl_common.pyo
-%%PYTHON_SITELIBDIR%%/erl_epmd.py
-%%PYTHON_SITELIBDIR%%/erl_epmd.pyc
-%%PYTHON_SITELIBDIR%%/erl_epmd.pyo
-%%PYTHON_SITELIBDIR%%/erl_eventhandler.py
-%%PYTHON_SITELIBDIR%%/erl_eventhandler.pyc
-%%PYTHON_SITELIBDIR%%/erl_eventhandler.pyo
-%%PYTHON_SITELIBDIR%%/erl_node.py
-%%PYTHON_SITELIBDIR%%/erl_node.pyc
-%%PYTHON_SITELIBDIR%%/erl_node.pyo
-%%PYTHON_SITELIBDIR%%/erl_node_conn.py
-%%PYTHON_SITELIBDIR%%/erl_node_conn.pyc
-%%PYTHON_SITELIBDIR%%/erl_node_conn.pyo
-%%PYTHON_SITELIBDIR%%/erl_opts.py
-%%PYTHON_SITELIBDIR%%/erl_opts.pyc
-%%PYTHON_SITELIBDIR%%/erl_opts.pyo
-%%PYTHON_SITELIBDIR%%/erl_term.py
-%%PYTHON_SITELIBDIR%%/erl_term.pyc
-%%PYTHON_SITELIBDIR%%/erl_term.pyo
-%%EXAMPLESDIR%%/test_erl_epmd.py
-%%EXAMPLESDIR%%/test_erl_node.py
-%%EXAMPLESDIR%%/test_erl_node_conn.py
-%%EXAMPLESDIR%%/test_erl_node_tk_1.py
-@dirrm %%EXAMPLESDIR%%
+%%PYTHON_SITELIBDIR%%/py_interface/__init__.py
+%%PYTHON_SITELIBDIR%%/py_interface/__init__.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/__init__.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_common.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_common.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_common.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_node.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_node.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_node.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.pyo
+%%PYTHON_SITELIBDIR%%/py_interface/erl_term.py
+%%PYTHON_SITELIBDIR%%/py_interface/erl_term.pyc
+%%PYTHON_SITELIBDIR%%/py_interface/erl_term.pyo
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run_test_erl_node_pingpong.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_epmd.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_epmd.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_epmd.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_conn.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_conn.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_conn.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_pingpong.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_pingpong.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_pingpong.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_pingpong.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_tk_1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_tk_1.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_erl_node_tk_1.pyo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/py_interface