- update to 2.5

- now Python 2.5 compitable
- depends on www/py-qpy
- update my mail address

3 files changed, 24 insertions, 12 deletions

diff --git a/www/quixote/Makefile b/www/quixote/Makefile
index 3111974d3a20..6ae22d87dbdf 100644
--- a/www/quixote/Makefile
+++ b/www/quixote/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	quixote
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	www python
-MASTER_SITES=	http://www.mems-exchange.org/software/files/quixote/ \
+MASTER_SITES=	http://quixote.ca/releases/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
 DISTNAME=	Quixote-${PORTVERSION}
 
-MAINTAINER=	dryice@dryice.name
+MAINTAINER=	dryice@FreeBSD.ORg
 COMMENT=	A framework for developing web applications in Python
 
-USE_PYTHON=	2.3-2.4
+RUN_DEPENDS+=	qpcheck.py:${PORTSDIR}/www/py-qpy
+
+USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Quixote
 
@@ -28,7 +30,7 @@ post-install:
 
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
-.for docfile in ACKS CHANGES LICENSE README TODO doc/*
+.for docfile in ACKS.txt CHANGES.txt LICENSE.txt README.txt TODO doc/*
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .endif
diff --git a/www/quixote/distinfo b/www/quixote/distinfo
index 9d9f272cc0c0..4b22e0d9f5f6 100644
--- a/www/quixote/distinfo
+++ b/www/quixote/distinfo
@@ -1,3 +1,3 @@
-MD5 (Quixote-2.4.tar.gz) = 5dc36613faba7dee6c8c6d24c1334303
-SHA256 (Quixote-2.4.tar.gz) = a44acc9e7ec6610f057b216f2382b0267d419166619d472484b1961cadb04a21
-SIZE (Quixote-2.4.tar.gz) = 192388
+MD5 (Quixote-2.5.tar.gz) = a5605270c2b53964d2e90c861822e8ca
+SHA256 (Quixote-2.5.tar.gz) = 03cedc25f3f5ee85cc3da63c4eb6a694e06e9fc40067797748d3fb4005f99ed1
+SIZE (Quixote-2.5.tar.gz) = 176192
diff --git a/www/quixote/pkg-plist b/www/quixote/pkg-plist
index 4d02c3fbde0a..17c132b1d524 100644
--- a/www/quixote/pkg-plist
+++ b/www/quixote/pkg-plist
@@ -49,6 +49,9 @@
 %%PYTHON_SITELIBDIR%%/quixote/html/_py_htmltext.py
 %%PYTHON_SITELIBDIR%%/quixote/html/_py_htmltext.pyc
 %%PYTHON_SITELIBDIR%%/quixote/html/_py_htmltext.pyo
+%%PYTHON_SITELIBDIR%%/quixote/html/qpy_templateio.py
+%%PYTHON_SITELIBDIR%%/quixote/html/qpy_templateio.pyc
+%%PYTHON_SITELIBDIR%%/quixote/html/qpy_templateio.pyo
 %%PYTHON_SITELIBDIR%%/quixote/http_request.py
 %%PYTHON_SITELIBDIR%%/quixote/http_request.pyc
 %%PYTHON_SITELIBDIR%%/quixote/http_request.pyo
@@ -122,15 +125,20 @@
 %%PYTHON_SITELIBDIR%%/quixote/util.py
 %%PYTHON_SITELIBDIR%%/quixote/util.pyc
 %%PYTHON_SITELIBDIR%%/quixote/util.pyo
-%%PORTDOCS%%%%DOCSDIR%%/ACKS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PYTHON_SITELIBDIR%%/quixote/wsgi.py
+%%PYTHON_SITELIBDIR%%/quixote/wsgi.pyc
+%%PYTHON_SITELIBDIR%%/quixote/wsgi.pyo
+%%PORTDOCS%%%%DOCSDIR%%/ACKS.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES_24.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE_24.txt
 %%PORTDOCS%%%%DOCSDIR%%/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/PTL.html
 %%PORTDOCS%%%%DOCSDIR%%/PTL.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/default.css
 %%PORTDOCS%%%%DOCSDIR%%/demo.html
@@ -154,6 +162,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/widgets.html
 %%PORTDOCS%%%%DOCSDIR%%/widgets.txt
 %%PORTDOCS%%%%DOCSDIR%%/win32.txt
+%%PORTDOCS%%%%DOCSDIR%%/wsgi.html
+%%PORTDOCS%%%%DOCSDIR%%/wsgi.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/quixote/server
 @dirrm %%PYTHON_SITELIBDIR%%/quixote/ptl