From owner-svn-ports-head@freebsd.org  Thu Nov 30 21:34:44 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48382DBB888;
 Thu, 30 Nov 2017 21:34:44 +0000 (UTC)
 (envelope-from lifanov@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 137D8773C0;
 Thu, 30 Nov 2017 21:34:44 +0000 (UTC)
 (envelope-from lifanov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAULYhZ7049021;
 Thu, 30 Nov 2017 21:34:43 GMT (envelope-from lifanov@FreeBSD.org)
Received: (from lifanov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAULYgsM049018;
 Thu, 30 Nov 2017 21:34:42 GMT (envelope-from lifanov@FreeBSD.org)
Message-Id: <201711302134.vAULYgsM049018@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lifanov set sender to
 lifanov@FreeBSD.org using -f
From: Nikolai Lifanov <lifanov@FreeBSD.org>
Date: Thu, 30 Nov 2017 21:34:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455233 - in head/sysutils: . ansible ansible1 ansible23
X-SVN-Group: ports-head
X-SVN-Commit-Author: lifanov
X-SVN-Commit-Paths: in head/sysutils: . ansible ansible1 ansible23
X-SVN-Commit-Revision: 455233
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 21:34:44 -0000

Author: lifanov
Date: Thu Nov 30 21:34:42 2017
New Revision: 455233
URL: https://svnweb.freebsd.org/changeset/ports/455233

Log:
  reinstate sysutils/ansible23
  
  PKGBASE collision has been resolved
  This reverts r455222

Added:
  head/sysutils/ansible23/
     - copied from r455221, head/sysutils/ansible23/
Modified:
  head/sysutils/Makefile
  head/sysutils/ansible/Makefile
  head/sysutils/ansible1/Makefile

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Thu Nov 30 21:32:27 2017	(r455232)
+++ head/sysutils/Makefile	Thu Nov 30 21:34:42 2017	(r455233)
@@ -39,6 +39,7 @@
     SUBDIR += android-file-transfer-qt5
     SUBDIR += ansible
     SUBDIR += ansible1
+    SUBDIR += ansible23
     SUBDIR += anvil
     SUBDIR += apachetop
     SUBDIR += apcpwr

Modified: head/sysutils/ansible/Makefile
==============================================================================
--- head/sysutils/ansible/Makefile	Thu Nov 30 21:32:27 2017	(r455232)
+++ head/sysutils/ansible/Makefile	Thu Nov 30 21:34:42 2017	(r455233)
@@ -20,6 +20,8 @@ RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 
+CONFLICTS?=	ansible1-* ansible23-*
+
 EXTRA_PATCHES?=	#
 
 NO_ARCH=	yes

Modified: head/sysutils/ansible1/Makefile
==============================================================================
--- head/sysutils/ansible1/Makefile	Thu Nov 30 21:32:27 2017	(r455232)
+++ head/sysutils/ansible1/Makefile	Thu Nov 30 21:34:42 2017	(r455233)
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	1
 PORTVERSION=	1.9.6
 PORTREVISION=	1
 
-CONFLICTS=	ansible-*
+CONFLICTS=	ansible-* ansible23-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo