88 files changed, 313 insertions, 281 deletions

diff --git a/MOVED b/MOVED
index a9c904b761fb..1dc18b2b00f1 100644
--- a/MOVED
+++ b/MOVED
@@ -15740,3 +15740,31 @@ devel/py-semantic_version|devel/py-semantic-version|2020-12-05|Rename to match u
 devel/py-wsgi_intercept|devel/py-wsgi-intercept|2020-12-05|Rename to match upstream naming
 net/py-ndg_httpsclient|net/py-ndg-httpsclient|2020-12-05|Rename to match upstream naming
 www/py-draftjs_exporter|www/py-draftjs-exporter|2020-12-05|Rename to match upstream naming
+devel/py-XStatic|devel/py-xstatic|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Angular|devel/py-xstatic-angular|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Angular-Bootstrap|devel/py-xstatic-angular-bootstrap|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Angular-FileUpload|devel/py-xstatic-angular-fileupload|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Angular-Gettext|devel/py-xstatic-angular-gettext|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Angular-Schema-Form|devel/py-xstatic-angular-schema-form|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Angular-lrdragndrop|devel/py-xstatic-angular-lrdragndrop|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Bootstrap-Datepicker|devel/py-xstatic-bootstrap-datepicker|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Bootstrap-SCSS|devel/py-xstatic-bootstrap-scss|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-D3|devel/py-xstatic-d3|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Font-Awesome|devel/py-xstatic-font-awesome|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Hogan|devel/py-xstatic-hogan|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-JQuery-Migrate|devel/py-xstatic-jquery-migrate|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-JQuery.TableSorter|devel/py-xstatic-jquery.tablesorter|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-JQuery.quicksearch|devel/py-xstatic-jquery.quicksearch|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-JSEncrypt|devel/py-xstatic-jsencrypt|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Jasmine|devel/py-xstatic-jasmine|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Rickshaw|devel/py-xstatic-rickshaw|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-Spin|devel/py-xstatic-spin|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-bootswatch|devel/py-xstatic-bootswatch|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-jQuery|devel/py-xstatic-jquery|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-jquery-ui|devel/py-xstatic-jquery-ui|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-mdi|devel/py-xstatic-mdi|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-objectpath|devel/py-xstatic-objectpath|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-roboto-fontface|devel/py-xstatic-roboto-fontface|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-smart-table|devel/py-xstatic-smart-table|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-term.js|devel/py-xstatic-term.js|2020-12-05|Use lowercase PORTNAME and path
+devel/py-XStatic-tv4|devel/py-xstatic-tv4|2020-12-05|Use lowercase PORTNAME and path
diff --git a/devel/Makefile b/devel/Makefile
index 278c364486f1..43eca8b73473 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4013,34 +4013,6 @@
     SUBDIR += py-QtPy
     SUBDIR += py-RPyC
     SUBDIR += py-SymbolType
-    SUBDIR += py-XStatic
-    SUBDIR += py-XStatic-Angular
-    SUBDIR += py-XStatic-Angular-Bootstrap
-    SUBDIR += py-XStatic-Angular-FileUpload
-    SUBDIR += py-XStatic-Angular-Gettext
-    SUBDIR += py-XStatic-Angular-Schema-Form
-    SUBDIR += py-XStatic-Angular-lrdragndrop
-    SUBDIR += py-XStatic-Bootstrap-Datepicker
-    SUBDIR += py-XStatic-Bootstrap-SCSS
-    SUBDIR += py-XStatic-D3
-    SUBDIR += py-XStatic-Font-Awesome
-    SUBDIR += py-XStatic-Hogan
-    SUBDIR += py-XStatic-JQuery-Migrate
-    SUBDIR += py-XStatic-JQuery.TableSorter
-    SUBDIR += py-XStatic-JQuery.quicksearch
-    SUBDIR += py-XStatic-JSEncrypt
-    SUBDIR += py-XStatic-Jasmine
-    SUBDIR += py-XStatic-Rickshaw
-    SUBDIR += py-XStatic-Spin
-    SUBDIR += py-XStatic-bootswatch
-    SUBDIR += py-XStatic-jQuery
-    SUBDIR += py-XStatic-jquery-ui
-    SUBDIR += py-XStatic-mdi
-    SUBDIR += py-XStatic-objectpath
-    SUBDIR += py-XStatic-roboto-fontface
-    SUBDIR += py-XStatic-smart-table
-    SUBDIR += py-XStatic-term.js
-    SUBDIR += py-XStatic-tv4
     SUBDIR += py-ZopeUndo
     SUBDIR += py-absl
     SUBDIR += py-absl-py
@@ -5230,6 +5202,34 @@
     SUBDIR += py-xdis
     SUBDIR += py-xerox
     SUBDIR += py-xmltodict
