Attachment #212681 for bug #241734

Lines 44-49 Link Here

(-)sysutils/Makefile (+1 lines)
44	SUBDIR += ansible25	44	SUBDIR += ansible25
45	SUBDIR += ansible26	45	SUBDIR += ansible26
46	SUBDIR += ansible27	46	SUBDIR += ansible27
		47	SUBDIR += ansible28
47	SUBDIR += anvil	48	SUBDIR += anvil
48	SUBDIR += apache-mesos	49	SUBDIR += apache-mesos
49	SUBDIR += apachetop	50	SUBDIR += apachetop




# $FreeBSD$

PORTNAME=	ansible
PORTVERSION?=	2.9.6
PORTREVISION?=	0
CATEGORIES=	sysutils python
MASTER_SITES=	http://releases.ansible.com/ansible/

		ansible25-* \
		ansible27-* \
		ansible26-* \
		ansible27-* \
		ansible28-*

EXTRA_PATCHES?=

NO_ARCH=	yes
USES?=		cpe python shebangfix
USE_PYTHON=	distutils autoplist concurrent
CPE_VENDOR=	ansibleworks

SHEBANG_FILES?=	\
		test/lib/ansible_test/_data/injector/python.py \
		test/lib/ansible_test/_data/versions.py \
		test/lib/ansible_test/_data/virtualenvcheck.py \
		test/lib/ansible_test/_data/yamlcheck.py \
		test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \
		test/lib/ansible_test/_data/sanity/import/importer.py \
		test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \
		test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py \
		test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py \
		test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py \
		test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \
		test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \
		test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \
		test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \
		test/lib/ansible_test/_data/sanity/code-smell/shebang.py \
		test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
		test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
		test/lib/ansible_test/_data/sanity/compile/compile.py \
		test/lib/ansible_test/_data/sanity/validate-modules/main.py

SUB_FILES=	pkg-message
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}


post-stage:
	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
		-execdir ${RLN} ansible-${PYTHON_VER} {} \;
	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory

TEST_WRKSRC=${WRKSRC}/test


Lines 1-3 Link Here

(-)sysutils/ansible/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577375349	1	TIMESTAMP = 1585020908
2	SHA256 (ansible-2.8.7.tar.gz) = 828239ca2b4d92865a00ab415caa932700f7c93f3e4838ddd55614ddf104c947	2	SHA256 (ansible-2.9.6.tar.gz) = 59cf3a0781f89992d1dae5205b07e802dff1db205eebd238de9e503b62b8cbc9
3	SIZE (ansible-2.8.7.tar.gz) = 12697144	3	SIZE (ansible-2.9.6.tar.gz) = 14201258




--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig	2018-10-25 02:45:26 UTC
+++ lib/ansible/module_utils/facts/virtual/freebsd.py
@@ -19,9 +19,10 @@ __metaclass__ = type
 import os
 
 from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector
