3 files changed, 47 insertions, 54 deletions

diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile
index 2576872da492..d44dd43fb0a2 100644
--- a/www/py-qp/Makefile
+++ b/www/py-qp/Makefile
@@ -6,44 +6,34 @@
 #
 
 PORTNAME=	qp
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	www python
-MASTER_SITES=	http://www.mems-exchange.org/software/qp/ \
-		${MASTER_SITE_LOCAL} \
-		http://dryice.name/computer/FreeBSD/distfiles/
+MASTER_SITES=	http://www.mems-exchange.org/software/qp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	A python web framework to use qpy and durus together
 
-BUILD_DEPENDS+=	qpcheck.py:${PORTSDIR}/www/py-qpy
-BUILD_DEPENDS+=	durus:${PORTSDIR}/devel/py-durus
-BUILD_DEPENDS+=	pythoni:${PORTSDIR}/devel/py-repl
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}durus>=0:${PORTSDIR}/devel/py-durus \
+		${PYTHON_PKGNAMEPREFIX}qpy>=1.7:${PORTSDIR}/www/py-qpy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}durus>=0:${PORTSDIR}/devel/py-durus \
+		${PYTHON_PKGNAMEPREFIX}qpy>=1.7:${PORTSDIR}/www/py-qpy
 
-BROKEN=		does not build
-
-USE_PYTHON=	2.5+
+MAKE_ENV=	USE_DISTUTILS=yes
+USE_PYTHON=	2.5-2.7
 USE_PYDISTUTILS=	yes
-SUB_FILES+=	pkg-message
-SUB_LIST+=	PYTHON_VERSION=${PYTHON_VERSION}
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
 
 post-install:
-	@ PYTHONPATH=${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
-	  ${PYTHON_CMD} -c "import qp.fill"; \
-     	  cd ${WRKSRC}; \
-	  ${PYTHON_CMD} setup.py install_demo_sites ${EXAMPLESDIR}
-
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-.for docfile in CHANGES.txt LICENSE.txt README.txt
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${DOCSDIR}/
+	@cd ${WRKSRC} && \
+		${INSTALL_DATA} CHANGES.txt LICENSE.txt README.txt ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} install_demo_sites ${EXAMPLESDIR}
 .endif
-
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-qp/distinfo b/www/py-qp/distinfo
index b260cbd59600..de14e50ca696 100644
--- a/www/py-qp/distinfo
+++ b/www/py-qp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qp-2.0.tar.gz) = 1117d3b3c222ff41b1b57df01e8381f6bf518b83abddabf0c3700c9e2c733b2b
-SIZE (qp-2.0.tar.gz) = 95785
+SHA256 (qp-2.2.tar.gz) = a51d1a67efc57e39bfd10335da0185c8f13a7064bd1c9931bd4dab93c4139ce3
+SIZE (qp-2.2.tar.gz) = 101293
diff --git a/www/py-qp/pkg-plist b/www/py-qp/pkg-plist
index f51d9b968d0f..1711ce4c9bb2 100644
--- a/www/py-qp/pkg-plist
+++ b/www/py-qp/pkg-plist
@@ -3,12 +3,14 @@ bin/qpcensus.py
 %%PYTHON_SITELIBDIR%%/qp/__init__.py
 %%PYTHON_SITELIBDIR%%/qp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/qp/__init__.pyo
+%%PYTHON_SITELIBDIR%%/qp/__main__.py
+%%PYTHON_SITELIBDIR%%/qp/__main__.pyc
+%%PYTHON_SITELIBDIR%%/qp/__main__.pyo
 %%PYTHON_SITELIBDIR%%/qp/fill/__init__.py
 %%PYTHON_SITELIBDIR%%/qp/fill/__init__.pyc
 %%PYTHON_SITELIBDIR%%/qp/fill/__init__.pyo
-%%PYTHON_SITELIBDIR%%/qp/fill/css.py
 %%PYTHON_SITELIBDIR%%/qp/fill/css.pyc
-%%PYTHON_SITELIBDIR%%/qp/fill/css.pyo
+%%PYTHON_SITELIBDIR%%/qp/fill/css.qpy
 %%PYTHON_SITELIBDIR%%/qp/fill/directory.py
 %%PYTHON_SITELIBDIR%%/qp/fill/directory.pyc
 %%PYTHON_SITELIBDIR%%/qp/fill/directory.pyo
@@ -104,29 +106,6 @@ bin/qpcensus.py
 %%PYTHON_SITELIBDIR%%/qp/setup.py
 %%PYTHON_SITELIBDIR%%/qp/setup.pyc
 %%PYTHON_SITELIBDIR%%/qp/setup.pyo
-%%EXAMPLESDIR%%/__init__.py
-%%EXAMPLESDIR%%/echo/slash.qpy
-%%EXAMPLESDIR%%/echo/__init__.py
-%%EXAMPLESDIR%%/echo/var/here.txt
-%%EXAMPLESDIR%%/hello/slash.py
-%%EXAMPLESDIR%%/hello/__init__.py
-%%EXAMPLESDIR%%/hello/var/here.txt
-%%EXAMPLESDIR%%/proto/forms.qpy
-%%EXAMPLESDIR%%/proto/qwiki.qpy
-%%EXAMPLESDIR%%/proto/slash.qpy
-%%EXAMPLESDIR%%/proto/__init__.py
-%%EXAMPLESDIR%%/proto/static/all.css
-%%EXAMPLESDIR%%/proto/static/favicon.png
-%%EXAMPLESDIR%%/proto/static/proto.js
-%%EXAMPLESDIR%%/proto/var/here.txt
-@dirrm %%EXAMPLESDIR%%/echo/var
-@dirrm %%EXAMPLESDIR%%/echo
-@dirrm %%EXAMPLESDIR%%/hello/var
-@dirrm %%EXAMPLESDIR%%/hello
-@dirrm %%EXAMPLESDIR%%/proto/static
-@dirrm %%EXAMPLESDIR%%/proto/var
-@dirrm %%EXAMPLESDIR%%/proto
-@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/qp/pub
 @dirrm %%PYTHON_SITELIBDIR%%/qp/mail
 @dirrm %%PYTHON_SITELIBDIR%%/qp/lib
@@ -139,3 +118,27 @@ bin/qpcensus.py
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/slash.qpy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo/var/here.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello/slash.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello/var/here.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/forms.qpy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/qwiki.qpy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/slash.qpy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/static/all.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/static/favicon.ico
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/static/favicon.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/static/proto.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proto/var/here.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/echo/var
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/echo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/hello/var
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/hello
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/proto/static
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/proto/var
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/proto
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%