- Update to 1.5.4, announce message is here:

- Security fix for safe_eval, which further hardens the checking of
    the evaluation function.
  - Changing order of variable precendence for system facts, to ensure
    that inventory variables take precedence over any facts that may be
    set on a host.

- Change Makefile header, add Created by
- Change master sites, add icon
- Simplify REINPLACE
- Add Desktop entry file

PR:		ports/188209
Submitted by:	Nikolai Lifanov <lifanov@mail.lifanov.com>

sysutils/ansible/Makefile

@@ -1,8 +1,13 @@
+# Created by: Nikolai Lifanov <lifanov@mail.lifanov.com>
 # $FreeBSD$
 
 PORTNAME=	ansible
-PORTVERSION=	1.5.3
+PORTVERSION=	1.5.4
 CATEGORIES=	sysutils python
+MASTER_SITES=	SF/lifanov-ports-distfiles/sysutils/${PORTNAME}/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lifanov@mail.lifanov.com
 COMMENT=	Simple ssh-based configuration management and orchestration system
@@ -21,9 +26,10 @@ ACCELERATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/p
 			${PYTHON_PKGNAMEPREFIX}keyczar>0:${PORTSDIR}/security/py-keyczar
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	ansible
+GH_ACCOUNT=	${PORTNAME}
-GH_TAGNAME=	v${DISTVERSION}
+GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	6ae58a9
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	036c819
 
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
@@ -34,32 +40,32 @@ SHEBANG_FILES=	library/*/* \
 		lib/ansible/runner/action_plugins/synchronize.py
 
 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.1.gz
+		man/man1/ansible-vault.1.gz \
+		man/man1/ansible.1.gz \
+		${DESKTOPDIR}/${PORTNAME}.desktop \
+		share/pixmaps/${PORTNAME}.png
 
 PORTEXAMPLES=	ansible.cfg hosts
 
 post-patch:
-	@${REINPLACE_CMD} -i -e "s|/etc/ansible|${ETCDIR}|" \
+.for f in bin/ansible-galaxy docs/man/man1/ansible-playbook.1 \
-		${WRKSRC}/bin/ansible-galaxy \
+	docs/man/man1/ansible.1 examples/ansible.cfg \
-		${WRKSRC}/docs/man/man1/ansible-playbook.1 \
+	examples/hosts lib/ansible/constants.py \
-		${WRKSRC}/docs/man/man1/ansible.1 \
+	lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py \
-		${WRKSRC}/examples/ansible.cfg \
+	library/system/setup
-		${WRKSRC}/examples/hosts \
+	@${REINPLACE_CMD} -e 's|/etc/ansible|${ETCDIR}|' ${WRKSRC}/${f}
-		${WRKSRC}/lib/ansible/constants.py \
+.endfor
-		${WRKSRC}/lib/ansible/playbook/__init__.py \
+
-		${WRKSRC}/lib/ansible/runner/__init__.py \
+.for f in docs/man/man1/ansible-playbook.1 docs/man/man1/ansible.1 \
-		${WRKSRC}/library/system/setup
+	examples/ansible.cfg lib/ansible/constants.py \
-	@${REINPLACE_CMD} -i -e "s|/usr/share/ansible|${DATADIR}|" \
+	lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py
-		${WRKSRC}/docs/man/man1/ansible-playbook.1 \
+	@${REINPLACE_CMD} -e 's|/usr/share/ansible|${DATADIR}|' ${WRKSRC}/${f}
-		${WRKSRC}/docs/man/man1/ansible.1 \
+.endfor
-		${WRKSRC}/examples/ansible.cfg \
-		${WRKSRC}/lib/ansible/constants.py \
-		${WRKSRC}/lib/ansible/playbook/__init__.py \
-		${WRKSRC}/lib/ansible/runner/__init__.py
-	@${RM}	${WRKSRC}/library/system/setup-e
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
@@ -68,5 +74,9 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>

sysutils/ansible/distinfo

@@ -1,2 +1,4 @@
-SHA256 (ansible-1.5.3.tar.gz) = 3b3f5a0410124ad5a432b1e8125fcd27118597af429f05e58e712ae2a9212539
+SHA256 (ansible-1.5.4.tar.gz) = 71cbe162ead87b044696166d6f74bf675f2f13246fba213ace3c6d93b40dffe0
-SIZE (ansible-1.5.3.tar.gz) = 1035170
+SIZE (ansible-1.5.4.tar.gz) = 1141916
+SHA256 (ansible.png) = 9bf68abd2c95db4dc8dfc091c0e0e0a9716891f28d157e3f04e541d96e1c6850
+SIZE (ansible.png) = 1160

sysutils/ansible/files/ansible.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=ansible
+GenericName=ansible
+Comment=Simple ssh-based configuration management and orchestration system
+Icon=ansible
+Exec=ansible
+Categories=System;ConsoleOnly;
+Terminal=true

sysutils/ansible/files/pkg-message.in

@@ -1,3 +1,4 @@
+===============================================================================
 
 To use Ansible, you need at least a host database.
 If you installed examples, you will have a sample
@@ -20,3 +21,5 @@ that system. Example:
 
   [centos:var]
   ansible_python_interpreter=/usr/bin/python
+
+===============================================================================