diff -ruN py-kid.orig/Makefile py-kid/Makefile
--- py-kid.orig/Makefile	Thu Dec 29 14:25:46 2005
+++ py-kid/Makefile	Sat Nov 25 19:18:19 2006
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	kid
-PORTVERSION=	0.8
+PORTVERSION=	0.9.4
 CATEGORIES=	devel python
-MASTER_SITES=	http://lesscode.org/dist/kid/${PORTVERSION}/
+MASTER_SITES=	http://www.kid-templating.org/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	whitekid@gmail.com
@@ -26,6 +26,12 @@
 PORTDOCS=	*
 
 post-install:
+
+.for f in kid kidc
+	${CP} files/$f ${PREFIX}/bin/$f
+	${REINPLACE_CMD} -i '' -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${PREFIX}/bin/$f
+.endfor
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} ; ${CP} README HISTORY COPYING misc/* ${DOCSDIR}
diff -ruN py-kid.orig/distinfo py-kid/distinfo
--- py-kid.orig/distinfo	Thu Dec 29 14:25:46 2005
+++ py-kid/distinfo	Sat Nov 25 18:51:43 2006
@@ -1,3 +1,3 @@
-MD5 (kid-0.8.tar.gz) = 3ebc1df08ceb636fb5102fc3a1f6448e
-SHA256 (kid-0.8.tar.gz) = f00fdbb5abde5649e2e097a9426f49b224b0e2567fa7bef08593f585d3766e56
-SIZE (kid-0.8.tar.gz) = 172307
+MD5 (kid-0.9.4.tar.gz) = 2122ee32062079418db34cfd5fc15c37
+SHA256 (kid-0.9.4.tar.gz) = 5099b81f6023d3666f17781758c9417ef27b000befeef5b358f839ccdd6938ee
+SIZE (kid-0.9.4.tar.gz) = 122800
diff -ruN py-kid.orig/files/kid py-kid/files/kid
--- py-kid.orig/files/kid	Thu Jan  1 09:00:00 1970
+++ py-kid/files/kid	Sat Nov 25 19:19:34 2006
@@ -0,0 +1,5 @@
+#!%%PYTHON_CMD%%
+import sys
+import kid.run
+
+sys.exit(kid.run.main())
diff -ruN py-kid.orig/files/kidc py-kid/files/kidc
--- py-kid.orig/files/kidc	Thu Jan  1 09:00:00 1970
+++ py-kid/files/kidc	Sat Nov 25 19:19:35 2006
@@ -0,0 +1,5 @@
+#!%%PYTHON_CMD%%
+import sys
+import kid.compile
+
+sys.exit(kid.compile.main())
diff -ruN py-kid.orig/files/patch-setup.py py-kid/files/patch-setup.py
--- py-kid.orig/files/patch-setup.py	Thu Dec 29 14:25:46 2005
+++ py-kid/files/patch-setup.py	Sat Nov 25 18:54:37 2006
@@ -1,33 +1,22 @@
 
-$FreeBSD: ports/devel/py-kid/files/patch-setup.py,v 1.1 2005/12/29 05:25:46 edwin Exp $
+$FreeBSD$
 
 --- setup.py.orig
 +++ setup.py
-@@ -1,6 +1,6 @@
+@@ -1,12 +1,13 @@
  # bootstrap setuptools if necessary
 -from ez_setup import use_setuptools
 -use_setuptools()
 +#from ez_setup import use_setuptools
 +#use_setuptools()
  
- import kid as package
+ import os
  
-@@ -8,7 +8,8 @@
- package_version = package.__version__
- doc_parts = package.__doc__.strip().splitlines()
+ execfile(os.path.join("kid", "release.py"))
  
--from setuptools import setup
-+#from setuptools import setup
-+from distutils.core import setup
- setup(
-     name=package_name,
-     version=package_version,
-@@ -25,7 +26,7 @@
-     py_modules=[],
-     packages=[package_name,
-               package_name + '.test'],
--    install_requires=['elementtree'],
-+    #install_requires=['elementtree'],
-     classifiers = [
-             'Development Status :: 4 - Beta',
-             'Environment :: Console',
+-from setuptools import setup, find_packages
++#from setuptools import setup, find_packages
++from distutils.core import *
+ 
+ install_requires = []
+ try:
diff -ruN py-kid.orig/pkg-descr py-kid/pkg-descr
--- py-kid.orig/pkg-descr	Thu Dec 29 14:25:46 2005
+++ py-kid/pkg-descr	Sat Nov 25 18:50:33 2006
@@ -3,4 +3,4 @@
 We believe many of the best features of these languages live on in Kid with
 much of the limitations and complexity stamped out.
 
-WWW:	http://kid.lesscode.org/
+WWW:	http://www.kid-templating.org/
diff -ruN py-kid.orig/pkg-plist py-kid/pkg-plist
--- py-kid.orig/pkg-plist	Sun Jan 22 14:52:15 2006
+++ py-kid/pkg-plist	Sat Nov 25 19:18:18 2006
@@ -2,76 +2,130 @@
 bin/kidc
 bin/kid
 %%PYTHON_SITELIBDIR%%/kid/__init__.py
+%%PYTHON_SITELIBDIR%%/kid/codewriter.py
+%%PYTHON_SITELIBDIR%%/kid/compile.py
 %%PYTHON_SITELIBDIR%%/kid/compiler.py
 %%PYTHON_SITELIBDIR%%/kid/et.py
 %%PYTHON_SITELIBDIR%%/kid/filter.py
+%%PYTHON_SITELIBDIR%%/kid/format.py
 %%PYTHON_SITELIBDIR%%/kid/importer.py
 %%PYTHON_SITELIBDIR%%/kid/namespace.py
 %%PYTHON_SITELIBDIR%%/kid/parser.py
+%%PYTHON_SITELIBDIR%%/kid/properties.py
 %%PYTHON_SITELIBDIR%%/kid/pull.py
+%%PYTHON_SITELIBDIR%%/kid/release.py
+%%PYTHON_SITELIBDIR%%/kid/run.py
 %%PYTHON_SITELIBDIR%%/kid/serialization.py
 %%PYTHON_SITELIBDIR%%/kid/server.py
 %%PYTHON_SITELIBDIR%%/kid/template_util.py
 %%PYTHON_SITELIBDIR%%/kid/util.py
 %%PYTHON_SITELIBDIR%%/kid/test/__init__.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_attribute_interpolation.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_codewriter.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_comment.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_compiler.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_error.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_extended_layout.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_extends.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_format.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_kid.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_kid_lang.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_layout.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_match.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_namespace.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_parser.py
-%%PYTHON_SITELIBDIR%%/kid/test/test_pull.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_properties.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_scope.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_serialization.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_serialization_escaping.py
 %%PYTHON_SITELIBDIR%%/kid/test/test_suffixes.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_templatepath.py
+%%PYTHON_SITELIBDIR%%/kid/test/test_unicode.py
 %%PYTHON_SITELIBDIR%%/kid/test/util.py
 %%PYTHON_SITELIBDIR%%/kid/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_attribute_interpolation.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_codewriter.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_comment.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_compiler.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_error.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_extended_layout.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_extends.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_format.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_kid.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_kid_lang.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_layout.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_match.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_namespace.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_parser.pyc
-%%PYTHON_SITELIBDIR%%/kid/test/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_properties.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_scope.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_serialization.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_serialization_escaping.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/test_suffixes.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_templatepath.pyc
+%%PYTHON_SITELIBDIR%%/kid/test/test_unicode.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/util.pyc
 %%PYTHON_SITELIBDIR%%/kid/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_attribute_interpolation.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_codewriter.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_comment.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_compiler.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_error.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_extended_layout.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_extends.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_format.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_kid.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_kid_lang.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_layout.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_match.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_namespace.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_parser.pyo
-%%PYTHON_SITELIBDIR%%/kid/test/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_properties.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_scope.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_serialization.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_serialization_escaping.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/test_suffixes.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_templatepath.pyo
+%%PYTHON_SITELIBDIR%%/kid/test/test_unicode.pyo
 %%PYTHON_SITELIBDIR%%/kid/test/util.pyo
 %%PYTHON_SITELIBDIR%%/kid/__init__.pyc
+%%PYTHON_SITELIBDIR%%/kid/codewriter.pyc
+%%PYTHON_SITELIBDIR%%/kid/compile.pyc
 %%PYTHON_SITELIBDIR%%/kid/compiler.pyc
 %%PYTHON_SITELIBDIR%%/kid/et.pyc
 %%PYTHON_SITELIBDIR%%/kid/filter.pyc
+%%PYTHON_SITELIBDIR%%/kid/format.pyc
 %%PYTHON_SITELIBDIR%%/kid/importer.pyc
 %%PYTHON_SITELIBDIR%%/kid/namespace.pyc
 %%PYTHON_SITELIBDIR%%/kid/parser.pyc
+%%PYTHON_SITELIBDIR%%/kid/properties.pyc
 %%PYTHON_SITELIBDIR%%/kid/pull.pyc
+%%PYTHON_SITELIBDIR%%/kid/release.pyc
+%%PYTHON_SITELIBDIR%%/kid/run.pyc
 %%PYTHON_SITELIBDIR%%/kid/serialization.pyc
 %%PYTHON_SITELIBDIR%%/kid/server.pyc
 %%PYTHON_SITELIBDIR%%/kid/template_util.pyc
 %%PYTHON_SITELIBDIR%%/kid/util.pyc
 %%PYTHON_SITELIBDIR%%/kid/__init__.pyo
+%%PYTHON_SITELIBDIR%%/kid/codewriter.pyo
+%%PYTHON_SITELIBDIR%%/kid/compile.pyo
 %%PYTHON_SITELIBDIR%%/kid/compiler.pyo
 %%PYTHON_SITELIBDIR%%/kid/et.pyo
 %%PYTHON_SITELIBDIR%%/kid/filter.pyo
+%%PYTHON_SITELIBDIR%%/kid/format.pyo
 %%PYTHON_SITELIBDIR%%/kid/importer.pyo
 %%PYTHON_SITELIBDIR%%/kid/namespace.pyo
+%%PYTHON_SITELIBDIR%%/kid/run.pyo
 %%PYTHON_SITELIBDIR%%/kid/parser.pyo
+%%PYTHON_SITELIBDIR%%/kid/properties.pyo
 %%PYTHON_SITELIBDIR%%/kid/pull.pyo
+%%PYTHON_SITELIBDIR%%/kid/release.pyo
 %%PYTHON_SITELIBDIR%%/kid/serialization.pyo
 %%PYTHON_SITELIBDIR%%/kid/server.pyo
 %%PYTHON_SITELIBDIR%%/kid/template_util.pyo
 %%PYTHON_SITELIBDIR%%/kid/util.pyo
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi/kid_handler.cgi
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi/kid_handler.cgi
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi/sysinfo.kid
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/basic/self.kid