3 files changed, 81 insertions, 14 deletions

diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index 087cf9492811..64640b8c41a9 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 
 PORTNAME=	simpy
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,19 +24,13 @@ PORTDOCS=	*
 .endif
 
 post-install:
-	@${FIND} ${PYTHON_SITELIBDIR}/SimPy ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PYTHON_SITELIBDIR}/SimPy -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/SimPyDocs/ ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/SimPyModels/ ${EXAMPLESDIR}
-	@${FIND} ${EXAMPLESDIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	(cd ${WRKSRC}/SimPyDocs && ${FIND} . | \
+		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR})
 .endif
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/SimPyModels && ${FIND} . | \
+		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/py-simpy/distinfo b/devel/py-simpy/distinfo
index 658905ee3fd5..5d2a86a6351b 100644
--- a/devel/py-simpy/distinfo
+++ b/devel/py-simpy/distinfo
@@ -1,2 +1,2 @@
-MD5 (SimPy-1.5.tar.gz) = 84729bbcc120d10f6681a561691700c7
-SIZE (SimPy-1.5.tar.gz) = 498992
+MD5 (SimPy-1.6.tar.gz) = a238eb6668590e731a3a82d330d7bc5b
+SIZE (SimPy-1.6.tar.gz) = 1010398
diff --git a/devel/py-simpy/pkg-plist b/devel/py-simpy/pkg-plist
new file mode 100644
index 000000000000..d2f91e9f0d58
--- /dev/null
+++ b/devel/py-simpy/pkg-plist
@@ -0,0 +1,73 @@
+%%PYTHON_SITELIBDIR%%/SimPy/Lister.py
+%%PYTHON_SITELIBDIR%%/SimPy/Lister.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/Lister.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/Monitor.py
+%%PYTHON_SITELIBDIR%%/SimPy/Monitor.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/Monitor.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/MonitorTest.py
+%%PYTHON_SITELIBDIR%%/SimPy/MonitorTest.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/MonitorTest.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/SimGUI.py
+%%PYTHON_SITELIBDIR%%/SimPy/SimGUI.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/SimGUI.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/SimPlot.py
+%%PYTHON_SITELIBDIR%%/SimPy/SimPlot.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/SimPlot.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/Simulation.py
+%%PYTHON_SITELIBDIR%%/SimPy/Simulation.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/Simulation.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationRT.py
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationRT.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationRT.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationStep.py
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationStep.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationStep.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationTrace.py
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationTrace.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/SimulationTrace.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/__init__.py
+%%PYTHON_SITELIBDIR%%/SimPy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPy.py
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPy.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPy.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyRT.py
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyRT.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyRT.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyStep.py
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyStep.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyStep.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyTrace.py
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyTrace.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/testSimPyTrace.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/tkconsole.py
+%%PYTHON_SITELIBDIR%%/SimPy/tkconsole.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/tkconsole.pyo
+%%PYTHON_SITELIBDIR%%/SimPy/tkprogressbar.py
+%%PYTHON_SITELIBDIR%%/SimPy/tkprogressbar.pyc
+%%PYTHON_SITELIBDIR%%/SimPy/tkprogressbar.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/SimPy
+%%EXAMPLESDIR%%/CellularAutomata.py
+%%EXAMPLESDIR%%/GUIdemo.py
+%%EXAMPLESDIR%%/LISTOFMODELS.html
+%%EXAMPLESDIR%%/LISTOFMODELS.txt
+%%EXAMPLESDIR%%/MM1.py
+%%EXAMPLESDIR%%/MMC.py
+%%EXAMPLESDIR%%/Machineshop.py
+%%EXAMPLESDIR%%/Market.py
+%%EXAMPLESDIR%%/Movie_renege.py
+%%EXAMPLESDIR%%/SimGUIStep.py
+%%EXAMPLESDIR%%/SimPy_worker_extend.py
+%%EXAMPLESDIR%%/airport.py
+%%EXAMPLESDIR%%/bank08renege.py
+%%EXAMPLESDIR%%/bank11GUI.py
+%%EXAMPLESDIR%%/bank11Plot.py
+%%EXAMPLESDIR%%/bcc.py
+%%EXAMPLESDIR%%/cellphone.py
+%%EXAMPLESDIR%%/centralserver.py
+%%EXAMPLESDIR%%/demoSimPyEvents.py
+%%EXAMPLESDIR%%/jacksonnetwork.py
+%%EXAMPLESDIR%%/lemmings.py
+%%EXAMPLESDIR%%/needResources.py
+%%EXAMPLESDIR%%/shortestPath_SimPy.py
+@dirrm %%EXAMPLESDIR%%