+from ansible.module_utils.facts.virtual.sysctl import VirtualSysctlDetectionMixin
 
 
-class FreeBSDVirtual(Virtual):
+class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
     """
     This is a FreeBSD-specific subclass of Virtual.  It defines
     - virtualization_type
@@ -35,6 +36,9 @@ class FreeBSDVirtual(Virtual):
         virtual_facts['virtualization_type'] = ''
         virtual_facts['virtualization_role'] = ''
 
+        virtual_product_facts = self.detect_virt_product('hw.hv_vendor')
+        virtual_facts.update(virtual_product_facts)
+
         if os.path.exists('/dev/xen/xenstore'):
             virtual_facts['virtualization_type'] = 'xen'
             virtual_facts['virtualization_role'] = 'guest'
--- lib/ansible/modules/packaging/os/pkgng.py.orig	2018-10-24 02:17:26 UTC
+++ lib/ansible/modules/packaging/os/pkgng.py
@@ -201,13 +201,13 @@ def install_packages(module, pkgng_path,
 
     # This environment variable skips mid-install prompts,
     # setting them to their default values.
-    batch_var = 'env BATCH=yes'
+    batch_var = 'env BATCH=yes ASSUME_ALWAYS_YES=yes'
 
     if not module.check_mode and not cached:
         if old_pkgng:
-            rc, out, err = module.run_command("%s %s update" % (pkgsite, pkgng_path))
+            rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgsite, pkgng_path))
         else:
-            rc, out, err = module.run_command("%s %s update" % (pkgng_path, dir_arg))
+            rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgng_path, dir_arg))
         if rc != 0:
             module.fail_json(msg="Could not update catalogue")
 
--- lib/ansible/modules/storage/zfs/zfs.py.orig	2018-11-07 02:46:41 UTC
+++ lib/ansible/modules/storage/zfs/zfs.py
@@ -102,7 +102,7 @@ class Zfs(object):
         self.changed = False
         self.zfs_cmd = module.get_bin_path('zfs', True)
         self.zpool_cmd = module.get_bin_path('zpool', True)
-        self.pool = name.split('/')[0]
+        self.pool = name.split('@')[0].split('/')[0]
         self.is_solaris = os.uname()[0] == 'SunOS'
         self.is_openzfs = self.check_openzfs()
         self.enhanced_sharing = self.check_enhanced_sharing()
--- lib/ansible/playbook/play_context.py.orig	2018-10-10 00:56:07 UTC
+++ lib/ansible/playbook/play_context.py
@@ -528,8 +528,10 @@ class PlayContext(Base):
                 becomecmd = cmd
 
             elif self.become_method == 'doas':
+                def detect_doas_prompt(b_data):
+                    return re.match(b"[Pp]assword:", b_data)
 
-                prompt = 'doas (%s@' % self.remote_user
+                prompt = detect_doas_prompt
                 exe = self.become_exe or 'doas'
 
                 if not self.become_pass:

Lines 1-7 Link Here

(-)sysutils/ansible23/Makefile (-2 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTVERSION= 2.3.3.0	3	PORTVERSION= 2.3.3.0
4	PORTREVISION= 4	4	PORTREVISION= 5
5	PKGNAMESUFFIX= 23	5	PKGNAMESUFFIX= 23
6		6
7	CONFLICTS= ansible-* \	7	CONFLICTS= ansible-* \
Lines 9-19 Link Here
9	ansible24-* \	9	ansible24-* \
10	ansible25-* \	10	ansible25-* \
11	ansible26-* \	11	ansible26-* \
12	ansible27-*	12	ansible27-* \
		13	ansible28-*
13		14
14	MASTERDIR= ${.CURDIR}/../ansible	15	MASTERDIR= ${.CURDIR}/../ansible
15	DISTINFO_FILE= ${.CURDIR}/distinfo	16	DISTINFO_FILE= ${.CURDIR}/distinfo
16		17
		18	DEPRECATED= Upstream support ended
		19	EXPIRATION_DATE=2020-04-24
		20
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \	21	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
Lines 29-34 Link Here
29	man/man1/ansible-vault.1.gz \	33	man/man1/ansible-vault.1.gz \
30	man/man1/ansible.1.gz	34	man/man1/ansible.1.gz
31		35
		36	USES= cpe python
32	EXTRA_PATCHES=	37	EXTRA_PATCHES=
33		38
34	.include "${MASTERDIR}/Makefile"	39	.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTVERSION=	2.4.6.0
PORTREVISION=	4
PKGNAMESUFFIX=	24

CONFLICTS=	ansible-* \

		ansible23-* \
		ansible25-* \
		ansible26-* \
		ansible27-* \
		ansible28-*

MASTERDIR=	${.CURDIR}/../ansible
DISTINFO_FILE=	${.CURDIR}/distinfo

DEPRECATED=	Upstream support ended
EXPIRATION_DATE=2020-04-24

USES=		cpe python
EXTRA_PATCHES=

.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTVERSION=	2.5.15
PORTREVISION=	3
PKGNAMESUFFIX=	25

CONFLICTS=	ansible-* \

		ansible23-* \
		ansible24-* \
		ansible26-* \
		ansible27-* \
		ansible28-*

MASTERDIR=	${.CURDIR}/../ansible
DISTINFO_FILE=	${.CURDIR}/distinfo

DEPRECATED=	Upstream support ended
EXPIRATION_DATE=2020-04-24

USES=		cpe python
EXTRA_PATCHES=

.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTVERSION=	2.6.20
PORTREVISION=	1
PKGNAMESUFFIX=	26

CONFLICTS=	ansible-* \

		ansible23-* \
		ansible24-* \
		ansible25-* \
		ansible27-* \
		ansible28-*

MASTERDIR=	${.CURDIR}/../ansible
DISTINFO_FILE=	${.CURDIR}/distinfo

DEPRECATED=	Upstream support ended
EXPIRATION_DATE=2020-04-24

USES=		cpe python
EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu

.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTVERSION=	2.7.16
PKGNAMESUFFIX=	27

CONFLICTS=	ansible-* \

		ansible23-* \
		ansible24-* \
		ansible25-* \
		ansible26-* \
		ansible28-*

MASTERDIR=	${.CURDIR}/../ansible
DISTINFO_FILE=	${.CURDIR}/distinfo

USES=		cpe python
EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu \
		${FILESDIR}/extra-patch-27
.include "${MASTERDIR}/Makefile"

Lines 1-3 Link Here

(-)sysutils/ansible27/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577375263	1	TIMESTAMP = 1585014421
2	SHA256 (ansible-2.7.15.tar.gz) = 99bf683d069b3f73704182ece95b6618ae2090594a66e146f4d286c0cac858ce	2	SHA256 (ansible-2.7.16.tar.gz) = bb4a95a3e1a0f9e1aabd8cf628de68f5218fba3057b970b6b3c41cc53ab06268
3	SIZE (ansible-2.7.15.tar.gz) = 10205890	3	SIZE (ansible-2.7.16.tar.gz) = 10206620




# $FreeBSD$

PORTVERSION=	2.8.10
PKGNAMESUFFIX=	28

CONFLICTS=	ansible-* \
		ansible1-* \
		ansible23-* \
		ansible24-* \
		ansible25-* \
		ansible26-* \
		ansible27-*

MASTERDIR=	${.CURDIR}/../ansible
DISTINFO_FILE=	${.CURDIR}/distinfo

USES=		cpe python
EXTRA_PATCHES=

.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)sysutils/ansible28/distinfo (+3 lines)
	1	TIMESTAMP = 1585012493
	2	SHA256 (ansible-2.8.10.tar.gz) = 72449a3dde4142c79ef607dc6a2a02995b1c96f75d0ef5beffd00f3dfa6f93a6
	3	SIZE (ansible-2.8.10.tar.gz) = 12705261




You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20200325:
  AFFECTS: users of sysutils/ansible
  AUTHOR: bofh@FreeBSD.org

  Ansible has been updated to 2.9.6. Please follow the porting guide
  to update the rulesets:

  https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.9.html

  If you wish to stay with 2.8 version, you can switch
  to new sysutils/ansible28 port, which tracks stable 2.8 branch:

  # pkg set -n ansible:ansible28

20200320
  AFFECTS: users of devel/qca
  AUTHOR: kde@FreeBSD.org

Return to bug 241734

Lines 1-7 Link Here

(-)sysutils/ansible/Makefile (-3 / +36 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ansible	3	PORTNAME= ansible
4	PORTVERSION?= 2.8.7	4	PORTVERSION?= 2.9.6
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= http://releases.ansible.com/ansible/	7	MASTER_SITES= http://releases.ansible.com/ansible/
Lines 34-48 Link Here
34	ansible25-* \	34	ansible25-* \
35	ansible27-* \	35	ansible27-* \
36	ansible26-* \	36	ansible26-* \
37	ansible27-*	37	ansible27-* \
		38	ansible28-*
38		39
39	EXTRA_PATCHES?=	40	EXTRA_PATCHES?=
40		41
41	NO_ARCH= yes	42	NO_ARCH= yes
42	USES?= cpe python	43	USES?= cpe python shebangfix
43	USE_PYTHON= distutils autoplist concurrent	44	USE_PYTHON= distutils autoplist concurrent
44	CPE_VENDOR= ansibleworks	45	CPE_VENDOR= ansibleworks
45		46
		47	SHEBANG_FILES?= \
		48	test/lib/ansible_test/_data/injector/python.py \
		49	test/lib/ansible_test/_data/versions.py \
		50	test/lib/ansible_test/_data/virtualenvcheck.py \
		51	test/lib/ansible_test/_data/yamlcheck.py \
		52	test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \
		53	test/lib/ansible_test/_data/sanity/import/importer.py \
		54	test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \
		55	test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py \
		56	test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \
		57	test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py \
		58	test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py \
		59	test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \
		60	test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py \
		61	test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \
		62	test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py \
		63	test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \
		64	test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \
		65	test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \
		66	test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \
		67	test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \
		68	test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \
		69	test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \
		70	test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \
		71	test/lib/ansible_test/_data/sanity/code-smell/shebang.py \
		72	test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
		73	test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
		74	test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
		75	test/lib/ansible_test/_data/sanity/compile/compile.py \
		76	test/lib/ansible_test/_data/sanity/validate-modules/main.py
		77
46	SUB_FILES= pkg-message	78	SUB_FILES= pkg-message
47	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}	79	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
48		80
Lines 79-84 Link Here
79	post-stage:	111	post-stage:
80	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \	112	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
81	-execdir ${RLN} ansible-${PYTHON_VER} {} \;	113	-execdir ${RLN} ansible-${PYTHON_VER} {} \;
		114	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
82		115
83	TEST_WRKSRC=${WRKSRC}/test	116	TEST_WRKSRC=${WRKSRC}/test
84		117

Line 0 Link Here

(-)sysutils/ansible/files/extra-patch-27 (+68 lines)
		1	--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig 2018-10-25 02:45:26 UTC
		2	+++ lib/ansible/module_utils/facts/virtual/freebsd.py
		3	@@ -19,9 +19,10 @@ __metaclass__ = type
		4	import os
		5
		6	from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector
		7	+from ansible.module_utils.facts.virtual.sysctl import VirtualSysctlDetectionMixin
		8
		9
		10	-class FreeBSDVirtual(Virtual):
		11	+class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
		12	"""
		13	This is a FreeBSD-specific subclass of Virtual. It defines
		14	- virtualization_type
		15	@@ -35,6 +36,9 @@ class FreeBSDVirtual(Virtual):
		16	virtual_facts['virtualization_type'] = ''
		17	virtual_facts['virtualization_role'] = ''
		18
		19	+ virtual_product_facts = self.detect_virt_product('hw.hv_vendor')
		20	+ virtual_facts.update(virtual_product_facts)
		21	+
		22	if os.path.exists('/dev/xen/xenstore'):
		23	virtual_facts['virtualization_type'] = 'xen'
		24	virtual_facts['virtualization_role'] = 'guest'
		25	--- lib/ansible/modules/packaging/os/pkgng.py.orig 2018-10-24 02:17:26 UTC
		26	+++ lib/ansible/modules/packaging/os/pkgng.py
		27	@@ -201,13 +201,13 @@ def install_packages(module, pkgng_path,
		28
		29	# This environment variable skips mid-install prompts,
		30	# setting them to their default values.
		31	- batch_var = 'env BATCH=yes'
		32	+ batch_var = 'env BATCH=yes ASSUME_ALWAYS_YES=yes'
		33
		34	if not module.check_mode and not cached:
		35	if old_pkgng:
		36	- rc, out, err = module.run_command("%s %s update" % (pkgsite, pkgng_path))
		37	+ rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgsite, pkgng_path))
		38	else:
		39	- rc, out, err = module.run_command("%s %s update" % (pkgng_path, dir_arg))
		40	+ rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgng_path, dir_arg))
		41	if rc != 0:
		42	module.fail_json(msg="Could not update catalogue")
		43
		44	--- lib/ansible/modules/storage/zfs/zfs.py.orig 2018-11-07 02:46:41 UTC
		45	+++ lib/ansible/modules/storage/zfs/zfs.py
		46	@@ -102,7 +102,7 @@ class Zfs(object):
		47	self.changed = False
		48	self.zfs_cmd = module.get_bin_path('zfs', True)
		49	self.zpool_cmd = module.get_bin_path('zpool', True)
		50	- self.pool = name.split('/')[0]
		51	+ self.pool = name.split('@')[0].split('/')[0]
		52	self.is_solaris = os.uname()[0] == 'SunOS'
		53	self.is_openzfs = self.check_openzfs()
		54	self.enhanced_sharing = self.check_enhanced_sharing()
		55	--- lib/ansible/playbook/play_context.py.orig 2018-10-10 00:56:07 UTC
		56	+++ lib/ansible/playbook/play_context.py
		57	@@ -528,8 +528,10 @@ class PlayContext(Base):
		58	becomecmd = cmd
		59
		60	elif self.become_method == 'doas':
		61	+ def detect_doas_prompt(b_data):
		62	+ return re.match(b"[Pp]assword:", b_data)
		63
		64	- prompt = 'doas (%s@' % self.remote_user
