diff -Nru py-mwlib.orig/Makefile py-mwlib/Makefile
--- py-mwlib.orig/Makefile	2017-12-21 01:35:04.331508000 +1030
+++ py-mwlib/Makefile	2017-12-20 17:09:56.068292000 +1030
@@ -15,7 +15,6 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
diff -Nru seahub.orig/Makefile seahub/Makefile
--- seahub.orig/Makefile	2017-12-21 01:35:30.072922000 +1030
+++ seahub/Makefile	2017-12-20 17:14:10.026522000 +1030
@@ -23,7 +23,6 @@
 		${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-constance>=0:www/py-django-constance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
diff -Nru tilecache.orig/Makefile tilecache/Makefile
--- tilecache.orig/Makefile	2017-12-21 01:35:48.086804000 +1030
+++ tilecache/Makefile	2017-12-20 15:08:21.143730000 +1030
@@ -10,12 +10,12 @@
 MAINTAINER=	joris.dedieu@gmail.com
 COMMENT=	Python-based WMS-C/TMS server
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR}
-
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR}
+
 USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils autoplist
 SHEBANG_FILES=	tilecache.cgi tilecache.fcgi
diff -Nru py-pastescript.orig/Makefile py-pastescript/Makefile
--- py-pastescript.orig/Makefile	2017-12-21 02:26:18.894641000 +1030
+++ py-pastescript/Makefile	2017-12-21 02:25:55.422898000 +1030
@@ -14,7 +14,7 @@
 LICENSE_FILE=	${WRKSRC}/docs/license.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flup6>=0:www/py-flup6@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Paste>=1.3:www/py-paste@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=0:www/py-pastedeploy@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
diff -Nru py-django-devel.orig/Makefile py-django-devel/Makefile
--- py-django-devel.orig/Makefile	2017-12-21 01:41:16.282772000 +1030
+++ py-django-devel/Makefile	2017-12-21 01:40:54.103508000 +1030
@@ -46,7 +46,7 @@
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff -Nru py-django18.orig/Makefile py-django18/Makefile
--- py-django18.orig/Makefile	2017-12-21 02:05:53.909559000 +1030
+++ py-django18/Makefile	2017-12-21 02:05:49.204955000 +1030
@@ -49,7 +49,7 @@
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
+FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff -Nru py-django110.orig/Makefile py-django110/Makefile
--- py-django110.orig/Makefile	2017-12-21 02:07:21.535729000 +1030
+++ py-django110/Makefile	2017-12-21 02:07:06.416788000 +1030
@@ -31,7 +31,7 @@
 DOCSDIR=	${PREFIX}/share/doc/py-django
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
+OPTIONS_DEFINE=		DOCS HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
 
 OPTIONS_GROUP=		DATABASE
@@ -46,7 +46,6 @@
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff -Nru py-django111.orig/Makefile py-django111/Makefile
--- py-django111.orig/Makefile	2017-12-21 02:08:52.350049000 +1030
+++ py-django111/Makefile	2017-12-21 02:08:43.442461000 +1030
@@ -33,7 +33,7 @@
 DOCSDIR=	${PREFIX}/share/doc/py-django
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
+OPTIONS_DEFINE=		DOCS HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
 
 OPTIONS_GROUP=		DATABASE
@@ -48,7 +48,6 @@
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff -Nru py-django20.orig/Makefile py-django20/Makefile
--- py-django20.orig/Makefile	2017-12-21 02:09:44.064058000 +1030
+++ py-django20/Makefile	2017-12-21 02:09:34.004057000 +1030
@@ -32,7 +32,7 @@
 DOCSDIR=		${PREFIX}/share/doc/py-django
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS FASTCGI HTMLDOCS
+OPTIONS_DEFINE=		DOCS HTMLDOCS
 OPTIONS_DEFAULT=	SQLITE
 
 OPTIONS_GROUP=		DATABASE
@@ -47,7 +47,6 @@
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-FASTCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
 
 post-build-HTMLDOCS-on:
 	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}