+    SUBDIR += py-xstatic
+    SUBDIR += py-xstatic-angular
+    SUBDIR += py-xstatic-angular-bootstrap
+    SUBDIR += py-xstatic-angular-fileupload
+    SUBDIR += py-xstatic-angular-gettext
+    SUBDIR += py-xstatic-angular-lrdragndrop
+    SUBDIR += py-xstatic-angular-schema-form
+    SUBDIR += py-xstatic-bootstrap-datepicker
+    SUBDIR += py-xstatic-bootstrap-scss
+    SUBDIR += py-xstatic-bootswatch
+    SUBDIR += py-xstatic-d3
+    SUBDIR += py-xstatic-font-awesome
+    SUBDIR += py-xstatic-hogan
+    SUBDIR += py-xstatic-jasmine
+    SUBDIR += py-xstatic-jquery
+    SUBDIR += py-xstatic-jquery-migrate
+    SUBDIR += py-xstatic-jquery-ui
+    SUBDIR += py-xstatic-jquery.quicksearch
+    SUBDIR += py-xstatic-jquery.tablesorter
+    SUBDIR += py-xstatic-jsencrypt
+    SUBDIR += py-xstatic-mdi
+    SUBDIR += py-xstatic-objectpath
+    SUBDIR += py-xstatic-rickshaw
+    SUBDIR += py-xstatic-roboto-fontface
+    SUBDIR += py-xstatic-smart-table
+    SUBDIR += py-xstatic-spin
+    SUBDIR += py-xstatic-term.js
+    SUBDIR += py-xstatic-tv4
     SUBDIR += py-xxhash
     SUBDIR += py-yaml
     SUBDIR += py-yamllint
diff --git a/devel/py-XStatic-Rickshaw/Makefile b/devel/py-XStatic-Rickshaw/Makefile
deleted file mode 100644
index 588cb8871f2e..000000000000
--- a/devel/py-XStatic-Rickshaw/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
-# $FreeBSD$
-
-PORTNAME=	XStatic-Rickshaw
-PORTVERSION=	1.5.0.0
-PORTREVISION=	1
-CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Rickshaw 1.5.0 (xstatic packaging standard)
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
-
-USES=		python
-USE_PYTHON=	autoplist distutils
-
-.include <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular-Bootstrap/Makefile b/devel/py-xstatic-angular-bootstrap/Makefile
index 54f84cd03187..498317d54c61 100644
--- a/devel/py-XStatic-Angular-Bootstrap/Makefile
+++ b/devel/py-xstatic-angular-bootstrap/Makefile
@@ -1,21 +1,23 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Angular-Bootstrap
+PORTNAME=	xstatic-angular-bootstrap
 PORTVERSION=	2.2.0.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Angular-Bootstrap-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bootstrap widgets for Angular (angular-bootstrap)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
diff --git a/devel/py-XStatic-Angular-Bootstrap/distinfo b/devel/py-xstatic-angular-bootstrap/distinfo
index a63997958507..a63997958507 100644
--- a/devel/py-XStatic-Angular-Bootstrap/distinfo
+++ b/devel/py-xstatic-angular-bootstrap/distinfo
diff --git a/devel/py-XStatic-Angular-Bootstrap/pkg-descr b/devel/py-xstatic-angular-bootstrap/pkg-descr
index 2ef6a87d2f7b..2ef6a87d2f7b 100644
--- a/devel/py-XStatic-Angular-Bootstrap/pkg-descr
+++ b/devel/py-xstatic-angular-bootstrap/pkg-descr
diff --git a/devel/py-XStatic-Angular-FileUpload/Makefile b/devel/py-xstatic-angular-fileupload/Makefile
index 3926495bd548..95ad310ceffc 100644
--- a/devel/py-XStatic-Angular-FileUpload/Makefile
+++ b/devel/py-xstatic-angular-fileupload/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Angular-FileUpload
+PORTNAME=	xstatic-angular-fileupload
 PORTVERSION=	12.0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Angular-FileUpload-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	File Upload module for the AngularJS (angular-file-upload)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular-FileUpload/distinfo b/devel/py-xstatic-angular-fileupload/distinfo
index 14a9a0fd00ee..14a9a0fd00ee 100644
--- a/devel/py-XStatic-Angular-FileUpload/distinfo
+++ b/devel/py-xstatic-angular-fileupload/distinfo
diff --git a/devel/py-XStatic-Angular-FileUpload/pkg-descr b/devel/py-xstatic-angular-fileupload/pkg-descr
index e29d7dd10987..e29d7dd10987 100644
--- a/devel/py-XStatic-Angular-FileUpload/pkg-descr
+++ b/devel/py-xstatic-angular-fileupload/pkg-descr
diff --git a/devel/py-XStatic-Angular-Gettext/Makefile b/devel/py-xstatic-angular-gettext/Makefile
index 8c0dd1d587d3..fcbd713ff8df 100644
--- a/devel/py-XStatic-Angular-Gettext/Makefile
+++ b/devel/py-xstatic-angular-gettext/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Angular-Gettext
+PORTNAME=	xstatic-angular-gettext
 PORTVERSION=	2.3.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Angular-Gettext-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Gettext support for Angular.js (angular-gettext)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular-Gettext/distinfo b/devel/py-xstatic-angular-gettext/distinfo
index 9b659d38d9f8..9b659d38d9f8 100644
--- a/devel/py-XStatic-Angular-Gettext/distinfo
+++ b/devel/py-xstatic-angular-gettext/distinfo
diff --git a/devel/py-XStatic-Angular-Gettext/pkg-descr b/devel/py-xstatic-angular-gettext/pkg-descr
index 91bbf408ecc0..91bbf408ecc0 100644
--- a/devel/py-XStatic-Angular-Gettext/pkg-descr
+++ b/devel/py-xstatic-angular-gettext/pkg-descr
diff --git a/devel/py-XStatic-Angular-lrdragndrop/Makefile b/devel/py-xstatic-angular-lrdragndrop/Makefile
index 943d6e2d5dc8..d7123c1f4d68 100644
--- a/devel/py-XStatic-Angular-lrdragndrop/Makefile
+++ b/devel/py-xstatic-angular-lrdragndrop/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Angular-lrdragndrop
+PORTNAME=	xstatic-angular-lrdragndrop
 PORTVERSION=	1.0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Angular-lrdragndrop-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	HTML5 Drag and Drop AngularJS module (angular-dragndrop)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular-lrdragndrop/distinfo b/devel/py-xstatic-angular-lrdragndrop/distinfo