65	+ prompt = detect_doas_prompt
66	exe = self.become_exe or 'doas'
67
68	if not self.become_pass:

Lines 1-7 Link Here

(-)sysutils/ansible24/Makefile (-2 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTVERSION= 2.4.6.0	3	PORTVERSION= 2.4.6.0
4	PORTREVISION= 3	4	PORTREVISION= 4
5	PKGNAMESUFFIX= 24	5	PKGNAMESUFFIX= 24
6		6
7	CONFLICTS= ansible-* \	7	CONFLICTS= ansible-* \
Lines 9-19 Link Here
9	ansible23-* \	9	ansible23-* \
10	ansible25-* \	10	ansible25-* \
11	ansible26-* \	11	ansible26-* \
12	ansible27-*	12	ansible27-* \
		13	ansible28-*
13		14
14	MASTERDIR= ${.CURDIR}/../ansible	15	MASTERDIR= ${.CURDIR}/../ansible
15	DISTINFO_FILE= ${.CURDIR}/distinfo	16	DISTINFO_FILE= ${.CURDIR}/distinfo
16		17
		18	DEPRECATED= Upstream support ended
		19	EXPIRATION_DATE=2020-04-24
		20
		21	USES= cpe python
17	EXTRA_PATCHES=	22	EXTRA_PATCHES=
18		23
19	.include "${MASTERDIR}/Makefile"	24	.include "${MASTERDIR}/Makefile"

Lines 1-7 Link Here

(-)sysutils/ansible25/Makefile (-2 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTVERSION= 2.5.15	3	PORTVERSION= 2.5.15
4	PORTREVISION= 2	4	PORTREVISION= 3
5	PKGNAMESUFFIX= 25	5	PKGNAMESUFFIX= 25
6		6
7	CONFLICTS= ansible-* \	7	CONFLICTS= ansible-* \
Lines 9-19 Link Here
9	ansible23-* \	9	ansible23-* \
10	ansible24-* \	10	ansible24-* \
11	ansible26-* \	11	ansible26-* \
12	ansible27-*	12	ansible27-* \
		13	ansible28-*
13		14
14	MASTERDIR= ${.CURDIR}/../ansible	15	MASTERDIR= ${.CURDIR}/../ansible
15	DISTINFO_FILE= ${.CURDIR}/distinfo	16	DISTINFO_FILE= ${.CURDIR}/distinfo
16		17
		18	DEPRECATED= Upstream support ended
		19	EXPIRATION_DATE=2020-04-24
		20
		21	USES= cpe python
17	EXTRA_PATCHES=	22	EXTRA_PATCHES=
18		23
19	.include "${MASTERDIR}/Makefile"	24	.include "${MASTERDIR}/Makefile"

Lines 1-6 Link Here

(-)sysutils/ansible26/Makefile (-1 / +7 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTVERSION= 2.6.20	3	PORTVERSION= 2.6.20
		4	PORTREVISION= 1
4	PKGNAMESUFFIX= 26	5	PKGNAMESUFFIX= 26
5		6
6	CONFLICTS= ansible-* \	7	CONFLICTS= ansible-* \
Lines 8-18 Link Here
8	ansible23-* \	9	ansible23-* \
9	ansible24-* \	10	ansible24-* \
10	ansible25-* \	11	ansible25-* \
11	ansible27-*	12	ansible27-* \
		13	ansible28-*
12		14
13	MASTERDIR= ${.CURDIR}/../ansible	15	MASTERDIR= ${.CURDIR}/../ansible
14	DISTINFO_FILE= ${.CURDIR}/distinfo	16	DISTINFO_FILE= ${.CURDIR}/distinfo
15		17
		18	DEPRECATED= Upstream support ended
		19	EXPIRATION_DATE=2020-04-24
		20
		21	USES= cpe python
16	EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu	22	EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu
17		23
18	.include "${MASTERDIR}/Makefile"	24	.include "${MASTERDIR}/Makefile"

Lines 1-6 Link Here

(-)sysutils/ansible27/Makefile (-4 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTVERSION= 2.7.15	3	PORTVERSION= 2.7.16
4	PKGNAMESUFFIX= 27	4	PKGNAMESUFFIX= 27
5		5
6	CONFLICTS= ansible-* \	6	CONFLICTS= ansible-* \
Lines 8-18 Link Here
8	ansible23-* \	8	ansible23-* \
9	ansible24-* \	9	ansible24-* \
10	ansible25-* \	10	ansible25-* \
11	ansible26-*	11	ansible26-* \
		12	ansible28-*
12		13
13	MASTERDIR= ${.CURDIR}/../ansible	14	MASTERDIR= ${.CURDIR}/../ansible
14	DISTINFO_FILE= ${.CURDIR}/distinfo	15	DISTINFO_FILE= ${.CURDIR}/distinfo
15		16
16	EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu	17	USES= cpe python
17		18	EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu \
		19	${FILESDIR}/extra-patch-27
18	.include "${MASTERDIR}/Makefile"	20	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)sysutils/ansible28/Makefile (+20 lines)
	1	# $FreeBSD$
	2
	3	PORTVERSION= 2.8.10
	4	PKGNAMESUFFIX= 28
	5
	6	CONFLICTS= ansible-* \
	7	ansible1-* \
	8	ansible23-* \
	9	ansible24-* \
	10	ansible25-* \
	11	ansible26-* \
	12	ansible27-*
	13
	14	MASTERDIR= ${.CURDIR}/../ansible
	15	DISTINFO_FILE= ${.CURDIR}/distinfo
	16
	17	USES= cpe python
	18	EXTRA_PATCHES=
	19
	20	.include "${MASTERDIR}/Makefile"

Lines 5-10 Link Here

(-)UPDATING (+14 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20200325:
		9	AFFECTS: users of sysutils/ansible
		10	AUTHOR: bofh@FreeBSD.org
		11
		12	Ansible has been updated to 2.9.6. Please follow the porting guide
		13	to update the rulesets:
		14
		15	https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.9.html
		16
		17	If you wish to stay with 2.8 version, you can switch
		18	to new sysutils/ansible28 port, which tracks stable 2.8 branch:
		19
		20	# pkg set -n ansible:ansible28
		21
8	20200320	22	20200320
9	AFFECTS: users of devel/qca	23	AFFECTS: users of devel/qca
10	AUTHOR: kde@FreeBSD.org	24	AUTHOR: kde@FreeBSD.org