From 6dedc0c7432110cfcfd73a4e6e2ce18fe99665c6 Mon Sep 17 00:00:00 2001 From: Nikolai Lifanov Date: Mon, 5 Nov 2018 02:07:09 +0000 Subject: [PATCH] update sysutils/ansible* ports sysutils/ansible: 2.7.1 Changes: https://github.com/ansible/ansible/blob/v2.7.1/changelogs/CHANGELOG-v2.7.rst sysutils/ansible26: 2.6.7 Changes: https://github.com/ansible/ansible/blob/v2.6.7/changelogs/CHANGELOG-v2.6.rst sysutils/ansible25: 2.5.11 Changes: https://github.com/ansible/ansible/blob/v2.5.11/changelogs/CHANGELOG-v2.5.rst All ports: move default configuration directory back to LOCALBASE/etc/ansible as before the flavors conversion. Configuration is version-specific and not Python-specific and this is a more intuitive location. PR: 232377 Reported by: Tomoyuki Sakurai (default configuration path) --- UPDATING | 11 +++++++++++ sysutils/ansible/Makefile | 4 ++-- sysutils/ansible/distinfo | 6 +++--- sysutils/ansible1/Makefile | 2 +- sysutils/ansible23/Makefile | 2 +- sysutils/ansible24/Makefile | 1 + sysutils/ansible25/Makefile | 2 +- sysutils/ansible26/Makefile | 2 +- sysutils/ansible26/distinfo | 6 +++--- 9 files changed, 24 insertions(+), 12 deletions(-) diff --git a/UPDATING b/UPDATING index c579e512a86b..f3ae572eeb8c 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20181104: + AFFECTS: users of sysutils/ansible* + AUTHOR: lifanov@FreeBSD.org + + Default Ansible configuration location changed to LOCALBASE/etc/ansible + instead of a per-flavor directory. If you use system-wide Ansible + configuration, please migrate from a flavored directory to a common + one: + + # mv /usr/local/etc/py27-ansible /usr/local/etc/ansible + 20181031: AFFECTS: users of www/node AUTHOR: bhughes@FreeBSD.org diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index ebb9ddc92284..3c5c727169f9 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ansible -PORTVERSION?= 2.7.0 +PORTVERSION?= 2.7.1 PORTREVISION?= 0 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ @@ -60,7 +60,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES post-patch: ${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \ - -e 's|/etc/ansible|${ETCDIR}|g' \ + -e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \ -e 's|/usr/share/ansible|${DATADIR}|g' post-install: diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo index d1f53ab7ef88..baaa80666a43 100644 --- a/sysutils/ansible/distinfo +++ b/sysutils/ansible/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539564179 -SHA256 (ansible-2.7.0.tar.gz) = a1ab8e0f13e79a20661ad6546f45a142afeaeb664deb2c290e32362d8ae5b618 -SIZE (ansible-2.7.0.tar.gz) = 11773769 +TIMESTAMP = 1541385024 +SHA256 (ansible-2.7.1.tar.gz) = e7953472347fcc6dca10839111b576a9f790e00056344f2dcf448e6c452fe939 +SIZE (ansible-2.7.1.tar.gz) = 11738557 diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile index f6a81dcf96c2..354a47ee9f6b 100644 --- a/sysutils/ansible1/Makefile +++ b/sysutils/ansible1/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX= 1 PORTVERSION= 1.9.6 -PORTREVISION= 4 +PORTREVISION= 5 CONFLICTS= ansible-* \ ansible23-* \ diff --git a/sysutils/ansible23/Makefile b/sysutils/ansible23/Makefile index a3d0aaf9f483..16c9b0f1236b 100644 --- a/sysutils/ansible23/Makefile +++ b/sysutils/ansible23/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.3.3.0 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 23 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible24/Makefile b/sysutils/ansible24/Makefile index f241cca6c3a2..afab07c33375 100644 --- a/sysutils/ansible24/Makefile +++ b/sysutils/ansible24/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.4.6.0 +PORTREVISION= 1 PKGNAMESUFFIX= 24 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible25/Makefile b/sysutils/ansible25/Makefile index 83ced77471dd..c4fde3db9a68 100644 --- a/sysutils/ansible25/Makefile +++ b/sysutils/ansible25/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.5.9 +PORTVERSION= 2.5.11 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible26/Makefile b/sysutils/ansible26/Makefile index 82350c9e8c84..cfb30168bf55 100644 --- a/sysutils/ansible26/Makefile +++ b/sysutils/ansible26/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.6.5 +PORTVERSION= 2.6.7 PKGNAMESUFFIX= 26 CONFLICTS= ansible-* \ diff --git a/sysutils/ansible26/distinfo b/sysutils/ansible26/distinfo index 13aa4739800b..feec28ab77c9 100644 --- a/sysutils/ansible26/distinfo +++ b/sysutils/ansible26/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539565048 -SHA256 (ansible-2.6.5.tar.gz) = b33beec86e74bb4b9161260b73ed83c31018eff10929bdcbf28028af70fe4143 -SIZE (ansible-2.6.5.tar.gz) = 10757800 +TIMESTAMP = 1541385121 +SHA256 (ansible-2.6.7.tar.gz) = 003ae1df874cd3a2c12454dd8f073cecc03b8a10508d898367a3f134139fea82 +SIZE (ansible-2.6.7.tar.gz) = 10708387