index 33fb12503b56..33fb12503b56 100644
--- a/devel/py-XStatic-Angular-lrdragndrop/distinfo
+++ b/devel/py-xstatic-angular-lrdragndrop/distinfo
diff --git a/devel/py-XStatic-Angular-lrdragndrop/pkg-descr b/devel/py-xstatic-angular-lrdragndrop/pkg-descr
index 5cd303cb91fa..5cd303cb91fa 100644
--- a/devel/py-XStatic-Angular-lrdragndrop/pkg-descr
+++ b/devel/py-xstatic-angular-lrdragndrop/pkg-descr
diff --git a/devel/py-XStatic-Angular-Schema-Form/Makefile b/devel/py-xstatic-angular-schema-form/Makefile
index e39df3dbd22f..b83a507bd2c2 100644
--- a/devel/py-XStatic-Angular-Schema-Form/Makefile
+++ b/devel/py-xstatic-angular-schema-form/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Angular-Schema-Form
+PORTNAME=	xstatic-angular-schema-form
 PORTVERSION=	0.8.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Angular-Schema-Form-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Forms from a JSON schema (angular-schema-form)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular-Schema-Form/distinfo b/devel/py-xstatic-angular-schema-form/distinfo
index 898850c1edfb..898850c1edfb 100644
--- a/devel/py-XStatic-Angular-Schema-Form/distinfo
+++ b/devel/py-xstatic-angular-schema-form/distinfo
diff --git a/devel/py-XStatic-Angular-Schema-Form/pkg-descr b/devel/py-xstatic-angular-schema-form/pkg-descr
index 409dc4eb67fc..409dc4eb67fc 100644
--- a/devel/py-XStatic-Angular-Schema-Form/pkg-descr
+++ b/devel/py-xstatic-angular-schema-form/pkg-descr
diff --git a/devel/py-XStatic-Angular/Makefile b/devel/py-xstatic-angular/Makefile
index 11b5d1cbd71e..fdd117ce4f53 100644
--- a/devel/py-XStatic-Angular/Makefile
+++ b/devel/py-xstatic-angular/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Angular
+PORTNAME=	xstatic-angular
 PORTVERSION=	1.5.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Angular-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JavaScript MVW Framework (angular)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular/distinfo b/devel/py-xstatic-angular/distinfo
index 9371b547195c..9371b547195c 100644
--- a/devel/py-XStatic-Angular/distinfo
+++ b/devel/py-xstatic-angular/distinfo
diff --git a/devel/py-XStatic-Angular/pkg-descr b/devel/py-xstatic-angular/pkg-descr
index 3100f5bbb68c..3100f5bbb68c 100644
--- a/devel/py-XStatic-Angular/pkg-descr
+++ b/devel/py-xstatic-angular/pkg-descr
diff --git a/devel/py-XStatic-Bootstrap-Datepicker/Makefile b/devel/py-xstatic-bootstrap-datepicker/Makefile
index 1b561d8aaf4e..ca989cd4adfd 100644
--- a/devel/py-XStatic-Bootstrap-Datepicker/Makefile
+++ b/devel/py-xstatic-bootstrap-datepicker/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Bootstrap-Datepicker
+PORTNAME=	xstatic-bootstrap-datepicker
 PORTVERSION=	1.3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Bootstrap-Datepicker-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Datepicker for Bootstrap (bootstrap-datepicker)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Bootstrap-Datepicker/distinfo b/devel/py-xstatic-bootstrap-datepicker/distinfo
index 8c6f138432ec..8c6f138432ec 100644
--- a/devel/py-XStatic-Bootstrap-Datepicker/distinfo
+++ b/devel/py-xstatic-bootstrap-datepicker/distinfo
diff --git a/devel/py-XStatic-Bootstrap-Datepicker/pkg-descr b/devel/py-xstatic-bootstrap-datepicker/pkg-descr
index 6fc5c25838d6..6fc5c25838d6 100644
--- a/devel/py-XStatic-Bootstrap-Datepicker/pkg-descr
+++ b/devel/py-xstatic-bootstrap-datepicker/pkg-descr
diff --git a/devel/py-XStatic-Bootstrap-SCSS/Makefile b/devel/py-xstatic-bootstrap-scss/Makefile
index e2c5578e2daa..e0b2be640154 100644
--- a/devel/py-XStatic-Bootstrap-SCSS/Makefile
+++ b/devel/py-xstatic-bootstrap-scss/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Bootstrap-SCSS
+PORTNAME=	xstatic-bootstrap-scss
 PORTVERSION=	3.3.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Bootstrap-SCSS-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bootstrap SCSS stylesheets (bootstrap-scss)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Bootstrap-SCSS/distinfo b/devel/py-xstatic-bootstrap-scss/distinfo
