git: e7a3275d0f62 - main - misc/py-cinder: Remove expired port

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Tue, 11 Jun 2024 15:27:33 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e7a3275d0f62512d8590bda10ea9bf1b04161387

commit e7a3275d0f62512d8590bda10ea9bf1b04161387
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-06-11 15:27:14 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-06-11 15:27:14 +0000

    misc/py-cinder: Remove expired port
    
    2024-06-04 misc/py-cinder: Depends on expired databases/py-sqlalchemy12
---
 MOVED                                              |   1 +
 misc/Makefile                                      |   1 -
 misc/py-cinder/Makefile                            | 130 ---------------------
 misc/py-cinder/distinfo                            |   3 -
 misc/py-cinder/files/cinder-api.in                 |  50 --------
 misc/py-cinder/files/cinder-scheduler.in           |  50 --------
 misc/py-cinder/files/cinder-volume.in              |  50 --------
 misc/py-cinder/files/cinder.conf.sample            |  26 -----
 .../files/patch-cinder_volume_drivers_nfs.py       |  39 -------
 .../files/patch-cinder_volume_drivers_remotefs.py  |  31 -----
 misc/py-cinder/files/patch-requirements.txt        |  11 --
 misc/py-cinder/pkg-descr                           |   8 --
 misc/py-cinder/pkg-message                         |  19 ---
 misc/py-cinder/pkg-plist                           |   8 --
 14 files changed, 1 insertion(+), 426 deletions(-)

diff --git a/MOVED b/MOVED
index 29fc1662fe25..ea2189949acc 100644
--- a/MOVED
+++ b/MOVED
@@ -3281,3 +3281,4 @@ databases/rubygem-redis50|databases/rubygem-redis|2024-06-09|Obsolete use databa
 math/py-optuna||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
 databases/py-alembic14||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
 deskutils/griffith||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
+misc/py-cinder||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
diff --git a/misc/Makefile b/misc/Makefile
index 448561e32c74..b4014c5cf184 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -411,7 +411,6 @@
     SUBDIR += py-ast-comments
     SUBDIR += py-boost-histogram
     SUBDIR += py-censys
-    SUBDIR += py-cinder
     SUBDIR += py-codecarbon
     SUBDIR += py-colorbrewer
     SUBDIR += py-colored
diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile
deleted file mode 100644
index 9879d9dca4cb..000000000000
--- a/misc/py-cinder/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-PORTNAME=	cinder
-PORTVERSION=	12.0.10
-PORTREVISION=	24
-CATEGORIES=	misc python
-MASTER_SITES=	PYPI
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	OpenStack Block Storage
-WWW=		https://docs.openstack.org/cinder/latest/
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BROKEN=	pkg-static: py39-sqlalchemy12-1.2.19 conflicts with py39-sqlalchemy14-1.4.50 (installs files into the same place).  Problematic file: /usr/local/share/doc/py39-sqlalchemy/_images/sqla_arch_small.png
-DEPRECATED=	Depends on expired databases/py-sqlalchemy12
-EXPIRATION_DATE=2024-06-04
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}castellan>=0.16.0:devel/py-castellan@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.2:www/py-google-api-python-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.3.0:devel/py-keystoneauth1@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=4.17.0:devel/py-keystonemiddleware@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}os-brick>=2.2.0:devel/py-os-brick@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.db>=4.27.0:devel/py-oslo.db@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.reports>=1.18.0:devel/py-oslo.reports@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.8.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.31.2:devel/py-oslo.versionedobjects@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.17.0:devel/py-oslo.vmware@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Paste>=2.0.2:www/py-paste@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pastedeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7.1<0.8:devel/py-prettytable0@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>=3.2.2:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-novaclient>=9.1.0:net/py-python-novaclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}retrying>=1.2.3:devel/py-retrying@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rtslib-fb>=2.1.43:devel/py-rtslib-fb@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.11.0:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.0.10:databases/py-sqlalchemy12@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}suds>=0.6:net/py-suds@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}taskflow>=2.16.0:devel/py-taskflow@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tooz>=1.58.0:devel/py-tooz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
-
-USES=		cpe python
-USE_PYTHON=	autoplist concurrent cryptography distutils
-
-NO_ARCH=	yes
-USE_RC_SUBR=	cinder-api cinder-scheduler cinder-volume
-
-USERS=		cinder
-GROUPS=		cinder
-
-SUB_LIST=	PYTHON_VER=${PYTHON_VER}
-
-CONFLICTS_INSTALL=	py??-cinder
-
-CPE_VENDOR=	openstack
-
-PORTSCOUT=	skipv:2015.1.4
-
-OPTIONS_DEFINE=	MEMCACHED MONGODB
-OPTIONS_RADIO=	DB
-OPTIONS_RADIO_DB=	MYSQL PGSQL
-MEMCACHED_DESC=	Memcached support
-MONGODB_DESC=	MongoDB support (used for messaging services)
-MYSQL_DESC=	MySQL/MariaDB support
-PGSQL_DESC=	PostgreSQL support
-
-MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.56:databases/py-python-memcached@${PY_FLAVOR}
-MONGODB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=3.0.2:databases/py-pymongo@${PY_FLAVOR}
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR}
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR}
-
-MY_REGEX=	(/etc/)(ceph|nova|pki|ssl)
-
-post-patch:
-	# Prevent the installation of files into ${ETCDIR} by distutils. We do it
-	# manually in the post-install target
-	@${REINPLACE_CMD} -e '/etc\//d' ${WRKSRC}/setup.cfg
-	${CP} ${FILESDIR}/cinder.conf.sample ${WRKSRC}/etc/cinder/cinder.conf
-	# Replace (hardcoded) paths of config, documentation and Python files
-	@${GREP} -Rl -Ee '${MY_REGEX}' --null \
-		${WRKSRC}/etc ${WRKSRC}/doc ${WRKSRC}/cinder | \
-			${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \
-				"s,${MY_REGEX},${PREFIX}\1\2,g"
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${ETCDIR}/rootwrap.d
-.for f in api-paste.ini cinder.conf rootwrap.conf rootwrap.d/volume.filters
-	${INSTALL_DATA} ${WRKSRC}/etc/cinder/$f ${STAGEDIR}${ETCDIR}/$f.sample
-.endfor
-
-.include <bsd.port.mk>
diff --git a/misc/py-cinder/distinfo b/misc/py-cinder/distinfo
deleted file mode 100644
index b716da23738c..000000000000
--- a/misc/py-cinder/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1586534796
-SHA256 (cinder-12.0.10.tar.gz) = 4e1755fccb21989590ce476ab684c40e7034b74ce7190f6fd3014f274b92b2e4
-SIZE (cinder-12.0.10.tar.gz) = 5370355
diff --git a/misc/py-cinder/files/cinder-api.in b/misc/py-cinder/files/cinder-api.in
deleted file mode 100644
index 65d13992b519..000000000000
--- a/misc/py-cinder/files/cinder-api.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: cinder_api
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable cinder_api:
-#
-# cinder_api_enable="YES"
-#
-# cinder_api_enable (bool):
-#	Set it to "YES" to enable cinder_api.
-# 	Default is "NO".
-#
-# cinder_api_logdir (str):
-#	Set it to chagge log directory
-#	Default is "/var/log/cinder"
-#
-# cinder_api_args (str):
-#	Set it to change command line arguments.
-#	Default is "--log-file ${cinder_api_logdir}/cinder-api.log"
-#
-
-. /etc/rc.subr
-
-name=cinder_api
-rcvar=cinder_api_enable
-
-PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
-
-pidfile="/var/run/cinder-api.pid"
-procname="%%PREFIX%%/bin/python%%PYTHON_VER%%"
-
-start_precmd=cinder_precmd
-
-load_rc_config $name
-
-: ${cinder_api_enable:="NO"}
-: ${cinder_api_logdir:="/var/log/cinder"}
-: ${cinder_api_args:="--log-file ${cinder_api_logdir}/cinder-api.log"}
-
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} cinder-api ${cinder_api_args}"
-
-cinder_precmd() {
-	mkdir -p ${cinder_api_logdir}
-}
-
-run_rc_command "$1"
diff --git a/misc/py-cinder/files/cinder-scheduler.in b/misc/py-cinder/files/cinder-scheduler.in
deleted file mode 100644
index 06d0059762c7..000000000000
--- a/misc/py-cinder/files/cinder-scheduler.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: cinder_scheduler
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable cinder_scheduler:
-#
-# cinder_scheduler_enable="YES"
-#
-# cinder_scheduler_enable (bool):
-#	Set it to "YES" to enable cinder_scheduler.
-# 	Default is "NO".
-#
-# cinder_scheduler_logdir (str):
-#	Set it to chagge log directory
-#	Default is "/var/log/cinder"
-#
-# cinder_scheduler_args (str):
-#	Set it to change command line arguments.
-#	Default is "--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"
-#
-
-. /etc/rc.subr
-
-name=cinder_scheduler
-rcvar=cinder_scheduler_enable
-
-PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
-
-pidfile="/var/run/cinder-scheduler.pid"
-procname="%%PREFIX%%/bin/python%%PYTHON_VER%%"
-
-start_precmd=cinder_precmd
-
-load_rc_config $name
-
-: ${cinder_scheduler_enable:="NO"}
-: ${cinder_scheduler_logdir:="/var/log/cinder"}
-: ${cinder_scheduler_args:="--log-file ${cinder_scheduler_logdir}/cinder-scheduler.log"}
-
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} cinder-scheduler ${cinder_scheduler_args}"
-
-cinder_precmd() {
-	mkdir -p ${cinder_scheduler_logdir}
-}
-
-run_rc_command "$1"
diff --git a/misc/py-cinder/files/cinder-volume.in b/misc/py-cinder/files/cinder-volume.in
deleted file mode 100644
index f84f4a121246..000000000000
--- a/misc/py-cinder/files/cinder-volume.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: cinder_volume
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable cinder_volume:
-#
-# cinder_volume_enable="YES"
-#
-# cinder_volume_enable (bool):
-#	Set it to "YES" to enable cinder_volume.
-# 	Default is "NO".
-#
-# cinder_volume_logdir (str):
-#	Set it to chagge log directory
-#	Default is "/var/log/cinder"
-#
-# cinder_volume_args (str):
-#	Set it to change command line arguments.
-#	Default is "--log-file ${cinder_volume_logdir}/cinder-volume.log"
-#
-
-. /etc/rc.subr
-
-name=cinder_volume
-rcvar=cinder_volume_enable
-
-PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
-
-pidfile="/var/run/cinder-volume.pid"
-procname="%%PREFIX%%/bin/python%%PYTHON_VER%%"
-
-start_precmd=cinder_precmd
-
-load_rc_config $name
-
-: ${cinder_volume_enable:="NO"}
-: ${cinder_volume_logdir:="/var/log/cinder"}
-: ${cinder_volume_args:="--log-file ${cinder_volume_logdir}/cinder-volume.log"}
-
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} cinder-volume ${cinder_volume_args}"
-
-cinder_precmd() {
-	mkdir -p ${cinder_volume_logdir}
-}
-
-run_rc_command "$1"
diff --git a/misc/py-cinder/files/cinder.conf.sample b/misc/py-cinder/files/cinder.conf.sample
deleted file mode 100644
index d959c56a2837..000000000000
--- a/misc/py-cinder/files/cinder.conf.sample
+++ /dev/null
@@ -1,26 +0,0 @@
-[DEFAULT]
-auth_strategy = keystone
-transport_url = rabbit://openstack:RABBIT_PASS@controller
-my_ip = 192.168.1.30
-glance_api_servers = http://GLANCEHOST:9292
-enabled_backends = nfs
-
-[backend_defaults]
-#nfs_shares_config = /usr/local/etc/cinder/nfsshares
-volume_driver = cinder.volume.drivers.nfs.NfsDriver
-
-[database]
-connection = sqlite:////var/lib/cinder/cinder.db
-
-[keystone_authtoken]
-auth_uri = http://controller:5000
-auth_url = http://controller:5000
-auth_type = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = cinder
-password = cinder
-
-[oslo_concurrency]
-lock_path = /var/lib/cinder/tmp
diff --git a/misc/py-cinder/files/patch-cinder_volume_drivers_nfs.py b/misc/py-cinder/files/patch-cinder_volume_drivers_nfs.py
deleted file mode 100644
index 2360a7633cb8..000000000000
--- a/misc/py-cinder/files/patch-cinder_volume_drivers_nfs.py
+++ /dev/null
@@ -1,39 +0,0 @@
---- cinder/volume/drivers/nfs.py.orig	2018-06-18 13:37:33 UTC
-+++ cinder/volume/drivers/nfs.py
-@@ -182,10 +182,10 @@ class NfsDriver(remotefs.RemoteFSSnapDriverDistributed
- 
-         self.shares = {}  # address : options
- 
--        # Check if mount.nfs is installed on this system; note that we
-+        # Check if mount_nfs is installed on this system; note that we
-         # need to be root, to also find mount.nfs on distributions, where
-         # it is not located in an unprivileged users PATH (e.g. /sbin).
--        package = 'mount.nfs'
-+        package = 'mount_nfs'
-         try:
-             self._execute(package, check_exit_code=False,
-                           run_as_root=True)
-@@ -342,16 +342,16 @@ class NfsDriver(remotefs.RemoteFSSnapDriverDistributed
-         """
-         mount_point = self._get_mount_point_for_share(nfs_share)
- 
--        df, _ = self._execute('stat', '-f', '-c', '%S %b %a', mount_point,
-+        df, _ = self._execute('df', '-k', mount_point,
-                               run_as_root=self._execute_as_root)
--        block_size, blocks_total, blocks_avail = map(float, df.split())
--        total_available = block_size * blocks_avail
--        total_size = block_size * blocks_total
-+        df = df.splitlines()[1]
-+        block_size = 1024
-+        total_available = block_size * int(df.split()[3])
-+        total_size = block_size * int(df.split()[1])
- 
--        du, _ = self._execute('du', '-sb', '--apparent-size', '--exclude',
--                              '*snapshot*', mount_point,
-+        du, _ = self._execute('du', '-Aks', mount_point,
-                               run_as_root=self._execute_as_root)
--        total_allocated = float(du.split()[0])
-+        total_allocated = float(du.split()[0]) * 1024
-         return total_size, total_available, total_allocated
- 
-     def _get_mount_point_base(self):
diff --git a/misc/py-cinder/files/patch-cinder_volume_drivers_remotefs.py b/misc/py-cinder/files/patch-cinder_volume_drivers_remotefs.py
deleted file mode 100644
index 990b752ac6af..000000000000
--- a/misc/py-cinder/files/patch-cinder_volume_drivers_remotefs.py
+++ /dev/null
@@ -1,31 +0,0 @@
---- cinder/volume/drivers/remotefs.py.orig	2018-10-09 19:58:17 UTC
-+++ cinder/volume/drivers/remotefs.py
-@@ -217,9 +217,9 @@ class RemoteFSDriver(driver.BaseVD):
-         provisioned_size = 0.0
-         for share in self.shares.keys():
-             mount_path = self._get_mount_point_for_share(share)
--            out, _ = self._execute('du', '--bytes', '-s', mount_path,
-+            out, _ = self._execute('du', '-k', mount_path,
-                                    run_as_root=self._execute_as_root)
--            provisioned_size += int(out.split()[0])
-+            provisioned_size += int(out.split()[0]) * 1024
-         return round(provisioned_size / units.Gi, 2)
- 
-     def _get_mount_point_base(self):
-@@ -892,13 +892,12 @@ class RemoteFSSnapDriverBase(RemoteFSDriver):
-         """
-         mount_point = self._get_mount_point_for_share(share)
- 
--        out, _ = self._execute('df', '--portability', '--block-size', '1',
--                               mount_point,
-+        out, _ = self._execute('df', '-k', mount_point,
-                                run_as_root=self._execute_as_root)
-         out = out.splitlines()[1]
- 
--        size = int(out.split()[1])
--        available = int(out.split()[3])
-+        size = int(out.split()[1]) * 1024
-+        available = int(out.split()[3]) * 1024
- 
-         return available, size
- 
diff --git a/misc/py-cinder/files/patch-requirements.txt b/misc/py-cinder/files/patch-requirements.txt
deleted file mode 100644
index 23b33172ee05..000000000000
--- a/misc/py-cinder/files/patch-requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- requirements.txt.orig	2019-10-24 14:33:24 UTC
-+++ requirements.txt
-@@ -55,7 +55,7 @@ six>=1.10.0 # MIT
- SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
- sqlalchemy-migrate>=0.11.0 # Apache-2.0
- stevedore>=1.20.0 # Apache-2.0
--suds-jurko>=0.6 # LGPLv3+
-+suds>=0.6 # LGPLv3+
- WebOb>=1.7.1 # MIT
- oslo.i18n>=3.15.3 # Apache-2.0
- oslo.vmware>=2.17.0 # Apache-2.0
diff --git a/misc/py-cinder/pkg-descr b/misc/py-cinder/pkg-descr
deleted file mode 100644
index 97e981c012ee..000000000000
--- a/misc/py-cinder/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Cinder is a Block Storage service for OpenStack. It's designed to present
-storage resources to end users that can be consumed by the OpenStack Compute
-Project (Nova). This is done through the use of either a reference
-implementation (LVM) or plugin drivers for other storage. The short
-description of Cinder is that it virtualizes the management of block storage
-devices and provides end users with a self service API to request and consume
-those resources without requiring any knowledge of where their storage is
-actually deployed or on what type of device.
diff --git a/misc/py-cinder/pkg-message b/misc/py-cinder/pkg-message
deleted file mode 100644
index ea51deec1c7f..000000000000
--- a/misc/py-cinder/pkg-message
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-For installation instructions please refer to the related wiki page:
-
-- https://wiki.freebsd.org/Ports/misc/py-cinder
-
-Please note that this is a development version and only initial NFS support
-has been tested so far.
-
-The supplied cinder.conf file is a distilled configuration which reflects the
-required settings to setup a Cinder controller/storage node with NFS support.
-
-A extensive sample configuration file can be retrieved at:
-
-https://docs.openstack.org/cinder/queens/_static/cinder.conf.sample
-EOM
-}
-]
diff --git a/misc/py-cinder/pkg-plist b/misc/py-cinder/pkg-plist
deleted file mode 100644
index f32818ba62e4..000000000000
--- a/misc/py-cinder/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-@owner cinder
-@dir %%ETCDIR%%
-@sample %%ETCDIR%%/api-paste.ini.sample
-@sample %%ETCDIR%%/cinder.conf.sample
-@owner root
-@sample %%ETCDIR%%/rootwrap.conf.sample
-@dir %%ETCDIR%%/rootwrap.d
-@sample %%ETCDIR%%/rootwrap.d/volume.filters.sample