4 files changed, 145 insertions, 150 deletions

diff --git a/www/quixote/Makefile b/www/quixote/Makefile
index 2bd2802bd5e6..7562648c46b7 100644
--- a/www/quixote/Makefile
+++ b/www/quixote/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quixote
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.1
 CATEGORIES=	www python
 MASTER_SITES=	http://www.mems-exchange.org/software/files/quixote/
 DISTNAME=	Quixote-${PORTVERSION}
@@ -14,9 +14,7 @@ DISTNAME=	Quixote-${PORTVERSION}
 MAINTAINER=	wjv@FreeBSD.org
 COMMENT=	A framework for developing web applications in Python
 
-BUILD_DEPENDS=	${PYDISTUTILS}
-
-USE_PYTHON=	yes
+USE_PYTHON=	2.0+
 USE_PYDISTUTILS=	yes
 
 .include <bsd.port.pre.mk>
@@ -25,17 +23,14 @@ USE_PYDISTUTILS=	yes
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/compiler/__init__.py:${PORTSDIR}/lang/py-compiler
 .endif
 
-pre-install:
-	@ ${SH} ${PKGREQ} INSTALL
-
 post-install:
 	@ PYTHONPATH=${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 	  ${PYTHON_CMD} ${SCRIPTDIR}/compile_ptl.py \
-	  ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/${PORTNAME}/demo/*.ptl \
-	  ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/${PORTNAME}/form/*.ptl
+	  ${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}
 .for docfile in ACKS CHANGES LICENSE README TODO doc/*
diff --git a/www/quixote/distinfo b/www/quixote/distinfo
index 240faf745837..7030b8651966 100644
--- a/www/quixote/distinfo
+++ b/www/quixote/distinfo
@@ -1,2 +1,2 @@
-MD5 (Quixote-0.5.1.tar.gz) = 1d3070f1ff86487ba038f76a089908a0
-SIZE (Quixote-0.5.1.tar.gz) = 158768
+MD5 (Quixote-0.6.1.tar.gz) = 62cfa130749f5f099d9497c23a0f8fca
+SIZE (Quixote-0.6.1.tar.gz) = 194802
diff --git a/www/quixote/pkg-plist b/www/quixote/pkg-plist
index b06eeae9b93b..7b2f2f58cff3 100644
--- a/www/quixote/pkg-plist
+++ b/www/quixote/pkg-plist
@@ -1,122 +1,139 @@
-%%PORTDOCS%%share/doc/quixote/ACKS
-%%PORTDOCS%%share/doc/quixote/CHANGES
-%%PORTDOCS%%share/doc/quixote/LICENSE
-%%PORTDOCS%%share/doc/quixote/PTL.html
-%%PORTDOCS%%share/doc/quixote/PTL.txt
-%%PORTDOCS%%share/doc/quixote/README
-%%PORTDOCS%%share/doc/quixote/TODO
-%%PORTDOCS%%share/doc/quixote/ZPL.txt
-%%PORTDOCS%%share/doc/quixote/demo.html
-%%PORTDOCS%%share/doc/quixote/demo.txt
-%%PORTDOCS%%share/doc/quixote/programming.html
-%%PORTDOCS%%share/doc/quixote/programming.txt
-%%PORTDOCS%%share/doc/quixote/session-mgmt.html
-%%PORTDOCS%%share/doc/quixote/session-mgmt.txt
-%%PORTDOCS%%share/doc/quixote/session-upgrade.html
-%%PORTDOCS%%share/doc/quixote/session-upgrade.txt
-%%PORTDOCS%%share/doc/quixote/upload.html
-%%PORTDOCS%%share/doc/quixote/upload.txt
-%%PORTDOCS%%share/doc/quixote/web-server.html
-%%PORTDOCS%%share/doc/quixote/web-server.txt
-%%PORTDOCS%%share/doc/quixote/web-services.html
-%%PORTDOCS%%share/doc/quixote/web-services.txt
-%%PORTDOCS%%share/doc/quixote/widgets.html
-%%PORTDOCS%%share/doc/quixote/widgets.txt
-lib/%%PYTHON_VERSION%%/site-packages/quixote/TemplateIO.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/TemplateIO.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/TemplateIO.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/config.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/config.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/config.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/demo_scgi.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/demo_scgi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/demo_scgi.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/forms.ptl
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/forms.ptlc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/integer_ui.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/integer_ui.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/integer_ui.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/pages.ptl
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/pages.ptlc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/session.ptl
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/session.ptlc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/widgets.ptl
-lib/%%PYTHON_VERSION%%/site-packages/quixote/demo/widgets.ptlc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/errors.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/errors.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/errors.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/fcgi.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/fcgi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/fcgi.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/form.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/form.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/form.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/form_templates.ptl
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/form_templates.ptlc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/widget.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/widget.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/form/widget.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/html.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/html.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/html.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/http_request.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/http_request.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/http_request.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/http_response.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/http_response.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/http_response.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/mod_python_handler.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/mod_python_handler.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/mod_python_handler.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptl_compile.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptl_compile.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptl_compile.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptl_import.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptl_import.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptl_import.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptlc_dump.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptlc_dump.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/ptlc_dump.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/publish.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/publish.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/publish.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/qx_distutils.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/qx_distutils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/qx_distutils.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/sendmail.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/sendmail.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/sendmail.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/server/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/server/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/server/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/server/medusa_http.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/server/medusa_http.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/server/medusa_http.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/session.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/session.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/session.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/upload.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/upload.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/upload.pyo
-lib/%%PYTHON_VERSION%%/site-packages/quixote/util.py
-lib/%%PYTHON_VERSION%%/site-packages/quixote/util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/quixote/util.pyo
-share/examples/quixote/demo.cgi
-share/examples/quixote/demo.conf
-share/examples/quixote/session_demo.cgi
-share/examples/quixote/upload.cgi
-@dirrm share/examples/quixote
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/quixote/server
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/quixote/form
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/quixote/demo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/quixote
-%%PORTDOCS%%@dirrm share/doc/quixote
+%%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/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/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/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/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/html.py
+%%PYTHON_SITELIBDIR%%/quixote/html.pyc
+%%PYTHON_SITELIBDIR%%/quixote/html.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/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/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/session.py
+%%PYTHON_SITELIBDIR%%/quixote/session.pyc
+%%PYTHON_SITELIBDIR%%/quixote/session.pyo
+%%PYTHON_SITELIBDIR%%/quixote/t.ptl
+%%PYTHON_SITELIBDIR%%/quixote/t.py
+%%PYTHON_SITELIBDIR%%/quixote/t.pyc
+%%PYTHON_SITELIBDIR%%/quixote/t.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%%/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%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/quixote/server
+@dirrm %%PYTHON_SITELIBDIR%%/quixote/form
+@dirrm %%PYTHON_SITELIBDIR%%/quixote/demo
+@dirrm %%PYTHON_SITELIBDIR%%/quixote
diff --git a/www/quixote/pkg-req b/www/quixote/pkg-req
deleted file mode 100644
index 908302bf927c..000000000000
--- a/www/quixote/pkg-req
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/usr/local/bin
-
-if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
-  PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.0" and 1'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
-    exit 0
-  else
-    echo "-----------------------------------------------------------"
-    echo "Quixote requires Python version 2.0 or greater -"
-    echo "  please update your Python installation before proceeding."
-    echo "-----------------------------------------------------------"
-    exit 1
-  fi
-fi