3 files changed, 143 insertions, 37 deletions

diff --git a/www/xist/Makefile b/www/xist/Makefile
index 249d8c7d1e64..fbc5e35269ba 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	xist
-PORTVERSION= 	1.2.1
+PORTVERSION= 	2.2
 CATEGORIES=	www python
 MASTER_SITES=	ftp://ftp.livinglogic.de/pub/livinglogic/xist/
-DISTNAME=	XIST-${PORTVERSION}
+DISTNAME=	ll-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	An XML-based extensible HTML generator
@@ -19,11 +19,11 @@ RUN_DEPENDS=	${PYXML} \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/mx/Tidy/mxTidy/mxTidy.so:${PORTSDIR}/devel/py-mx-experimental
 
-USE_PYTHON=	yes
+USE_PYTHON=	2.3
 USE_PYDISTUTILS=	yes
 
 post-install:
-.for file in doc2txt dtd2xsc xscmake
+.for file in doc2txt dtd2xsc tld2xsc xscmake
 	@${MV} ${PREFIX}/bin/${file}.py ${PREFIX}/bin/${file}
 .endfor
 
diff --git a/www/xist/distinfo b/www/xist/distinfo
index 16a63c36af7b..debd62a3c5e3 100644
--- a/www/xist/distinfo
+++ b/www/xist/distinfo
@@ -1 +1 @@
-MD5 (XIST-1.2.1.tar.gz) = c76b6f270a897e774d76a241f8aca554
+MD5 (ll-xist-2.2.tar.gz) = 382fe074e996aecc1ab519fe87119554
diff --git a/www/xist/pkg-plist b/www/xist/pkg-plist
index ed178497ce13..f47a0b5db3f0 100644
--- a/www/xist/pkg-plist
+++ b/www/xist/pkg-plist
@@ -1,35 +1,141 @@
 bin/doc2txt
 bin/dtd2xsc
+bin/tld2xsc
 bin/xscmake
-lib/%%PYTHON_VERSION%%/site-packages/xist/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/converters.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/drv_sgmlop.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/errors.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/abbr.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/code.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/cond.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/doc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/docbook.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/form.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/jsp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/meta.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/php.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/ruby.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/specials.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/struts_config.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/struts_html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/ns/wml.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/options.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/parsers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/presenters.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/publishers.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/sandbox.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/url.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/urlnix.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/utils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/wwi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/xist/xsc.pyc
-@dirrm lib/%%PYTHON_VERSION%%/xist/ns
-@dirrm lib/%%PYTHON_VERSION%%/xist
+%%PYTHON_SITELIBDIR%%/ll/__init__.py
+%%PYTHON_SITELIBDIR%%/ll/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ll/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/__init__.py
+%%PYTHON_SITELIBDIR%%/ll/xist/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/converters.py
+%%PYTHON_SITELIBDIR%%/ll/xist/converters.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/converters.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/cssparsers.py
+%%PYTHON_SITELIBDIR%%/ll/xist/cssparsers.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/cssparsers.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/csstokenizer.so
+%%PYTHON_SITELIBDIR%%/ll/xist/errors.py
+%%PYTHON_SITELIBDIR%%/ll/xist/errors.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/errors.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/helpers.so
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/__init__.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/__init__.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/abbr.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/abbr.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/abbr.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/code.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/code.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/code.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/cond.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/cond.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/cond.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/css.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/css.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/css.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/cssspecials.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/cssspecials.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/cssspecials.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/doc.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/doc.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/doc.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/docbook.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/docbook.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/docbook.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/fo.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/fo.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/fo.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/form.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/form.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/form.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/html.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/html.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/html.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/htmlspecials.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/htmlspecials.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/htmlspecials.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/ihtml.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/ihtml.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/ihtml.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/jsp.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/jsp.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/jsp.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/meta.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/meta.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/meta.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/metal.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/metal.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/metal.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/php.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/php.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/php.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/ruby.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/ruby.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/ruby.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/specials.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/specials.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/specials.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_config.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_config.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_config.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_config11.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_config11.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_config11.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_html.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_html.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/struts_html.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/svg.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/svg.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/svg.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/tal.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/tal.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/tal.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/text.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/text.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/text.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/tld.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/tld.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/tld.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/wml.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/wml.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/wml.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xlink.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xlink.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xlink.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xml.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xml.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xml.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xndl.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xndl.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/xndl.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/options.py
+%%PYTHON_SITELIBDIR%%/ll/xist/options.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/options.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/parsers.py
+%%PYTHON_SITELIBDIR%%/ll/xist/parsers.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/parsers.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/presenters.py
+%%PYTHON_SITELIBDIR%%/ll/xist/presenters.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/presenters.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/publishers.py
+%%PYTHON_SITELIBDIR%%/ll/xist/publishers.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/publishers.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/sandbox.py
+%%PYTHON_SITELIBDIR%%/ll/xist/sandbox.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/sandbox.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/sources.py
+%%PYTHON_SITELIBDIR%%/ll/xist/sources.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/sources.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/utils.py
+%%PYTHON_SITELIBDIR%%/ll/xist/utils.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/utils.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/wwi.py
+%%PYTHON_SITELIBDIR%%/ll/xist/wwi.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/wwi.pyo
+%%PYTHON_SITELIBDIR%%/ll/xist/xsc.py
+%%PYTHON_SITELIBDIR%%/ll/xist/xsc.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/xsc.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/ll/xist/ns
+@dirrm %%PYTHON_SITELIBDIR%%/ll/xist
+@dirrm %%PYTHON_SITELIBDIR%%/ll