index 3554182999ff..3554182999ff 100644
--- a/devel/py-XStatic-Bootstrap-SCSS/distinfo
+++ b/devel/py-xstatic-bootstrap-scss/distinfo
diff --git a/devel/py-XStatic-Bootstrap-SCSS/pkg-descr b/devel/py-xstatic-bootstrap-scss/pkg-descr
index 219218874ee3..219218874ee3 100644
--- a/devel/py-XStatic-Bootstrap-SCSS/pkg-descr
+++ b/devel/py-xstatic-bootstrap-scss/pkg-descr
diff --git a/devel/py-XStatic-bootswatch/Makefile b/devel/py-xstatic-bootswatch/Makefile
index 45cfed18688d..25828794f078 100644
--- a/devel/py-XStatic-bootswatch/Makefile
+++ b/devel/py-xstatic-bootswatch/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-bootswatch
+PORTNAME=	xstatic-bootswatch
 PORTVERSION=	3.3.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-bootswatch-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Collection of themes for Bootstrap (bootswatch)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-bootswatch/distinfo b/devel/py-xstatic-bootswatch/distinfo
index ad1efbfbc260..ad1efbfbc260 100644
--- a/devel/py-XStatic-bootswatch/distinfo
+++ b/devel/py-xstatic-bootswatch/distinfo
diff --git a/devel/py-XStatic-bootswatch/pkg-descr b/devel/py-xstatic-bootswatch/pkg-descr
index f9739d830c56..f9739d830c56 100644
--- a/devel/py-XStatic-bootswatch/pkg-descr
+++ b/devel/py-xstatic-bootswatch/pkg-descr
diff --git a/devel/py-XStatic-D3/Makefile b/devel/py-xstatic-d3/Makefile
index 660833eaf2b5..d6f16147a342 100644
--- a/devel/py-XStatic-D3/Makefile
+++ b/devel/py-xstatic-d3/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-D3
+PORTNAME=	xstatic-d3
 PORTVERSION=	3.5.17.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-D3-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Data-Driven Documents framework (d3)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-D3/distinfo b/devel/py-xstatic-d3/distinfo
index 6bd7dd9dccd9..6bd7dd9dccd9 100644
--- a/devel/py-XStatic-D3/distinfo
+++ b/devel/py-xstatic-d3/distinfo
diff --git a/devel/py-XStatic-D3/pkg-descr b/devel/py-xstatic-d3/pkg-descr
index 072a86069d63..072a86069d63 100644
--- a/devel/py-XStatic-D3/pkg-descr
+++ b/devel/py-xstatic-d3/pkg-descr
diff --git a/devel/py-XStatic-Font-Awesome/Makefile b/devel/py-xstatic-font-awesome/Makefile
index 78e71ee27611..7fc8614cbacb 100644
--- a/devel/py-XStatic-Font-Awesome/Makefile
+++ b/devel/py-xstatic-font-awesome/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Font-Awesome
+PORTNAME=	xstatic-font-awesome
 PORTVERSION=	4.7.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Font-Awesome-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Iconic font and CSS framework (font-awesome)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Font-Awesome/distinfo b/devel/py-xstatic-font-awesome/distinfo
index 5c7916c59e46..5c7916c59e46 100644
--- a/devel/py-XStatic-Font-Awesome/distinfo
+++ b/devel/py-xstatic-font-awesome/distinfo
diff --git a/devel/py-XStatic-Font-Awesome/pkg-descr b/devel/py-xstatic-font-awesome/pkg-descr
index a7f39fffa4ec..a7f39fffa4ec 100644
--- a/devel/py-XStatic-Font-Awesome/pkg-descr
+++ b/devel/py-xstatic-font-awesome/pkg-descr
diff --git a/devel/py-XStatic-Hogan/Makefile b/devel/py-xstatic-hogan/Makefile
index 031c669734bc..7a971f3bdb12 100644
--- a/devel/py-XStatic-Hogan/Makefile
+++ b/devel/py-xstatic-hogan/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Hogan
+PORTNAME=	xstatic-hogan
 PORTVERSION=	2.0.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Hogan-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JavaScript templating framework (hogan.js)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Hogan/distinfo b/devel/py-xstatic-hogan/distinfo
index 1fdc7fdfddb6..1fdc7fdfddb6 100644
--- a/devel/py-XStatic-Hogan/distinfo
+++ b/devel/py-xstatic-hogan/distinfo
diff --git a/devel/py-XStatic-Hogan/pkg-descr b/devel/py-xstatic-hogan/pkg-descr
index 3e0332ccb311..3e0332ccb311 100644
--- a/devel/py-XStatic-Hogan/pkg-descr
+++ b/devel/py-xstatic-hogan/pkg-descr
diff --git a/devel/py-XStatic-Jasmine/Makefile b/devel/py-xstatic-jasmine/Makefile
index 5f12d908614c..df8df94fca66 100644
--- a/devel/py-XStatic-Jasmine/Makefile
+++ b/devel/py-xstatic-jasmine/Makefile
@@ -1,17 +1,18 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Jasmine
+PORTNAME=	xstatic-jasmine
 PORTVERSION=	2.4.1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Jasmine-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Jasmine (XStatic packaging standard)
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-XStatic-Jasmine/distinfo b/devel/py-xstatic-jasmine/distinfo
index 7fe20f4b7bb2..7fe20f4b7bb2 100644
--- a/devel/py-XStatic-Jasmine/distinfo
+++ b/devel/py-xstatic-jasmine/distinfo
diff --git a/devel/py-XStatic-Jasmine/pkg-descr b/devel/py-xstatic-jasmine/pkg-descr
index 8bb315a5bbf1..8bb315a5bbf1 100644
--- a/devel/py-XStatic-Jasmine/pkg-descr
+++ b/devel/py-xstatic-jasmine/pkg-descr
diff --git a/devel/py-XStatic-JQuery-Migrate/Makefile b/devel/py-xstatic-jquery-migrate/Makefile
index 5406d3e8b75f..a82132358226 100644
--- a/devel/py-XStatic-JQuery-Migrate/Makefile
+++ b/devel/py-xstatic-jquery-migrate/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-JQuery-Migrate
+PORTNAME=	xstatic-jquery-migrate
 PORTVERSION=	1.2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-JQuery-Migrate-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JQuery migration kit (jquery-migrate)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-JQuery-Migrate/distinfo b/devel/py-xstatic-jquery-migrate/distinfo
