From owner-svn-ports-all@freebsd.org Wed Jan 13 07:41:29 2016 Return-Path: Delivered-To: svn-ports-all@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 35029A80D8B; Wed, 13 Jan 2016 07:41:29 +0000 (UTC) (envelope-from matthew@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 E6C941849; Wed, 13 Jan 2016 07:41:28 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0D7fRif063028; Wed, 13 Jan 2016 07:41:27 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0D7fRAb063023; Wed, 13 Jan 2016 07:41:27 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201601130741.u0D7fRAb063023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Wed, 13 Jan 2016 07:41:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406016 - in head: . sysutils sysutils/ansible sysutils/ansible1 sysutils/ansible1/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2016 07:41:29 -0000 Author: matthew Date: Wed Jan 13 07:41:27 2016 New Revision: 406016 URL: https://svnweb.freebsd.org/changeset/ports/406016 Log: Upgrade ansible to 2.0.0 Provide an ansible1 slave port with ansible-1.9.4 as there are incompatible changes between ansible-1.9.4 and ansible-2.0.0 Add note in UPDATING PR: 206174 Submitted by: lifanov@mail.lifanov.com (maintainer) Added: head/sysutils/ansible1/ - copied from r406013, head/sysutils/ansible/ Deleted: head/sysutils/ansible1/files/ head/sysutils/ansible1/pkg-descr Modified: head/UPDATING head/sysutils/Makefile head/sysutils/ansible/Makefile head/sysutils/ansible/distinfo (contents, props changed) head/sysutils/ansible1/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jan 13 07:37:03 2016 (r406015) +++ head/UPDATING Wed Jan 13 07:41:27 2016 (r406016) @@ -5,6 +5,18 @@ 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. +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 Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Wed Jan 13 07:37:03 2016 (r406015) +++ head/sysutils/Makefile Wed Jan 13 07:41:27 2016 (r406016) @@ -31,6 +31,7 @@ SUBDIR += anacron SUBDIR += and SUBDIR += ansible + SUBDIR += ansible1 SUBDIR += apachetop SUBDIR += apcpwr SUBDIR += apcupsd Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Wed Jan 13 07:37:03 2016 (r406015) +++ head/sysutils/ansible/Makefile Wed Jan 13 07:41:27 2016 (r406016) @@ -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 @@ COMMENT= Radically simple IT automation 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 @@ PLIST_FILES+= man/man1/ansible-doc.1.gz 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 \ Modified: head/sysutils/ansible/distinfo ============================================================================== --- head/sysutils/ansible/distinfo Wed Jan 13 07:37:03 2016 (r406015) +++ head/sysutils/ansible/distinfo Wed Jan 13 07:41:27 2016 (r406016) @@ -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 Modified: head/sysutils/ansible1/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Wed Jan 13 06:58:37 2016 (r406013) +++ head/sysutils/ansible1/Makefile Wed Jan 13 07:41:27 2016 (r406016) @@ -1,68 +1,17 @@ -# Created by: Nikolai Lifanov -# $FreeBSD$ - -PORTNAME= ansible -PORTVERSION= 1.9.4 -PORTREVISION= 1 -CATEGORIES= sysutils python -MASTER_SITES= http://releases.ansible.com/ansible/ - -MAINTAINER= lifanov@mail.lifanov.com -COMMENT= Radically simple IT automation - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -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 - -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 \ - lib/ansible/modules/core/*/*/*.py \ - lib/ansible/modules/extras/*/*.py \ - lib/ansible/modules/extras/*/*/*.py -CPE_VENDOR= ansibleworks - -SUB_FILES= pkg-message - -PLIST_FILES+= man/man1/ansible-doc.1.gz \ - man/man1/ansible-galaxy.1.gz \ - man/man1/ansible-playbook.1.gz \ - man/man1/ansible-pull.1.gz \ - man/man1/ansible-vault.1.gz \ - man/man1/ansible.1.gz - -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 - @${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 \ - @${REINPLACE_CMD} -e 's|/usr/share/ansible|${DATADIR}|' ${WRKSRC}/${f} -.endfor - -post-install: - @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR} - -.include +--- sysutils/ansible1/Makefile ++++ sysutils/ansible1/Makefile +@@ -0,0 +1,14 @@ ++# Created by: Nikolai Lifanov ++# $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"