Index: UPDATING
===================================================================
--- UPDATING	(revision 405904)
+++ UPDATING	(working copy)
@@ -5,6 +5,18 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+201601XX:
+  AFFECTS: users of sysutils/ansible
+  AUTHOR: lifanov@mail.lifanov.com
+
+  Ansible 2.0.0 introduces a number of incompatible configuration changes.
+  Please read changelog and migrate current configuration:
+
+  https://raw.githubusercontent.com/ansible/ansible/v2.0.0.0-1/CHANGELOG.md
+
+  Ansible 1.9.* will be provided as sysutils/ansible1 until the next update
+  of 2.0 branch.
+
 20160111:
   AFFECTS: users of security/easy-rsa
   AUTHOR: mandree@FreeBSD.org
Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile	(revision 405904)
+++ sysutils/Makefile	(working copy)
@@ -31,6 +31,7 @@
     SUBDIR += anacron
     SUBDIR += and
     SUBDIR += ansible
+    SUBDIR += ansible1
     SUBDIR += apachetop
     SUBDIR += apcpwr
     SUBDIR += apcupsd
Index: sysutils/ansible/Makefile
===================================================================
--- sysutils/ansible/Makefile	(revision 405904)
+++ sysutils/ansible/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ansible
-PORTVERSION=	1.9.4
-PORTREVISION=	1
+PORTVERSION?=	2.0.0.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://releases.ansible.com/ansible/
 
@@ -13,19 +12,23 @@
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS+=	a2x:${PORTSDIR}/textproc/asciidoc \
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2
 
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_ARCH=	yes
 USES=		cpe python:2 shebangfix
 USE_PYTHON=	autoplist distutils
 python_CMD=	${LOCALBASE}/bin/python
-SHEBANG_FILES=	lib/ansible/runner/action_plugins/synchronize.py \
-		lib/ansible/modules/core/*/*.py \
+SHEBANG_FILES+=	lib/ansible/modules/core/*/*.py \
 		lib/ansible/modules/core/*/*/*.py \
 		lib/ansible/modules/extras/*/*.py \
 		lib/ansible/modules/extras/*/*/*.py
@@ -43,20 +46,23 @@
 PORTEXAMPLES=	ansible.cfg hosts
 
 post-patch:
-.for f in bin/ansible-galaxy docs/man/man1/ansible-galaxy.1 \
-	docs/man/man1/ansible-playbook.1 docs/man/man1/ansible.1 \
-	examples/ansible.cfg examples/hosts lib/ansible/constants.py \
-	lib/ansible/module_utils/urls.py lib/ansible/modules/core/system/setup.py \
-	lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py
+.for f in bin/* docs/man/man1/* examples/* lib/ansible/*.py \
+	lib/ansible/*/*.py lib/ansible/*/*/*.py lib/ansible/*/*/*/*.py
 	@${REINPLACE_CMD} -e 's|/etc/ansible|${ETCDIR}|' ${WRKSRC}/${f}
 .endfor
 
-.for f in docs/man/man1/ansible-playbook.1 docs/man/man1/ansible.1 \
-	examples/ansible.cfg lib/ansible/constants.py \
-	lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py \
+.for f in docs/man/man1/* examples/* lib/ansible/*.py lib/ansible/*/*.py
 	@${REINPLACE_CMD} -e 's|/usr/share/ansible|${DATADIR}|' ${WRKSRC}/${f}
 .endfor
 
+post-build:
+.for f in ansible-doc ansible-galaxy ansible-playbook ansible-pull \
+	ansible-vault ansible
+	${LOCALBASE}/bin/a2x -d manpage -f manpage -L \
+		${WRKSRC}/docs/man/man1/${f}.1.asciidoc.in
+	${RM} ${WRKSRC}/docs/man/man1/${f}.1.asciidoc.in
+.endfor
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \
Index: sysutils/ansible/distinfo
===================================================================
--- sysutils/ansible/distinfo	(revision 405904)
+++ sysutils/ansible/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (ansible-1.9.4.tar.gz) = 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3
-SIZE (ansible-1.9.4.tar.gz) = 937120
+SHA256 (ansible-2.0.0.0.tar.gz) = 63a9386ae96bd6ae3e87b9e9fecef3f3f919f333ed8db22292e37df7643cb3f6
+SIZE (ansible-2.0.0.0.tar.gz) = 1512605
Index: sysutils/ansible1/Makefile
===================================================================
--- sysutils/ansible1/Makefile	(nonexistent)
+++ sysutils/ansible1/Makefile	(working copy)
@@ -0,0 +1,14 @@
+# Created by: Nikolai Lifanov <lifanov@mail.lifanov.com>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	1
+PORTVERSION=	1.9.4
+
+CONFLICTS=	ansible-*
+
+MASTERDIR=	${.CURDIR}/../ansible
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+SHEBANG_FILES=	lib/ansible/runner/action_plugins/synchronize.py
+
+.include "${MASTERDIR}/Makefile"
Index: sysutils/ansible1/distinfo
===================================================================
--- sysutils/ansible1/distinfo	(nonexistent)
+++ sysutils/ansible1/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (ansible-1.9.4.tar.gz) = 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3
+SIZE (ansible-1.9.4.tar.gz) = 937120