diff -ruN xist.orig/Makefile xist/Makefile
--- xist.orig/Makefile	Tue Sep 21 15:45:06 2004
+++ xist/Makefile	Tue Sep 21 15:45:50 2004
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xist
-PORTVERSION= 	2.2
+PORTVERSION= 	2.5
 CATEGORIES=	www python
 MASTER_SITES=	ftp://ftp.livinglogic.de/pub/livinglogic/xist/
 DISTNAME=	ll-${PORTNAME}-${PORTVERSION}
@@ -21,6 +21,7 @@
 
 USE_PYTHON=	2.3
 USE_PYDISTUTILS=	yes
+USE_BZIP2=	yes
 
 post-install:
 .for file in doc2txt dtd2xsc tld2xsc xscmake
diff -ruN xist.orig/distinfo xist/distinfo
--- xist.orig/distinfo	Tue Sep 21 15:45:06 2004
+++ xist/distinfo	Tue Sep 21 15:47:00 2004
@@ -1,2 +1,2 @@
-MD5 (ll-xist-2.2.tar.gz) = 382fe074e996aecc1ab519fe87119554
-SIZE (ll-xist-2.2.tar.gz) = 295383
+MD5 (ll-xist-2.5.tar.bz2) = 78986b078b3b58ae2d5b82989d04ce00
+SIZE (ll-xist-2.5.tar.bz2) = 247004
diff -ruN xist.orig/pkg-plist xist/pkg-plist
--- xist.orig/pkg-plist	Tue Sep 21 15:45:07 2004
+++ xist/pkg-plist	Tue Sep 21 17:25:58 2004
@@ -25,6 +25,9 @@
 %%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/chars.py
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/chars.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/ns/chars.pyo
 %%PYTHON_SITELIBDIR%%/ll/xist/ns/code.py
 %%PYTHON_SITELIBDIR%%/ll/xist/ns/code.pyc
 %%PYTHON_SITELIBDIR%%/ll/xist/ns/code.pyo
@@ -79,9 +82,6 @@
 %%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
@@ -106,9 +106,6 @@
 %%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
@@ -124,15 +121,18 @@
 %%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/sims.py
+%%PYTHON_SITELIBDIR%%/ll/xist/sims.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/sims.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/xnd.py
+%%PYTHON_SITELIBDIR%%/ll/xist/xnd.pyc
+%%PYTHON_SITELIBDIR%%/ll/xist/xnd.pyo
 %%PYTHON_SITELIBDIR%%/ll/xist/xsc.py
 %%PYTHON_SITELIBDIR%%/ll/xist/xsc.pyc
 %%PYTHON_SITELIBDIR%%/ll/xist/xsc.pyo