- Update to 2.0

- Require python 2.3+

PR:		ports/79851
Submitted by:	Dryice Liu <dryice@liu.com.cn> (maintainer)

6 files changed, 120 insertions, 98 deletions

diff --git a/www/quixote/Makefile b/www/quixote/Makefile
index 44cf37f46e76..1d458028abd7 100644
--- a/www/quixote/Makefile
+++ b/www/quixote/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quixote
-PORTVERSION=	1.2
+PORTVERSION=	2.0
 CATEGORIES=	www python
 MASTER_SITES=	http://www.mems-exchange.org/software/files/quixote/ \
 		http://bsdchat.com/dist/dryice/
@@ -15,22 +15,15 @@ DISTNAME=	Quixote-${PORTVERSION}
 MAINTAINER=	dryice@liu.com.cn
 COMMENT=	A framework for developing web applications in Python
 
-USE_PYTHON=	2.0+
+USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_REL} < 220
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/compiler/__init__.py:${PORTSDIR}/lang/py-compiler
-.endif
-
 post-install:
 	@ PYTHONPATH=${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 	  ${PYTHON_CMD} ${SCRIPTDIR}/compile_ptl.py \
 	  ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/${PORTNAME}/demo/*.ptl
-	@ ${MKDIR} ${EXAMPLESDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/demo/*.cgi ${WRKSRC}/demo/*.conf \
-	  ${EXAMPLESDIR}
 
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
diff --git a/www/quixote/distinfo b/www/quixote/distinfo
index e9048735f842..4fe41053bd3b 100644
--- a/www/quixote/distinfo
+++ b/www/quixote/distinfo
@@ -1,2 +1,2 @@
-MD5 (Quixote-1.2.tar.gz) = f39e6627fba8266996bff3a494053db7
-SIZE (Quixote-1.2.tar.gz) = 193427
+MD5 (Quixote-2.0.tar.gz) = f6a4bbce7532ead7aa1157e3856beef5
+SIZE (Quixote-2.0.tar.gz) = 154867
diff --git a/www/quixote/files/patch-server-simple_server.py b/www/quixote/files/patch-server-simple_server.py
new file mode 100644
index 000000000000..8cabd842a984
--- /dev/null
+++ b/www/quixote/files/patch-server-simple_server.py
@@ -0,0 +1,11 @@
+--- server/simple_server.py.orig	Tue Apr  5 21:38:19 2005
++++ server/simple_server.py	Wed Apr 13 15:24:07 2005
+@@ -72,7 +72,7 @@
+     """Runs a simple, single threaded, synchronous HTTP server that
+     publishes a Quixote application.
+     """
+-    if HTTPS:
++    if https:
+         HTTPRequestHandler.required_cgi_environment['HTTPS'] = 'on'
+     httpd = HTTPServer((host, port), HTTPRequestHandler)
+     publisher = create_publisher()
diff --git a/www/quixote/files/patch-setup.py b/www/quixote/files/patch-setup.py
new file mode 100644
index 000000000000..a229cc86fca7
--- /dev/null
+++ b/www/quixote/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	Tue Apr 12 02:41:32 2005
++++ setup.py	Wed Apr 13 15:23:43 2005
+@@ -29,7 +29,7 @@
+ 
+       'package_dir': {'quixote':os.curdir},
+       'packages': ['quixote',  'quixote.demo', 'quixote.form',
+-                   'quixote.server'],
++                   'quixote.server', 'quixote.html', 'quixote.ptl', 'quixote.form1'],
+ 
+       'ext_modules': [],
+ 
diff --git a/www/quixote/pkg-plist b/www/quixote/pkg-plist
index 9eb1722215c9..093fdba82c40 100644
--- a/www/quixote/pkg-plist
+++ b/www/quixote/pkg-plist
@@ -1,154 +1,161 @@
 %%PYTHON_SITELIBDIR%%/quixote/__init__.py
 %%PYTHON_SITELIBDIR%%/quixote/__init__.pyc
 %%PYTHON_SITELIBDIR%%/quixote/__init__.pyo
-%%PYTHON_SITELIBDIR%%/quixote/_c_htmltext.so
-%%PYTHON_SITELIBDIR%%/quixote/_py_htmltext.py
-%%PYTHON_SITELIBDIR%%/quixote/_py_htmltext.pyc
-%%PYTHON_SITELIBDIR%%/quixote/_py_htmltext.pyo
-%%PYTHON_SITELIBDIR%%/quixote/cimport.so
 %%PYTHON_SITELIBDIR%%/quixote/config.py
 %%PYTHON_SITELIBDIR%%/quixote/config.pyc
 %%PYTHON_SITELIBDIR%%/quixote/config.pyo
 %%PYTHON_SITELIBDIR%%/quixote/demo/__init__.py
 %%PYTHON_SITELIBDIR%%/quixote/demo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/quixote/demo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/quixote/demo/demo_scgi.py
-%%PYTHON_SITELIBDIR%%/quixote/demo/demo_scgi.pyc
-%%PYTHON_SITELIBDIR%%/quixote/demo/demo_scgi.pyo
+%%PYTHON_SITELIBDIR%%/quixote/demo/altdemo.py
+%%PYTHON_SITELIBDIR%%/quixote/demo/altdemo.pyc
+%%PYTHON_SITELIBDIR%%/quixote/demo/altdemo.pyo
+%%PYTHON_SITELIBDIR%%/quixote/demo/extras.ptl
+%%PYTHON_SITELIBDIR%%/quixote/demo/extras.ptlc
 %%PYTHON_SITELIBDIR%%/quixote/demo/forms.ptl
 %%PYTHON_SITELIBDIR%%/quixote/demo/forms.ptlc
-%%PYTHON_SITELIBDIR%%/quixote/demo/integer_ui.py
-%%PYTHON_SITELIBDIR%%/quixote/demo/integer_ui.pyc
-%%PYTHON_SITELIBDIR%%/quixote/demo/integer_ui.pyo
-%%PYTHON_SITELIBDIR%%/quixote/demo/pages.ptl
-%%PYTHON_SITELIBDIR%%/quixote/demo/pages.ptlc
-%%PYTHON_SITELIBDIR%%/quixote/demo/run_cgi.py
-%%PYTHON_SITELIBDIR%%/quixote/demo/run_cgi.pyc
-%%PYTHON_SITELIBDIR%%/quixote/demo/run_cgi.pyo
-%%PYTHON_SITELIBDIR%%/quixote/demo/session.ptl
-%%PYTHON_SITELIBDIR%%/quixote/demo/session.ptlc
-%%PYTHON_SITELIBDIR%%/quixote/demo/widgets.ptl
-%%PYTHON_SITELIBDIR%%/quixote/demo/widgets.ptlc
+%%PYTHON_SITELIBDIR%%/quixote/demo/integers.ptl
+%%PYTHON_SITELIBDIR%%/quixote/demo/integers.ptlc
+%%PYTHON_SITELIBDIR%%/quixote/demo/mini_demo.py
+%%PYTHON_SITELIBDIR%%/quixote/demo/mini_demo.pyc
+%%PYTHON_SITELIBDIR%%/quixote/demo/mini_demo.pyo
+%%PYTHON_SITELIBDIR%%/quixote/demo/root.ptl
+%%PYTHON_SITELIBDIR%%/quixote/demo/root.ptlc
+%%PYTHON_SITELIBDIR%%/quixote/directory.py
+%%PYTHON_SITELIBDIR%%/quixote/directory.pyc
+%%PYTHON_SITELIBDIR%%/quixote/directory.pyo
 %%PYTHON_SITELIBDIR%%/quixote/errors.py
 %%PYTHON_SITELIBDIR%%/quixote/errors.pyc
 %%PYTHON_SITELIBDIR%%/quixote/errors.pyo
-%%PYTHON_SITELIBDIR%%/quixote/fcgi.py
-%%PYTHON_SITELIBDIR%%/quixote/fcgi.pyc
-%%PYTHON_SITELIBDIR%%/quixote/fcgi.pyo
 %%PYTHON_SITELIBDIR%%/quixote/form/__init__.py
 %%PYTHON_SITELIBDIR%%/quixote/form/__init__.pyc
 %%PYTHON_SITELIBDIR%%/quixote/form/__init__.pyo
+%%PYTHON_SITELIBDIR%%/quixote/form/compatibility.py
+%%PYTHON_SITELIBDIR%%/quixote/form/compatibility.pyc
+%%PYTHON_SITELIBDIR%%/quixote/form/compatibility.pyo
+%%PYTHON_SITELIBDIR%%/quixote/form/css.py
+%%PYTHON_SITELIBDIR%%/quixote/form/css.pyc
+%%PYTHON_SITELIBDIR%%/quixote/form/css.pyo
 %%PYTHON_SITELIBDIR%%/quixote/form/form.py
 %%PYTHON_SITELIBDIR%%/quixote/form/form.pyc
 %%PYTHON_SITELIBDIR%%/quixote/form/form.pyo
 %%PYTHON_SITELIBDIR%%/quixote/form/widget.py
 %%PYTHON_SITELIBDIR%%/quixote/form/widget.pyc
 %%PYTHON_SITELIBDIR%%/quixote/form/widget.pyo
-%%PYTHON_SITELIBDIR%%/quixote/form2/__init__.py
-%%PYTHON_SITELIBDIR%%/quixote/form2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/quixote/form2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/quixote/form2/compatibility.py
-%%PYTHON_SITELIBDIR%%/quixote/form2/compatibility.pyc
-%%PYTHON_SITELIBDIR%%/quixote/form2/compatibility.pyo
-%%PYTHON_SITELIBDIR%%/quixote/form2/css.py
-%%PYTHON_SITELIBDIR%%/quixote/form2/css.pyc
-%%PYTHON_SITELIBDIR%%/quixote/form2/css.pyo
-%%PYTHON_SITELIBDIR%%/quixote/form2/form.py
-%%PYTHON_SITELIBDIR%%/quixote/form2/form.pyc
-%%PYTHON_SITELIBDIR%%/quixote/form2/form.pyo
-%%PYTHON_SITELIBDIR%%/quixote/form2/widget.py
-%%PYTHON_SITELIBDIR%%/quixote/form2/widget.pyc
-%%PYTHON_SITELIBDIR%%/quixote/form2/widget.pyo
-%%PYTHON_SITELIBDIR%%/quixote/html.py
-%%PYTHON_SITELIBDIR%%/quixote/html.pyc
-%%PYTHON_SITELIBDIR%%/quixote/html.pyo
+%%PYTHON_SITELIBDIR%%/quixote/form1/__init__.py
+%%PYTHON_SITELIBDIR%%/quixote/form1/__init__.pyc
+%%PYTHON_SITELIBDIR%%/quixote/form1/__init__.pyo
+%%PYTHON_SITELIBDIR%%/quixote/form1/form.py
+%%PYTHON_SITELIBDIR%%/quixote/form1/form.pyc
+%%PYTHON_SITELIBDIR%%/quixote/form1/form.pyo
+%%PYTHON_SITELIBDIR%%/quixote/form1/widget.py
+%%PYTHON_SITELIBDIR%%/quixote/form1/widget.pyc
+%%PYTHON_SITELIBDIR%%/quixote/form1/widget.pyo
+%%PYTHON_SITELIBDIR%%/quixote/html/__init__.py
+%%PYTHON_SITELIBDIR%%/quixote/html/__init__.pyc
+%%PYTHON_SITELIBDIR%%/quixote/html/__init__.pyo
+%%PYTHON_SITELIBDIR%%/quixote/html/_c_htmltext.so
+%%PYTHON_SITELIBDIR%%/quixote/html/_py_htmltext.py
+%%PYTHON_SITELIBDIR%%/quixote/html/_py_htmltext.pyc
+%%PYTHON_SITELIBDIR%%/quixote/html/_py_htmltext.pyo
 %%PYTHON_SITELIBDIR%%/quixote/http_request.py
 %%PYTHON_SITELIBDIR%%/quixote/http_request.pyc
 %%PYTHON_SITELIBDIR%%/quixote/http_request.pyo
 %%PYTHON_SITELIBDIR%%/quixote/http_response.py
 %%PYTHON_SITELIBDIR%%/quixote/http_response.pyc
 %%PYTHON_SITELIBDIR%%/quixote/http_response.pyo
-%%PYTHON_SITELIBDIR%%/quixote/mod_python_handler.py
-%%PYTHON_SITELIBDIR%%/quixote/mod_python_handler.pyc
-%%PYTHON_SITELIBDIR%%/quixote/mod_python_handler.pyo
-%%PYTHON_SITELIBDIR%%/quixote/ptl_compile.py
-%%PYTHON_SITELIBDIR%%/quixote/ptl_compile.pyc
-%%PYTHON_SITELIBDIR%%/quixote/ptl_compile.pyo
-%%PYTHON_SITELIBDIR%%/quixote/ptl_import.py
-%%PYTHON_SITELIBDIR%%/quixote/ptl_import.pyc
-%%PYTHON_SITELIBDIR%%/quixote/ptl_import.pyo
-%%PYTHON_SITELIBDIR%%/quixote/ptlc_dump.py
-%%PYTHON_SITELIBDIR%%/quixote/ptlc_dump.pyc
-%%PYTHON_SITELIBDIR%%/quixote/ptlc_dump.pyo
+%%PYTHON_SITELIBDIR%%/quixote/logger.py
+%%PYTHON_SITELIBDIR%%/quixote/logger.pyc
+%%PYTHON_SITELIBDIR%%/quixote/logger.pyo
+%%PYTHON_SITELIBDIR%%/quixote/ptl/__init__.py
+%%PYTHON_SITELIBDIR%%/quixote/ptl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/quixote/ptl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/quixote/ptl/cimport.so
+%%PYTHON_SITELIBDIR%%/quixote/ptl/install.py
+%%PYTHON_SITELIBDIR%%/quixote/ptl/install.pyc
+%%PYTHON_SITELIBDIR%%/quixote/ptl/install.pyo
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptl_compile.py
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptl_compile.pyc
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptl_compile.pyo
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptl_import.py
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptl_import.pyc
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptl_import.pyo
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptlrun.py
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptlrun.pyc
+%%PYTHON_SITELIBDIR%%/quixote/ptl/ptlrun.pyo
+%%PYTHON_SITELIBDIR%%/quixote/ptl/qx_distutils.py
+%%PYTHON_SITELIBDIR%%/quixote/ptl/qx_distutils.pyc
+%%PYTHON_SITELIBDIR%%/quixote/ptl/qx_distutils.pyo
 %%PYTHON_SITELIBDIR%%/quixote/publish.py
 %%PYTHON_SITELIBDIR%%/quixote/publish.pyc
 %%PYTHON_SITELIBDIR%%/quixote/publish.pyo
-%%PYTHON_SITELIBDIR%%/quixote/qx_distutils.py
-%%PYTHON_SITELIBDIR%%/quixote/qx_distutils.pyc
-%%PYTHON_SITELIBDIR%%/quixote/qx_distutils.pyo
+%%PYTHON_SITELIBDIR%%/quixote/publish1.py
+%%PYTHON_SITELIBDIR%%/quixote/publish1.pyc
+%%PYTHON_SITELIBDIR%%/quixote/publish1.pyo
 %%PYTHON_SITELIBDIR%%/quixote/sendmail.py
 %%PYTHON_SITELIBDIR%%/quixote/sendmail.pyc
 %%PYTHON_SITELIBDIR%%/quixote/sendmail.pyo
 %%PYTHON_SITELIBDIR%%/quixote/server/__init__.py
 %%PYTHON_SITELIBDIR%%/quixote/server/__init__.pyc
 %%PYTHON_SITELIBDIR%%/quixote/server/__init__.pyo
-%%PYTHON_SITELIBDIR%%/quixote/server/medusa_http.py
-%%PYTHON_SITELIBDIR%%/quixote/server/medusa_http.pyc
-%%PYTHON_SITELIBDIR%%/quixote/server/medusa_http.pyo
-%%PYTHON_SITELIBDIR%%/quixote/server/twisted_http.py
-%%PYTHON_SITELIBDIR%%/quixote/server/twisted_http.pyc
-%%PYTHON_SITELIBDIR%%/quixote/server/twisted_http.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/_fcgi.py
+%%PYTHON_SITELIBDIR%%/quixote/server/_fcgi.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/_fcgi.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/cgi_server.py
+%%PYTHON_SITELIBDIR%%/quixote/server/cgi_server.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/cgi_server.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/fastcgi_server.py
+%%PYTHON_SITELIBDIR%%/quixote/server/fastcgi_server.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/fastcgi_server.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/medusa_server.py
+%%PYTHON_SITELIBDIR%%/quixote/server/medusa_server.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/medusa_server.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/mod_python_handler.py
+%%PYTHON_SITELIBDIR%%/quixote/server/mod_python_handler.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/mod_python_handler.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/scgi_server.py
+%%PYTHON_SITELIBDIR%%/quixote/server/scgi_server.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/scgi_server.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/simple_server.py
+%%PYTHON_SITELIBDIR%%/quixote/server/simple_server.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/simple_server.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/twisted_server.py
+%%PYTHON_SITELIBDIR%%/quixote/server/twisted_server.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/twisted_server.pyo
+%%PYTHON_SITELIBDIR%%/quixote/server/util.py
+%%PYTHON_SITELIBDIR%%/quixote/server/util.pyc
+%%PYTHON_SITELIBDIR%%/quixote/server/util.pyo
 %%PYTHON_SITELIBDIR%%/quixote/session.py
 %%PYTHON_SITELIBDIR%%/quixote/session.pyc
 %%PYTHON_SITELIBDIR%%/quixote/session.pyo
-%%PYTHON_SITELIBDIR%%/quixote/upload.py
-%%PYTHON_SITELIBDIR%%/quixote/upload.pyc
-%%PYTHON_SITELIBDIR%%/quixote/upload.pyo
 %%PYTHON_SITELIBDIR%%/quixote/util.py
 %%PYTHON_SITELIBDIR%%/quixote/util.pyc
 %%PYTHON_SITELIBDIR%%/quixote/util.pyo
 %%PORTDOCS%%%%DOCSDIR%%/ACKS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/PTL.html
 %%PORTDOCS%%%%DOCSDIR%%/PTL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/ZPL.txt
 %%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/demo.html
 %%PORTDOCS%%%%DOCSDIR%%/demo.txt
-%%PORTDOCS%%%%DOCSDIR%%/form2conversion.html
 %%PORTDOCS%%%%DOCSDIR%%/form2conversion.txt
-%%PORTDOCS%%%%DOCSDIR%%/multi-threaded.html
 %%PORTDOCS%%%%DOCSDIR%%/multi-threaded.txt
-%%PORTDOCS%%%%DOCSDIR%%/programming.html
 %%PORTDOCS%%%%DOCSDIR%%/programming.txt
-%%PORTDOCS%%%%DOCSDIR%%/session-mgmt.html
 %%PORTDOCS%%%%DOCSDIR%%/session-mgmt.txt
-%%PORTDOCS%%%%DOCSDIR%%/static-files.html
 %%PORTDOCS%%%%DOCSDIR%%/static-files.txt
-%%PORTDOCS%%%%DOCSDIR%%/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/upgrading.txt
-%%PORTDOCS%%%%DOCSDIR%%/upload.html
-%%PORTDOCS%%%%DOCSDIR%%/upload.txt
-%%PORTDOCS%%%%DOCSDIR%%/web-server.html
 %%PORTDOCS%%%%DOCSDIR%%/web-server.txt
-%%PORTDOCS%%%%DOCSDIR%%/web-services.html
 %%PORTDOCS%%%%DOCSDIR%%/web-services.txt
-%%PORTDOCS%%%%DOCSDIR%%/widgets.html
 %%PORTDOCS%%%%DOCSDIR%%/widgets.txt
-%%EXAMPLESDIR%%/demo.cgi
-%%EXAMPLESDIR%%/demo.conf
-%%EXAMPLESDIR%%/session_demo.cgi
-%%EXAMPLESDIR%%/upload.cgi
-@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/win32.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/quixote/server
-@dirrm %%PYTHON_SITELIBDIR%%/quixote/form2
+@dirrm %%PYTHON_SITELIBDIR%%/quixote/ptl
+@dirrm %%PYTHON_SITELIBDIR%%/quixote/html
+@dirrm %%PYTHON_SITELIBDIR%%/quixote/form1
 @dirrm %%PYTHON_SITELIBDIR%%/quixote/form
 @dirrm %%PYTHON_SITELIBDIR%%/quixote/demo
 @dirrm %%PYTHON_SITELIBDIR%%/quixote
diff --git a/www/quixote/scripts/compile_ptl.py b/www/quixote/scripts/compile_ptl.py
index 51fec73ddec0..9a1d4cbff888 100644
--- a/www/quixote/scripts/compile_ptl.py
+++ b/www/quixote/scripts/compile_ptl.py
@@ -1,5 +1,5 @@
 import sys
-from quixote import ptl_compile
+from quixote.ptl import ptl_compile
 
 for srcfile in sys.argv[1:]:
   ptl_compile.compile(srcfile, srcfile + 'c')