diff options
author | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 21:40:11 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-25 21:40:11 +0000 |
commit | 04b9da414081a733478d3def4e1e3777908536c6 (patch) | |
tree | f59ddc1be63ea2f6093a28c78fbd201d491ee49d /sysutils/ansible | |
parent | 09c1162b8dd0e293c93ff2a2a81b2d54b57729e3 (diff) | |
download | ports-04b9da414081a733478d3def4e1e3777908536c6.tar.gz ports-04b9da414081a733478d3def4e1e3777908536c6.zip |
*/*: Remove redundant '-*' from CONFLICTS definitions
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").
Approved by: portmgr (blanket)
Diffstat (limited to 'sysutils/ansible')
-rw-r--r-- | sysutils/ansible/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 6d7c62e312af..9eb1320b5ee9 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -23,7 +23,7 @@ SHEBANG_FILES= ansible_collections/community/zabbix/roles/zabbix_proxy/files/ins ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr SHEBANG_GLOB= *.py *.sh -CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} +CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}} NO_ARCH= yes @@ -31,9 +31,9 @@ DO_MAKE_TEST= ansible -m ping TEST_TARGET= localhost _ANSIBLE_VERSIONS= 1 2 23 24 25 26 27 28 -_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible-* +_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible .for version in ${_ANSIBLE_VERSIONS} -_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version}-* +_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version} .endfor post-patch: |