index fb9d9cb24281..fb9d9cb24281 100644
--- a/devel/py-XStatic-JQuery-Migrate/distinfo
+++ b/devel/py-xstatic-jquery-migrate/distinfo
diff --git a/devel/py-XStatic-JQuery-Migrate/pkg-descr b/devel/py-xstatic-jquery-migrate/pkg-descr
index 6d950b9eadb8..6d950b9eadb8 100644
--- a/devel/py-XStatic-JQuery-Migrate/pkg-descr
+++ b/devel/py-xstatic-jquery-migrate/pkg-descr
diff --git a/devel/py-XStatic-jquery-ui/Makefile b/devel/py-xstatic-jquery-ui/Makefile
index 2896bfed51ad..de837fc1b5b4 100644
--- a/devel/py-XStatic-jquery-ui/Makefile
+++ b/devel/py-xstatic-jquery-ui/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-jquery-ui
+PORTNAME=	xstatic-jquery-ui
 PORTVERSION=	1.12.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-jquery-ui-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JQuery library for building user interfaces (jquery-ui)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-jquery-ui/distinfo b/devel/py-xstatic-jquery-ui/distinfo
index f2f1db23fc93..f2f1db23fc93 100644
--- a/devel/py-XStatic-jquery-ui/distinfo
+++ b/devel/py-xstatic-jquery-ui/distinfo
diff --git a/devel/py-XStatic-jquery-ui/pkg-descr b/devel/py-xstatic-jquery-ui/pkg-descr
index f0bd2e250c7a..f0bd2e250c7a 100644
--- a/devel/py-XStatic-jquery-ui/pkg-descr
+++ b/devel/py-xstatic-jquery-ui/pkg-descr
diff --git a/devel/py-XStatic-JQuery.quicksearch/Makefile b/devel/py-xstatic-jquery.quicksearch/Makefile
index 066c93f46066..8d859acf64b0 100644
--- a/devel/py-XStatic-JQuery.quicksearch/Makefile
+++ b/devel/py-xstatic-jquery.quicksearch/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-JQuery.quicksearch
+PORTNAME=	xstatic-jquery.quicksearch
 PORTVERSION=	2.0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-JQuery.quicksearch-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JQuery plugin for searching through tables (jquery-quicksearch)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-JQuery.quicksearch/distinfo b/devel/py-xstatic-jquery.quicksearch/distinfo
index 056efd8bf861..056efd8bf861 100644
--- a/devel/py-XStatic-JQuery.quicksearch/distinfo
+++ b/devel/py-xstatic-jquery.quicksearch/distinfo
diff --git a/devel/py-XStatic-JQuery.quicksearch/pkg-descr b/devel/py-xstatic-jquery.quicksearch/pkg-descr
index a53695155664..a53695155664 100644
--- a/devel/py-XStatic-JQuery.quicksearch/pkg-descr
+++ b/devel/py-xstatic-jquery.quicksearch/pkg-descr
diff --git a/devel/py-XStatic-JQuery.TableSorter/Makefile b/devel/py-xstatic-jquery.tablesorter/Makefile
index f5b61fea0f83..e5dba78f5dd9 100644
--- a/devel/py-XStatic-JQuery.TableSorter/Makefile
+++ b/devel/py-xstatic-jquery.tablesorter/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-JQuery.TableSorter
+PORTNAME=	xstatic-jquery.tablesorter
 PORTVERSION=	2.14.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-JQuery.TableSorter-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JQuery plugin for creating sortable tables (jquery-tablesort)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-JQuery.TableSorter/distinfo b/devel/py-xstatic-jquery.tablesorter/distinfo
index faae6c7ede09..faae6c7ede09 100644
--- a/devel/py-XStatic-JQuery.TableSorter/distinfo
+++ b/devel/py-xstatic-jquery.tablesorter/distinfo
diff --git a/devel/py-XStatic-JQuery.TableSorter/pkg-descr b/devel/py-xstatic-jquery.tablesorter/pkg-descr
index 5c57ff8904dd..5c57ff8904dd 100644
--- a/devel/py-XStatic-JQuery.TableSorter/pkg-descr
+++ b/devel/py-xstatic-jquery.tablesorter/pkg-descr
diff --git a/devel/py-XStatic-jQuery/Makefile b/devel/py-xstatic-jquery/Makefile
index 3eef2d20d69c..1fca7ea5a08c 100644
--- a/devel/py-XStatic-jQuery/Makefile
+++ b/devel/py-xstatic-jquery/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-jQuery
+PORTNAME=	xstatic-jquery
 PORTVERSION=	1.10.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-jQuery-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JavaScript library for DOM operations (jquery)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-jQuery/distinfo b/devel/py-xstatic-jquery/distinfo
