3 files changed, 131 insertions, 55 deletions

diff --git a/devel/py-ui/Makefile b/devel/py-ui/Makefile
index acf353659984..0ca91c0b22cc 100644
--- a/devel/py-ui/Makefile
+++ b/devel/py-ui/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ui
-PORTVERSION=	0.93
+PORTVERSION=	0.95
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pyui
@@ -25,15 +25,13 @@ RUN_DEPENDS=	\
 
 USE_ZIP=	yes
 USE_PYTHON=	yes
-WRKSRC=		${WRKDIR}/pyui
-NO_BUILD=	yes
+USE_PYDISTUTILS= yes
 
-do-install:
-	@${MKDIR} ${PYTHON_SITELIBDIR}/pyui
-	${CP} -R ${WRKSRC}/pyui/* ${PYTHON_SITELIBDIR}/pyui
+post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
+	@${RM} -rf ${WRKSRC}/docs/CVS
+	@${MKDIR} ${PREFIX}/share/doc/py-ui
+	${CP} ${WRKSRC}/docs/* ${PREFIX}/share/doc/py-ui
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-ui/distinfo b/devel/py-ui/distinfo
index c87880274120..bce32c144fba 100644
--- a/devel/py-ui/distinfo
+++ b/devel/py-ui/distinfo
@@ -1 +1 @@
-MD5 (pyui093.zip) = 5cf30460fed4ed36de3d38416fae330a
+MD5 (pyui095.zip) = 2c6c339c1992989c6a342cf6634fb8af
diff --git a/devel/py-ui/pkg-plist b/devel/py-ui/pkg-plist
index 6c6d8f5fead2..575e2c3566f0 100644
--- a/devel/py-ui/pkg-plist
+++ b/devel/py-ui/pkg-plist
@@ -1,46 +1,124 @@
-%%PYTHON_SITELIBDIR%%/pyui/__init__.py
-%%PYTHON_SITELIBDIR%%/pyui/_entry.py
-%%PYTHON_SITELIBDIR%%/pyui/_widgets.py
-%%PYTHON_SITELIBDIR%%/pyui/boat.py
-%%PYTHON_SITELIBDIR%%/pyui/colors.py
-%%PYTHON_SITELIBDIR%%/pyui/core.py
-%%PYTHON_SITELIBDIR%%/pyui/database.py
-%%PYTHON_SITELIBDIR%%/pyui/desktop.py
-%%PYTHON_SITELIBDIR%%/pyui/dialogs.py
-%%PYTHON_SITELIBDIR%%/pyui/entry.py
-%%PYTHON_SITELIBDIR%%/pyui/greenTheme.py
-%%PYTHON_SITELIBDIR%%/pyui/grid.py
-%%PYTHON_SITELIBDIR%%/pyui/layouts.py
-%%PYTHON_SITELIBDIR%%/pyui/locals.py
-%%PYTHON_SITELIBDIR%%/pyui/renderer2D.py
-%%PYTHON_SITELIBDIR%%/pyui/renderer3d.py
-%%PYTHON_SITELIBDIR%%/pyui/rendererBase.py
-%%PYTHON_SITELIBDIR%%/pyui/rendererGL.py
-%%PYTHON_SITELIBDIR%%/pyui/rendererGLUT.py
-%%PYTHON_SITELIBDIR%%/pyui/rendererP3D.py
-%%PYTHON_SITELIBDIR%%/pyui/rendererTK.py
-%%PYTHON_SITELIBDIR%%/pyui/rendererWin32.py
-%%PYTHON_SITELIBDIR%%/pyui/sheet.py
-%%PYTHON_SITELIBDIR%%/pyui/theme.py
-%%PYTHON_SITELIBDIR%%/pyui/theme2k.py
-%%PYTHON_SITELIBDIR%%/pyui/tree.py
-%%PYTHON_SITELIBDIR%%/pyui/viewer.py
-%%PYTHON_SITELIBDIR%%/pyui/widgets.py
-@dirrm %%PYTHON_SITELIBDIR%%/pyui
-%%PORTDOCS%%%%DOCSDIR%%/pyui.colors.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.core.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.database.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.desktop.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.dialogs.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.entry.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.greenTheme.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.grid.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.layouts.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.locals.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.rendererBase.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.theme.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.tree.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.viewer.html
-%%PORTDOCS%%%%DOCSDIR%%/pyui.widgets.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/%%PYTHON_VERSION%%/site-packages/pyui/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/base.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/base.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/base.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/colors.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/colors.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/colors.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/core.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/core.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/core.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/desktop.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/desktop.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/desktop.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/dialogs.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/dialogs.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/dialogs.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/entry.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/entry.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/entry.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/grid.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/grid.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/grid.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/htlib.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/htlib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/htlib.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/html.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/html.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/html.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/htmlElements.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/htmlElements.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/htmlElements.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/layouts.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/layouts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/layouts.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/locals.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/locals.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/locals.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderer3d.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderer3d.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderer3d.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/rendererBase.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/rendererBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/rendererBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/nebula.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/nebula.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/nebula.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglBase.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglGlut.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglGlut.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglGlut.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglPygame.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglPygame.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/openglPygame.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/pygame2D.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/pygame2D.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/pygame2D.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/unseen.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/unseen.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers/unseen.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/sheet.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/sheet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/sheet.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themeBase.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themeBase.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themeBase.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/comic.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/comic.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/comic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/future.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/future.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/future.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/green.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/green.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/green.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/win2k.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/win2k.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/themes/win2k.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/tree.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/tree.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/tree.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/viewer.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/viewer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/viewer.pyo
+lib/%%PYTHON_VERSION%%/site-packages/pyui/widgets.py
+lib/%%PYTHON_VERSION%%/site-packages/pyui/widgets.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pyui/widgets.pyo
+%%PORTDOCS%%share/doc/py-ui/dependencies.jpg
+%%PORTDOCS%%share/doc/py-ui/pyui.base.html
+%%PORTDOCS%%share/doc/py-ui/pyui.colors.html
+%%PORTDOCS%%share/doc/py-ui/pyui.core.html
+%%PORTDOCS%%share/doc/py-ui/pyui.database.html
+%%PORTDOCS%%share/doc/py-ui/pyui.desktop.html
+%%PORTDOCS%%share/doc/py-ui/pyui.dialogs.html
+%%PORTDOCS%%share/doc/py-ui/pyui.entry.html
+%%PORTDOCS%%share/doc/py-ui/pyui.greenTheme.html
+%%PORTDOCS%%share/doc/py-ui/pyui.grid.html
+%%PORTDOCS%%share/doc/py-ui/pyui.html
+%%PORTDOCS%%share/doc/py-ui/pyui.html.html
+%%PORTDOCS%%share/doc/py-ui/pyui.layouts.html
+%%PORTDOCS%%share/doc/py-ui/pyui.locals.html
+%%PORTDOCS%%share/doc/py-ui/pyui.renderer3d.html
+%%PORTDOCS%%share/doc/py-ui/pyui.rendererBase.html
+%%PORTDOCS%%share/doc/py-ui/pyui.renderers.openglGlut.html
+%%PORTDOCS%%share/doc/py-ui/pyui.renderers.openglPygame.html
+%%PORTDOCS%%share/doc/py-ui/pyui.renderers.pygame2D.html
+%%PORTDOCS%%share/doc/py-ui/pyui.sheet.html
+%%PORTDOCS%%share/doc/py-ui/pyui.theme.html
+%%PORTDOCS%%share/doc/py-ui/pyui.tree.html
+%%PORTDOCS%%share/doc/py-ui/pyui.viewer.html
+%%PORTDOCS%%share/doc/py-ui/pyui.widgets.html
+%%PORTDOCS%%@dirrm share/doc/py-ui
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyui/themes
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyui/renderers
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyui