Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jan 2019 13:09:26 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r489966 - in head/devel/py-os-brick: . files
Message-ID:  <201901111309.x0BD9Q2e060224@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Fri Jan 11 13:09:26 2019
New Revision: 489966
URL: https://svnweb.freebsd.org/changeset/ports/489966

Log:
  - Update to 2.3.4
  - Added LICENSE_FILE
  - Removed EXTRAPATCHES because they no longer applies
  - Sorted variables a bit according to the PHB
  - Added post-patch target to replace hardcoded occurences of /etc with ${PREFIX}/etc
  - Added pkg-plist to handle the installation of files into ${ETCDIR} (for this the newly added post-install target is required)
  - Improved pkg-descr
  
  Changes by upstream:
  - https://docs.openstack.org/releasenotes/os-brick/queens.html
  
  PR:		230136
  Submitted by:	freebsd_ports@k-worx.org, ndowens@yahoo.com
  Approved by:	maintainer
  Sponsored by:	iXsystems Inc.

Added:
  head/devel/py-os-brick/pkg-plist   (contents, props changed)
Deleted:
  head/devel/py-os-brick/files/
Modified:
  head/devel/py-os-brick/Makefile
  head/devel/py-os-brick/distinfo   (contents, props changed)
  head/devel/py-os-brick/pkg-descr   (contents, props changed)

Modified: head/devel/py-os-brick/Makefile
==============================================================================
--- head/devel/py-os-brick/Makefile	Fri Jan 11 13:05:55 2019	(r489965)
+++ head/devel/py-os-brick/Makefile	Fri Jan 11 13:09:26 2019	(r489966)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	os-brick
-PORTVERSION=	1.10.0
+PORTVERSION=	2.3.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,34 +11,43 @@ MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	Openstack cinder brick library for managing local volume attaches
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${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}os-win>=3.0.0:devel/py-os-win@${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}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
-NO_ARCH=	yes
-
-EXTRA_PATCHES=	${FILESDIR}/01-os-type.patch:-p1 \
-		${FILESDIR}/02-nfs.patch:-p1
-
 USES=		python
 USE_PYTHON=	autoplist distutils
 
+NO_ARCH=	yes
+
+MY_REGEX=	(/etc/)
+
 post-patch:
-	@${ECHO_CMD} "os-brick configuration at ${PREFIX}/etc/os-brick/rootwrap.d" >> \
-		${WRKSRC}/etc/os-brick.readme
-	@${ECHO_CMD} "os-brick configuration" >> ${WRKSRC}/etc/os-brick/info
+	# 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
+	# Replace (hardcoded) paths of config, documentation and Python files
+	@${GREP} -Rl -Ee '${MY_REGEX}' --null \
+		${WRKSRC}/etc ${WRKSRC}/os_brick | \
+			${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \
+				"s,${MY_REGEX},${PREFIX}\1,g"
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/rootwrap.d
+	${INSTALL_DATA} ${WRKSRC}/etc/os-brick/rootwrap.d/os-brick.filters \
+		${STAGEDIR}${ETCDIR}/rootwrap.d/os-brick.filters.sample
 
 .include <bsd.port.mk>

Modified: head/devel/py-os-brick/distinfo
==============================================================================
--- head/devel/py-os-brick/distinfo	Fri Jan 11 13:05:55 2019	(r489965)
+++ head/devel/py-os-brick/distinfo	Fri Jan 11 13:09:26 2019	(r489966)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485279938
-SHA256 (os-brick-1.10.0.tar.gz) = b0d69f7b23b98ce5632e3fdea85592a15408156a21692a15486f38bf4736dbd6
-SIZE (os-brick-1.10.0.tar.gz) = 140387
+TIMESTAMP = 1539433948
+SHA256 (os-brick-2.3.4.tar.gz) = 637ff2d26ce800aa410a257202c4703a1f672ba500a23b32c5872ee786a8e794
+SIZE (os-brick-2.3.4.tar.gz) = 169329

Modified: head/devel/py-os-brick/pkg-descr
==============================================================================
--- head/devel/py-os-brick/pkg-descr	Fri Jan 11 13:05:55 2019	(r489965)
+++ head/devel/py-os-brick/pkg-descr	Fri Jan 11 13:09:26 2019	(r489966)
@@ -1,3 +1,8 @@
 OpenStack Cinder brick library for managing local volume attaches
 
+Features:
+
+- Discovery of volumes being attached to a host for many transport protocols.
+- Removal of volumes from a host.
+
 WWW: https://pypi.org/project/os-brick/

Added: head/devel/py-os-brick/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/py-os-brick/pkg-plist	Fri Jan 11 13:09:26 2019	(r489966)
@@ -0,0 +1,4 @@
+@dir %%ETCDIR%%
+@owner root
+@dir %%ETCDIR%%/rootwrap.d
+@sample %%ETCDIR%%/rootwrap.d/os-brick.filters.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901111309.x0BD9Q2e060224>