index c68259e0a9e9..c68259e0a9e9 100644
--- a/devel/py-XStatic-jQuery/distinfo
+++ b/devel/py-xstatic-jquery/distinfo
diff --git a/devel/py-XStatic-jQuery/pkg-descr b/devel/py-xstatic-jquery/pkg-descr
index 33c81d30fa5a..33c81d30fa5a 100644
--- a/devel/py-XStatic-jQuery/pkg-descr
+++ b/devel/py-xstatic-jquery/pkg-descr
diff --git a/devel/py-XStatic-JSEncrypt/Makefile b/devel/py-xstatic-jsencrypt/Makefile
index 9384d428947b..f7549af699db 100644
--- a/devel/py-XStatic-JSEncrypt/Makefile
+++ b/devel/py-xstatic-jsencrypt/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-JSEncrypt
+PORTNAME=	xstatic-jsencrypt
 PORTVERSION=	2.3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-JSEncrypt-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Javascript library to perform OpenSSL RSA (jsencrypt)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-JSEncrypt/distinfo b/devel/py-xstatic-jsencrypt/distinfo
index a82df0234a09..a82df0234a09 100644
--- a/devel/py-XStatic-JSEncrypt/distinfo
+++ b/devel/py-xstatic-jsencrypt/distinfo
diff --git a/devel/py-XStatic-JSEncrypt/pkg-descr b/devel/py-xstatic-jsencrypt/pkg-descr
index 0b1c99df8088..0b1c99df8088 100644
--- a/devel/py-XStatic-JSEncrypt/pkg-descr
+++ b/devel/py-xstatic-jsencrypt/pkg-descr
diff --git a/devel/py-XStatic-mdi/Makefile b/devel/py-xstatic-mdi/Makefile
index 91037f5950c0..ddc2c91b0bc0 100644
--- a/devel/py-XStatic-mdi/Makefile
+++ b/devel/py-xstatic-mdi/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-mdi
+PORTNAME=	xstatic-mdi
 PORTVERSION=	1.4.57.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-mdi-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Material Design Webfont (mdi)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-mdi/distinfo b/devel/py-xstatic-mdi/distinfo
index b401b61fd860..b401b61fd860 100644
--- a/devel/py-XStatic-mdi/distinfo
+++ b/devel/py-xstatic-mdi/distinfo
diff --git a/devel/py-XStatic-mdi/pkg-descr b/devel/py-xstatic-mdi/pkg-descr
index 31839f402317..31839f402317 100644
--- a/devel/py-XStatic-mdi/pkg-descr
+++ b/devel/py-xstatic-mdi/pkg-descr
diff --git a/devel/py-XStatic-objectpath/Makefile b/devel/py-xstatic-objectpath/Makefile
index 98703726df3b..794ce70e988e 100644
--- a/devel/py-XStatic-objectpath/Makefile
+++ b/devel/py-xstatic-objectpath/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-objectpath
+PORTNAME=	xstatic-objectpath
 PORTVERSION=	1.2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-objectpath-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parser for js object paths (objectpath)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-objectpath/distinfo b/devel/py-xstatic-objectpath/distinfo
index ab9c88437d3b..ab9c88437d3b 100644
--- a/devel/py-XStatic-objectpath/distinfo
+++ b/devel/py-xstatic-objectpath/distinfo
diff --git a/devel/py-XStatic-objectpath/pkg-descr b/devel/py-xstatic-objectpath/pkg-descr
index 23bb31cffc63..23bb31cffc63 100644
--- a/devel/py-XStatic-objectpath/pkg-descr
+++ b/devel/py-xstatic-objectpath/pkg-descr
diff --git a/devel/py-xstatic-rickshaw/Makefile b/devel/py-xstatic-rickshaw/Makefile
new file mode 100644
index 000000000000..8fb37421229a
--- /dev/null
+++ b/devel/py-xstatic-rickshaw/Makefile
@@ -0,0 +1,22 @@
+# Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
+# $FreeBSD$
+
+PORTNAME=	xstatic-rickshaw
+PORTVERSION=	1.5.0.0
+PORTREVISION=	2
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Rickshaw-${PORTVERSION}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Rickshaw (xstatic packaging standard)
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-XStatic-Rickshaw/distinfo b/devel/py-xstatic-rickshaw/distinfo
index 0f5c94c4c488..0f5c94c4c488 100644
--- a/devel/py-XStatic-Rickshaw/distinfo
+++ b/devel/py-xstatic-rickshaw/distinfo
diff --git a/devel/py-XStatic-Rickshaw/pkg-descr b/devel/py-xstatic-rickshaw/pkg-descr
index d74c93574543..d74c93574543 100644
--- a/devel/py-XStatic-Rickshaw/pkg-descr
+++ b/devel/py-xstatic-rickshaw/pkg-descr
diff --git a/devel/py-XStatic-roboto-fontface/Makefile b/devel/py-xstatic-roboto-fontface/Makefile
index 5d56ee435836..3d2d84e7386b 100644
--- a/devel/py-XStatic-roboto-fontface/Makefile
+++ b/devel/py-xstatic-roboto-fontface/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-roboto-fontface
+PORTNAME=	xstatic-roboto-fontface
 PORTVERSION=	0.5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-roboto-fontface-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple package providing the Roboto fontface (roboto-fontface)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-roboto-fontface/distinfo b/devel/py-xstatic-roboto-fontface/distinfo
