Date: Thu, 6 May 2021 13:05:33 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 99e2caed690b - main - sysutils/ansible*: Update pkg-message Message-ID: <202105061305.146D5XRp020649@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=99e2caed690b979cba3c80c4a73e453474712970 commit 99e2caed690b979cba3c80c4a73e453474712970 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-06 12:47:15 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-06 13:03:40 +0000 sysutils/ansible*: Update pkg-message The old pkg-message was outdated and commands listed there invalid. It's fixed now. It should be more future-proof this time. --- sysutils/ansible/Makefile | 4 +++- sysutils/ansible/files/pkg-message.in | 12 ++++++------ sysutils/ansible27/Makefile | 2 +- sysutils/ansible28/Makefile | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 0e70400cdb6f..43befaa18907 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,6 +1,6 @@ PORTNAME= ansible PORTVERSION?= 2.9.21 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -45,6 +45,8 @@ CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} EXTRA_PATCHES?= NO_ARCH= yes SUB_FILES= pkg-message +SUB_LIST= MAJMINVER=${PORTVERSION:R} \ + PYTHON_PKGNAMEPREFIX=${PYTHON_PKGNAMEPREFIX} PLIST_FILES?= man/man1/ansible-config.1.gz \ man/man1/ansible-console.1.gz \ diff --git a/sysutils/ansible/files/pkg-message.in b/sysutils/ansible/files/pkg-message.in index 5a180d342ebb..07ec89d35d18 100644 --- a/sysutils/ansible/files/pkg-message.in +++ b/sysutils/ansible/files/pkg-message.in @@ -13,18 +13,18 @@ type: install } { message: <<EOD -Ansible has been updated to 2.8. Please follow the porting guide +Ansible has been updated to %%MAJMINVER%%. Please follow the porting guide to update the rulesets: -https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.8.html + https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_%%MAJMINVER%%.html -If you wish to stay with 2.7 version, you can switch -to new sysutils/ansible27 port, which tracks stable 2.7 branch: +In order to stay with an older version instead, e.g., 2.7, use pkg-set(8). +For example: -# pkg set -n ansible:ansible27 + # pkg set -n %%PYTHON_PKGNAMEPREFIX%%ansible:%%PYTHON_PKGNAMEPREFIX%%ansible27 EOD -maximum_version: "2.8" +maximum_version: "%%MAJMINVER%%" type: upgrade } ] diff --git a/sysutils/ansible27/Makefile b/sysutils/ansible27/Makefile index e0797bffa9d8..2c316b7677d0 100644 --- a/sysutils/ansible27/Makefile +++ b/sysutils/ansible27/Makefile @@ -1,5 +1,5 @@ PORTVERSION= 2.7.18 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 27 MASTERDIR= ${.CURDIR}/../ansible diff --git a/sysutils/ansible28/Makefile b/sysutils/ansible28/Makefile index 1de06a81b415..bbdfc4d519a3 100644 --- a/sysutils/ansible28/Makefile +++ b/sysutils/ansible28/Makefile @@ -1,5 +1,5 @@ PORTVERSION= 2.8.20 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 28 MASTERDIR= ${.CURDIR}/../ansible
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105061305.146D5XRp020649>