svn commit: r455233 - in head/sysutils: . ansible ansible1 ansible23

[Nikolai Lifanov]

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