index e1701295b30c..e1701295b30c 100644
--- a/devel/py-XStatic-roboto-fontface/distinfo
+++ b/devel/py-xstatic-roboto-fontface/distinfo
diff --git a/devel/py-XStatic-roboto-fontface/pkg-descr b/devel/py-xstatic-roboto-fontface/pkg-descr
index c2352f286959..c2352f286959 100644
--- a/devel/py-XStatic-roboto-fontface/pkg-descr
+++ b/devel/py-xstatic-roboto-fontface/pkg-descr
diff --git a/devel/py-XStatic-smart-table/Makefile b/devel/py-xstatic-smart-table/Makefile
index fde0cd5e341f..86c861b45adf 100644
--- a/devel/py-XStatic-smart-table/Makefile
+++ b/devel/py-xstatic-smart-table/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-smart-table
+PORTNAME=	xstatic-smart-table
 PORTVERSION=	1.4.13.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-smart-table-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Table module for angular js (angular-smart-table)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-smart-table/distinfo b/devel/py-xstatic-smart-table/distinfo
index d7af4ab54d11..d7af4ab54d11 100644
--- a/devel/py-XStatic-smart-table/distinfo
+++ b/devel/py-xstatic-smart-table/distinfo
diff --git a/devel/py-XStatic-smart-table/pkg-descr b/devel/py-xstatic-smart-table/pkg-descr
index 591dd75c3cad..591dd75c3cad 100644
--- a/devel/py-XStatic-smart-table/pkg-descr
+++ b/devel/py-xstatic-smart-table/pkg-descr
diff --git a/devel/py-XStatic-Spin/Makefile b/devel/py-xstatic-spin/Makefile
index d2d0728338e0..9657459ffba5 100644
--- a/devel/py-XStatic-Spin/Makefile
+++ b/devel/py-xstatic-spin/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-Spin
+PORTNAME=	xstatic-spin
 PORTVERSION=	1.2.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-Spin-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Spinner component (spin)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-Spin/distinfo b/devel/py-xstatic-spin/distinfo
index 2651981e2269..2651981e2269 100644
--- a/devel/py-XStatic-Spin/distinfo
+++ b/devel/py-xstatic-spin/distinfo
diff --git a/devel/py-XStatic-Spin/pkg-descr b/devel/py-xstatic-spin/pkg-descr
index 8ece97d21877..8ece97d21877 100644
--- a/devel/py-XStatic-Spin/pkg-descr
+++ b/devel/py-xstatic-spin/pkg-descr
diff --git a/devel/py-XStatic-term.js/Makefile b/devel/py-xstatic-term.js/Makefile
index 9eb6093eec8c..393c05879711 100644
--- a/devel/py-XStatic-term.js/Makefile
+++ b/devel/py-xstatic-term.js/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-term.js
+PORTNAME=	xstatic-term.js
 PORTVERSION=	0.0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-term.js-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Terminal written in javascript (term.js)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-term.js/distinfo b/devel/py-xstatic-term.js/distinfo
index a52eb785d149..a52eb785d149 100644
--- a/devel/py-XStatic-term.js/distinfo
+++ b/devel/py-xstatic-term.js/distinfo
diff --git a/devel/py-XStatic-term.js/pkg-descr b/devel/py-xstatic-term.js/pkg-descr
index d3503c2a9687..d3503c2a9687 100644
--- a/devel/py-XStatic-term.js/pkg-descr
+++ b/devel/py-xstatic-term.js/pkg-descr
diff --git a/devel/py-XStatic-tv4/Makefile b/devel/py-xstatic-tv4/Makefile
index a7c66befcd04..3408863e6112 100644
--- a/devel/py-XStatic-tv4/Makefile
+++ b/devel/py-xstatic-tv4/Makefile
@@ -1,22 +1,22 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic-tv4
+PORTNAME=	xstatic-tv4
 PORTVERSION=	1.2.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-tv4-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JSON Schema validator for JavaScript (tv4)
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-NO_ARCH=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xstatic>=0:devel/py-xstatic@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-XStatic-tv4/distinfo b/devel/py-xstatic-tv4/distinfo
index 8b43efc52599..8b43efc52599 100644
--- a/devel/py-XStatic-tv4/distinfo
+++ b/devel/py-xstatic-tv4/distinfo
diff --git a/devel/py-XStatic-tv4/pkg-descr b/devel/py-xstatic-tv4/pkg-descr
index 42493165d855..42493165d855 100644
--- a/devel/py-XStatic-tv4/pkg-descr
+++ b/devel/py-xstatic-tv4/pkg-descr
diff --git a/devel/py-XStatic/Makefile b/devel/py-xstatic/Makefile
index d92cded98c1e..00cfa2915981 100644
--- a/devel/py-XStatic/Makefile
+++ b/devel/py-xstatic/Makefile
@@ -1,11 +1,12 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
-PORTNAME=	XStatic
+PORTNAME=	xstatic
 PORTVERSION=	1.0.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	XStatic-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XStatic base package with minimal support code
