2 files changed, 89 insertions, 47 deletions

diff --git a/devel/py-htmlkit/Makefile b/devel/py-htmlkit/Makefile
index 3f3b859d9d80..6d1dd003ab2c 100644
--- a/devel/py-htmlkit/Makefile
+++ b/devel/py-htmlkit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		HtmlKit
 PORTVERSION=		1.0
+PORTREVISION=		1
 CATEGORIES=		devel python www
 MASTER_SITES=		http://www.dekorte.com/Software/Python/HtmlKit/Download/
 PKGNAMEPREFIX=		py-
@@ -14,16 +15,16 @@ DISTNAME=		HtmlKit
 
 MAINTAINER=		kbyanc@posi.net
 
-RUN_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON=		yes
+PLIST_SUB=		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 NO_BUILD=		yes
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages/HtmlKit/
+	@${MKDIR} ${PYTHON_SITELIBDIR}/HtmlKit
 	@for i in ${WRKSRC}/*.py; do \
-	    ${INSTALL_DATA} $$i ${PREFIX}/lib/python1.5/site-packages/HtmlKit; \
+	    ${INSTALL_DATA} $$i ${PYTHON_SITELIBDIR}/HtmlKit; \
 	done
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/HtmlKit
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/HtmlKit
 	@for i in ${WRKSRC}/Documentation/*; do \
diff --git a/devel/py-htmlkit/pkg-plist b/devel/py-htmlkit/pkg-plist
index 4ae57853d16a..66dd3d5358aa 100644
--- a/devel/py-htmlkit/pkg-plist
+++ b/devel/py-htmlkit/pkg-plist
@@ -1,45 +1,86 @@
-lib/python1.5/site-packages/HtmlKit/Attribute.py
-lib/python1.5/site-packages/HtmlKit/BR.py
-lib/python1.5/site-packages/HtmlKit/BaseObject.py
-lib/python1.5/site-packages/HtmlKit/Body.py
-lib/python1.5/site-packages/HtmlKit/Bold.py
-lib/python1.5/site-packages/HtmlKit/Button.py
-lib/python1.5/site-packages/HtmlKit/Center.py
-lib/python1.5/site-packages/HtmlKit/CheckBox.py
-lib/python1.5/site-packages/HtmlKit/Column.py
-lib/python1.5/site-packages/HtmlKit/Comment.py
-lib/python1.5/site-packages/HtmlKit/Container.py
-lib/python1.5/site-packages/HtmlKit/Cookie.py
-lib/python1.5/site-packages/HtmlKit/Font.py
-lib/python1.5/site-packages/HtmlKit/Form.py
-lib/python1.5/site-packages/HtmlKit/FormElement.py
-lib/python1.5/site-packages/HtmlKit/FormTable.py
-lib/python1.5/site-packages/HtmlKit/Group.py
-lib/python1.5/site-packages/HtmlKit/Header.py
-lib/python1.5/site-packages/HtmlKit/Image.py
-lib/python1.5/site-packages/HtmlKit/ImagePage.py
-lib/python1.5/site-packages/HtmlKit/Input.py
-lib/python1.5/site-packages/HtmlKit/Italic.py
-lib/python1.5/site-packages/HtmlKit/Link.py
-lib/python1.5/site-packages/HtmlKit/Menu.py
-lib/python1.5/site-packages/HtmlKit/Option.py
-lib/python1.5/site-packages/HtmlKit/Page.py
-lib/python1.5/site-packages/HtmlKit/PageGroup.py
-lib/python1.5/site-packages/HtmlKit/Panel.py
-lib/python1.5/site-packages/HtmlKit/RadioBox.py
-lib/python1.5/site-packages/HtmlKit/Row.py
-lib/python1.5/site-packages/HtmlKit/RowTable.py
-lib/python1.5/site-packages/HtmlKit/Script.py
-lib/python1.5/site-packages/HtmlKit/Select.py
-lib/python1.5/site-packages/HtmlKit/Style.py
-lib/python1.5/site-packages/HtmlKit/Table.py
-lib/python1.5/site-packages/HtmlKit/TableHeader.py
-lib/python1.5/site-packages/HtmlKit/Text.py
-lib/python1.5/site-packages/HtmlKit/TextArea.py
-lib/python1.5/site-packages/HtmlKit/Title.py
-lib/python1.5/site-packages/HtmlKit/Url.py
-lib/python1.5/site-packages/HtmlKit/__init__.py
-@dirrm lib/python1.5/site-packages/HtmlKit/
+%%PYTHON_SITELIBDIR%%/HtmlKit/Attribute.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/BR.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/BaseObject.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Body.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Bold.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Button.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Center.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/CheckBox.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Column.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Comment.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Container.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Cookie.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Font.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Form.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/FormElement.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/FormTable.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Group.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Header.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Image.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/ImagePage.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Input.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Italic.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Link.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Menu.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Option.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Page.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/PageGroup.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Panel.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/RadioBox.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Row.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/RowTable.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Script.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Select.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Style.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Table.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/TableHeader.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Text.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/TextArea.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Title.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Url.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/__init__.py
+%%PYTHON_SITELIBDIR%%/HtmlKit/Attribute.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/BR.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/BaseObject.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Body.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Bold.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Button.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Center.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/CheckBox.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Column.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Comment.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Container.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Cookie.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Font.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Form.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/FormElement.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/FormTable.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Group.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Header.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Image.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/ImagePage.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Input.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Italic.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Link.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Menu.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Option.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Page.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/PageGroup.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Panel.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/RadioBox.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Row.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/RowTable.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Script.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Select.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Style.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Table.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/TableHeader.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Text.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/TextArea.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Title.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/Url.pyc
+%%PYTHON_SITELIBDIR%%/HtmlKit/__init__.pyc
+@dirrm %%PYTHON_SITELIBDIR%%/HtmlKit
 share/doc/HtmlKit/Attribute.html
 share/doc/HtmlKit/BR.html
 share/doc/HtmlKit/BaseObject.html