- Update to 2.7.0

- Added LICENSE and LICENSE_FILE
- Sorted variables a bit
- Added DOCS option with appropriate dependencies
- Added CONFLICTS_INSTALL
- Added workaround to install *.conf files manually into ${ETCDIR}
- Updated WWW and improved formatting of pkg-descr

PR:		228698
Submitted by:	freebsd_ports@k-worx.org
Approved by:	maintainer

3 files changed, 62 insertions, 16 deletions

diff --git a/devel/py-pycadf/Makefile b/devel/py-pycadf/Makefile
index ca4f82f37e19..1c1b7931cd50 100644
--- a/devel/py-pycadf/Makefile
+++ b/devel/py-pycadf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pycadf
-PORTVERSION=	2.5.0
+PORTVERSION=	2.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,16 +10,63 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	CADF Library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR}
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NO_ARCH=	yes
+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}oslo.config>=4.6.0:devel/py-oslo.config@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
+NO_ARCH=	yes
+PORTDOCS=	*
+CONFLICTS_INSTALL=	py??-pycadf-*
+
+OPTIONS_DEFINE=	DOCS
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.2:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.18.1:textproc/py-openstackdocstheme@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslo.config>=4.6.0:devel/py-oslo.config@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}fixtures>=3.0.0:devel/py-fixtures@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}oslotest>=1.10.0:devel/py-oslotest@${PY_FLAVOR}
+DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
+
+# Note: When updating this port please check setup.cfg if the list of *.conf
+# files has been changed in some way. Sometimes there are more files in
+# ${WRKSRC}/etc/pycadf but only a few of them are installed as listed in
+# setup.cfg.
+CONF_FILES=	ceilometer_api_audit_map.conf \
+		cinder_api_audit_map.conf \
+		glance_api_audit_map.conf \
+		neutron_api_audit_map.conf \
+		nova_api_audit_map.conf \
+		trove_api_audit_map.conf \
+
+post-patch:
+	# Rename *.conf by adding a ".sample" extension to them
+	@(cd ${WRKSRC}/etc/pycadf && \
+		for f in *.conf; do ${MV} $${f} $${f}.sample; done)
+	# Comment out *.conf files from setup.py to process them manually
+	@${REINPLACE_CMD} -Ee \
+		's|^(data_files)|# \1|; \
+		 s|(etc/)|# \1|' \
+		${WRKSRC}/setup.cfg
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	(cd ${WRKSRC}/etc/pycadf &&  for f in ${CONF_FILES:C/(\.conf)$/\1.sample/g}; \
+		do ${INSTALL_DATA} $${f} ${STAGEDIR}${ETCDIR}; done)
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/build/html && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+			"! -name .buildinfo -and ! -name objects.inv")
+
 .include <bsd.port.mk>
diff --git a/devel/py-pycadf/distinfo b/devel/py-pycadf/distinfo
index e090dba1a45a..c0946ef0e2e3 100644
--- a/devel/py-pycadf/distinfo
+++ b/devel/py-pycadf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485277836
-SHA256 (pycadf-2.5.0.tar.gz) = a5cbf899266ea25e62e927a31dbf13607f9ebfe1525b4ec95256afc42f43be70
-SIZE (pycadf-2.5.0.tar.gz) = 247779
+TIMESTAMP = 1527692762
+SHA256 (pycadf-2.7.0.tar.gz) = 2235829835cebf73f94d42ac4d1b0fa2f1bb49dd1476d82466c28fd1789f0d22
+SIZE (pycadf-2.7.0.tar.gz) = 248233
diff --git a/devel/py-pycadf/pkg-descr b/devel/py-pycadf/pkg-descr
index 477128f0d44f..fd04120ec15f 100644
--- a/devel/py-pycadf/pkg-descr
+++ b/devel/py-pycadf/pkg-descr
@@ -1,6 +1,5 @@
-This library provides an auditing data model based on the Cloud Auditing Data
-Federation specification, primarily for use by OpenStack.  The goal is to
-establish strict expectations about what auditors can expect from audit
-notifications.
+Provides an auditing data model based on the Cloud Auditing Data Federation
+specification, primarily for use by OpenStack. The goal is to establish strict
+expectations about what auditors can expect from audit notifications.
 
-WWW: https://launchpad.net/pycadf
+WWW: https://docs.openstack.org/pycadf/