git: c8e37b455176 - main - sysutils/py-ansible-*: Fix DATADIR for Ansible plugins

[Mateusz Piotrowski]

The branch main has been updated by 0mp:

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

commit c8e37b455176cb3c016a50c671226a9d88f89570
Author:     Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-05-17 09:59:21 +0000
Commit:     Mateusz Piotrowski <0mp at FreeBSD.org>
CommitDate: 2021-05-17 09:59:21 +0000

    sysutils/py-ansible-*: Fix DATADIR for Ansible plugins
    
    All the Ansible plugins assume that the Ansible DATADIR is
    ${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible instead of
    ${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible-base or
    ${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible-core.
    
    This patch sets the DATADIR back to its historical value. It's based on
    a patch provided by madpilot.
    
    PR:     255920
    Reported by:    madpilot
---
 sysutils/py-ansible-base/Makefile | 4 +++-
 sysutils/py-ansible-core/Makefile | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sysutils/py-ansible-base/Makefile b/sysutils/py-ansible-base/Makefile
index 08a190453c6c..85e799441a66 100644
--- a/sysutils/py-ansible-base/Makefile
+++ b/sysutils/py-ansible-base/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ansible-base
 DISTVERSION=	2.10.9
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -99,6 +100,7 @@ pre-test:
 
 .include <bsd.port.mk>
 
-# Make sure that we override the unique ETCDIR name set
+# Make sure that we override the unique DATADIR and ETCDIR set
 # by the implicit USES=uniquefiles.
+DATADIR=	${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible
 ETCDIR=		${PREFIX}/etc/ansible
diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile
index 6a55e784cfe2..4a5075c92a94 100644
--- a/sysutils/py-ansible-core/Makefile
+++ b/sysutils/py-ansible-core/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ansible-core
 DISTVERSION=	2.11.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -95,6 +96,7 @@ pre-test:
 
 .include <bsd.port.mk>
 
-# Make sure that we override the unique ETCDIR name set
+# Make sure that we override the unique DATADIR and ETCDIR set
 # by the implicit USES=uniquefiles.
+DATADIR=	${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible
 ETCDIR=		${PREFIX}/etc/ansible