diff --git a/devel/py-XStatic/distinfo b/devel/py-xstatic/distinfo
index 7289f96a3b4f..7289f96a3b4f 100644
--- a/devel/py-XStatic/distinfo
+++ b/devel/py-xstatic/distinfo
diff --git a/devel/py-XStatic/pkg-descr b/devel/py-xstatic/pkg-descr
index 8f50da4296c2..8f50da4296c2 100644
--- a/devel/py-XStatic/pkg-descr
+++ b/devel/py-xstatic/pkg-descr
diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile
index 555d33d63a6d..66748062da98 100644
--- a/www/py-horizon/Makefile
+++ b/www/py-horizon/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	horizon
 PORTVERSION=	17.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	https://tarballs.openstack.org/horizon/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenStack Dashboard (Horizon)
 
 LICENSE=	APACHE20
@@ -47,34 +47,34 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.12.0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>=2.3.1:devel/py-semantic-version@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.5.8.0:devel/py-XStatic-Angular@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=2.2.0.0:devel/py-XStatic-Angular-Bootstrap@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Angular-FileUpload>=12.0.4.0:devel/py-XStatic-Angular-FileUpload@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Gettext>=2.3.8.0:devel/py-XStatic-Angular-Gettext@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Angular-lrdragndrop>=1.0.2.2:devel/py-XStatic-Angular-lrdragndrop@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Schema-Form>=0.8.13.0:devel/py-XStatic-Angular-Schema-Form@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-Datepicker>=1.3.1.0:devel/py-XStatic-Bootstrap-Datepicker@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-SCSS>=3.3.7.1:devel/py-XStatic-Bootstrap-SCSS@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-bootswatch>=3.3.7.0:devel/py-XStatic-bootswatch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-D3>=3.5.17.0:devel/py-XStatic-D3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Hogan>=2.0.0.2:devel/py-XStatic-Hogan@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Font-Awesome>=4.7.0.0:devel/py-XStatic-Font-Awesome@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Jasmine>=2.4.1.1:devel/py-XStatic-Jasmine@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-jQuery>=1.8.2.1:devel/py-XStatic-jQuery@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-JQuery-Migrate>=1.2.1.1:devel/py-XStatic-JQuery-Migrate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.quicksearch>=2.0.3.1:devel/py-XStatic-JQuery.quicksearch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.TableSorter>=2.14.5.1:devel/py-XStatic-JQuery.TableSorter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-jquery-ui>=1.10.4.1:devel/py-XStatic-jquery-ui@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-JSEncrypt>=2.3.1.1:devel/py-XStatic-JSEncrypt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-mdi>=1.4.57.0:devel/py-XStatic-mdi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-objectpath>=1.2.1.0:devel/py-XStatic-objectpath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Rickshaw>=1.5.0.0:devel/py-XStatic-Rickshaw@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-roboto-fontface>=0.5.0.0:devel/py-XStatic-roboto-fontface@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-smart-table>=1.4.13.2:devel/py-XStatic-smart-table@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-Spin>=1.2.5.2:devel/py-XStatic-Spin@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.7.0:devel/py-XStatic-term.js@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}xstatic>=1.0.0:devel/py-xstatic@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-angular>=1.5.8.0:devel/py-xstatic-angular@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-angular-bootstrap>=2.2.0.0:devel/py-xstatic-angular-bootstrap@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-angular-fileupload>=12.0.4.0:devel/py-xstatic-angular-fileupload@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-angular-gettext>=2.3.8.0:devel/py-xstatic-angular-gettext@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-angular-lrdragndrop>=1.0.2.2:devel/py-xstatic-angular-lrdragndrop@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-angular-schema-form>=0.8.13.0:devel/py-xstatic-angular-schema-form@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-bootstrap-datepicker>=1.3.1.0:devel/py-xstatic-bootstrap-datepicker@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-bootstrap-scss>=3.3.7.1:devel/py-xstatic-bootstrap-scss@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-bootswatch>=3.3.7.0:devel/py-xstatic-bootswatch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-d3>=3.5.17.0:devel/py-xstatic-d3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-hogan>=2.0.0.2:devel/py-xstatic-hogan@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-font-awesome>=4.7.0.0:devel/py-xstatic-font-awesome@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jasmine>=2.4.1.1:devel/py-xstatic-jasmine@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jquery>=1.8.2.1:devel/py-xstatic-jquery@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jquery-migrate>=1.2.1.1:devel/py-xstatic-jquery-migrate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jquery.quicksearch>=2.0.3.1:devel/py-xstatic-jquery.quicksearch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jquery.tablesorter>=2.14.5.1:devel/py-xstatic-jquery.tablesorter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jquery-ui>=1.10.4.1:devel/py-xstatic-jquery-ui@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-jsencrypt>=2.3.1.1:devel/py-xstatic-jsencrypt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-mdi>=1.4.57.0:devel/py-xstatic-mdi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-objectpath>=1.2.1.0:devel/py-xstatic-objectpath@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-rickshaw>=1.5.0.0:devel/py-xstatic-rickshaw@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-roboto-fontface>=0.5.0.0:devel/py-xstatic-roboto-fontface@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-smart-table>=1.4.13.2:devel/py-xstatic-smart-table@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-spin>=1.2.5.2:devel/py-xstatic-spin@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-term.js>=0.0.7.0:devel/py-xstatic-term.js@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xstatic-tv4>=1.2.7.0:devel/py-xstatic-tv4@${PY_FLAVOR}
 
 USES=		python:3.6+ # Required as devel/py-oslo.upgradecheck supports Python 3.6+ only
 USE_PYTHON=	autoplist distutils