update to 2.3

changes:
-restructured, Python3 support (not yet enabled in pkgsrc)
-m=bugfix
-documentation improvement

3 files changed, 28 insertions, 49 deletions

diff --git a/cad/py-simpy/Makefile b/cad/py-simpy/Makefile
index 0743ca2fd30..bb8d04e2ad7 100644
--- a/cad/py-simpy/Makefile
+++ b/cad/py-simpy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 13:25:15 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/24 10:54:14 drochner Exp $
 #
 
-DISTNAME=		SimPy-2.1.0
+DISTNAME=		SimPy-2.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=		cad math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=simpy/} \
@@ -16,9 +16,9 @@ PYDISTUTILSPKG=	yes
 
 TEST_ENV+=	PYTHONPATH=${WRKSRC:Q}/build/lib
 
-do-test:
-	${RUN} cd ${WRKSRC}; \
-	${SETENV} ${TEST_ENV} ${PYTHONBIN} SimPy/testSimPy.py
+# needs py-test (pkgsrc/devel/py-test)
+#do-test:
+#	${SETENV} ${TEST_ENV} ${PYTHONBIN} -c "import SimPy; SimPy.test()"
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/py-simpy/PLIST b/cad/py-simpy/PLIST
index 625cafe20ef..39098ac3e2d 100644
--- a/cad/py-simpy/PLIST
+++ b/cad/py-simpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/06/05 04:38:46 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/07/24 10:54:14 drochner Exp $
 ${PYSITELIB}/SimPy/GUIDebug.py
 ${PYSITELIB}/SimPy/GUIDebug.pyc
 ${PYSITELIB}/SimPy/GUIDebug.pyo
@@ -11,12 +11,6 @@ ${PYSITELIB}/SimPy/Lib.pyo
 ${PYSITELIB}/SimPy/Lister.py
 ${PYSITELIB}/SimPy/Lister.pyc
 ${PYSITELIB}/SimPy/Lister.pyo
-${PYSITELIB}/SimPy/Monitor.py
-${PYSITELIB}/SimPy/Monitor.pyc
-${PYSITELIB}/SimPy/Monitor.pyo
-${PYSITELIB}/SimPy/MonitorTest.py
-${PYSITELIB}/SimPy/MonitorTest.pyc
-${PYSITELIB}/SimPy/MonitorTest.pyo
 ${PYSITELIB}/SimPy/Recording.py
 ${PYSITELIB}/SimPy/Recording.pyc
 ${PYSITELIB}/SimPy/Recording.pyo
@@ -47,39 +41,24 @@ ${PYSITELIB}/SimPy/__init__.pyo
 ${PYSITELIB}/SimPy/stepping.py
 ${PYSITELIB}/SimPy/stepping.pyc
 ${PYSITELIB}/SimPy/stepping.pyo
-${PYSITELIB}/SimPy/testRT_Behavior.py
-${PYSITELIB}/SimPy/testRT_Behavior.pyc
-${PYSITELIB}/SimPy/testRT_Behavior.pyo
-${PYSITELIB}/SimPy/testRT_Behavior_OO.py
-${PYSITELIB}/SimPy/testRT_Behavior_OO.pyc
-${PYSITELIB}/SimPy/testRT_Behavior_OO.pyo
-${PYSITELIB}/SimPy/testSimPy.py
-${PYSITELIB}/SimPy/testSimPy.pyc
-${PYSITELIB}/SimPy/testSimPy.pyo
-${PYSITELIB}/SimPy/testSimPyOO.py
-${PYSITELIB}/SimPy/testSimPyOO.pyc
-${PYSITELIB}/SimPy/testSimPyOO.pyo
-${PYSITELIB}/SimPy/testSimPyRT.py
-${PYSITELIB}/SimPy/testSimPyRT.pyc
-${PYSITELIB}/SimPy/testSimPyRT.pyo
-${PYSITELIB}/SimPy/testSimPyRTOO.py
-${PYSITELIB}/SimPy/testSimPyRTOO.pyc
-${PYSITELIB}/SimPy/testSimPyRTOO.pyo
-${PYSITELIB}/SimPy/testSimPyStep.py
-${PYSITELIB}/SimPy/testSimPyStep.pyc
-${PYSITELIB}/SimPy/testSimPyStep.pyo
-${PYSITELIB}/SimPy/testSimPyStepOO.py
-${PYSITELIB}/SimPy/testSimPyStepOO.pyc
-${PYSITELIB}/SimPy/testSimPyStepOO.pyo
-${PYSITELIB}/SimPy/testSimPyTrace.py
-${PYSITELIB}/SimPy/testSimPyTrace.pyc
-${PYSITELIB}/SimPy/testSimPyTrace.pyo
-${PYSITELIB}/SimPy/testSimPyTraceOO.py
-${PYSITELIB}/SimPy/testSimPyTraceOO.pyc
-${PYSITELIB}/SimPy/testSimPyTraceOO.pyo
-${PYSITELIB}/SimPy/testSimPy_simident.py
-${PYSITELIB}/SimPy/testSimPy_simident.pyc
-${PYSITELIB}/SimPy/testSimPy_simident.pyo
+${PYSITELIB}/SimPy/test/__init__.py
+${PYSITELIB}/SimPy/test/__init__.pyc
+${PYSITELIB}/SimPy/test/__init__.pyo
+${PYSITELIB}/SimPy/test/support.py
+${PYSITELIB}/SimPy/test/support.pyc
+${PYSITELIB}/SimPy/test/support.pyo
+${PYSITELIB}/SimPy/test/test_monitor.py
+${PYSITELIB}/SimPy/test/test_monitor.pyc
+${PYSITELIB}/SimPy/test/test_monitor.pyo
+${PYSITELIB}/SimPy/test/test_rt_behavior.py
+${PYSITELIB}/SimPy/test/test_rt_behavior.pyc
+${PYSITELIB}/SimPy/test/test_rt_behavior.pyo
+${PYSITELIB}/SimPy/test/test_simident.py
+${PYSITELIB}/SimPy/test/test_simident.pyc
+${PYSITELIB}/SimPy/test/test_simident.pyo
+${PYSITELIB}/SimPy/test/test_simpy.py
+${PYSITELIB}/SimPy/test/test_simpy.pyc
+${PYSITELIB}/SimPy/test/test_simpy.pyo
 ${PYSITELIB}/SimPy/tkconsole.py
 ${PYSITELIB}/SimPy/tkconsole.pyc
 ${PYSITELIB}/SimPy/tkconsole.pyo
diff --git a/cad/py-simpy/distinfo b/cad/py-simpy/distinfo
index afb2e2a1d43..4174d469ffb 100644
--- a/cad/py-simpy/distinfo
+++ b/cad/py-simpy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2010/06/05 04:38:46 obache Exp $
+$NetBSD: distinfo,v 1.6 2013/07/24 10:54:14 drochner Exp $
 
-SHA1 (SimPy-2.1.0.tar.gz) = f26b3e6d3e4bfa404b5e0c72b2ea5e6b6ce54e6a
-RMD160 (SimPy-2.1.0.tar.gz) = 07da2d6f881b3029e5fb1db116ee30d12f654743
-Size (SimPy-2.1.0.tar.gz) = 4342621 bytes
+SHA1 (SimPy-2.3.tar.gz) = e4cf0d93dc0d20d8cb84c253ed241aadf83c71c9
+RMD160 (SimPy-2.3.tar.gz) = d392e8d47f6726f604ff0332bb41fd826ee7c29f
+Size (SimPy-2.3.tar.gz) = 4881530 bytes