sysutils/ansible-iocage: Update to latest commit

While here, remove orphaned patch[1] and appease port{fmt,clippy}.

Reported by:            [1] ak
Approved by:            fernape (mentor)
Differential Revision:	https://reviews.freebsd.org/D29472

3 files changed, 18 insertions, 39 deletions

diff --git a/sysutils/ansible-iocage/Makefile b/sysutils/ansible-iocage/Makefile
index 3fe77e7602a1..387a9dd42828 100644
--- a/sysutils/ansible-iocage/Makefile
+++ b/sysutils/ansible-iocage/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ansible-iocage
-DISTVERSION=	0.1
+DISTVERSION=	g20200327
+PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -14,23 +15,28 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLAVOR}
 
 USES=		python shebangfix
-SHEBANG_FILES=	iocage
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	fractalcells
-GH_PROJECT=	ansible-iocage
-GH_TAGNAME=	b8114ae6670fefddf0612801fd16030595c24bb2
+GH_TAGNAME=	0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d
+SHEBANG_FILES=	iocage
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
+_ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
+PLIST_FILES=	${_ANSIBLE_MOD}/iocage
+PORTDOCS=	README.md
 
-PLIST_FILES=	${ANSIBLE_MOD}/iocage
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}
 	${INSTALL_SCRIPT} ${WRKSRC}/iocage \
-		${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}/iocage
+		${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}/iocage
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/ansible-iocage/distinfo b/sysutils/ansible-iocage/distinfo
index c641aafe7a41..8376a3cbfb63 100644
--- a/sysutils/ansible-iocage/distinfo
+++ b/sysutils/ansible-iocage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569417146
-SHA256 (fractalcells-ansible-iocage-0.1-b8114ae6670fefddf0612801fd16030595c24bb2_GH0.tar.gz) = 422e32f7cf34266a5b2ba1722d4e316aab2581a0a0087cb844a976f81bed86fd
-SIZE (fractalcells-ansible-iocage-0.1-b8114ae6670fefddf0612801fd16030595c24bb2_GH0.tar.gz) = 7786
+TIMESTAMP = 1616943495
+SHA256 (fractalcells-ansible-iocage-g20200327-0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d_GH0.tar.gz) = 65a91355bf9105901ac90ea6a456e13cfd6d2b90d9922d09dd4cb463c3163e75
+SIZE (fractalcells-ansible-iocage-g20200327-0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d_GH0.tar.gz) = 7932
diff --git a/sysutils/ansible-iocage/patch-iocage b/sysutils/ansible-iocage/patch-iocage
deleted file mode 100644
index 23a7bfa0d97d..000000000000
--- a/sysutils/ansible-iocage/patch-iocage
+++ /dev/null
@@ -1,27 +0,0 @@
-See: https://github.com/fractalcells/ansible-iocage/pull/18
---- iocage.orig	2019-11-03 14:19:54 UTC
-+++ iocage
-@@ -148,10 +148,11 @@ def _get_iocage_facts(module, iocage_path, argument="a
-                 # non-iocage jails: skip all
-                 break
-             elif re.match('(\d+|-)',_jid):
--                if l.count('\t') == 10:
--                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template,_basejail) = l.split('\t')
-+                _fragments = l.split('\t')
-+                if len(_fragments) == 10:
-+                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template,_basejail) = _fragments
-                 else:
--                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template) = l.split('\t')
-+                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template) = _fragments
-                 if _name != "":
-                     _properties = _jail_get_properties(module, iocage_path, _name)
-                     _jails[_name] = { "jid": _jid, "name": _name, "state": _state, "properties": _properties }
-@@ -504,7 +505,7 @@ def main():
-             cmd          = dict(default="", required=False),
-             clone_from   = dict(default="", required=False),
-             release      = dict(default="", required=False),
--            update       = dict(default="", required=False, type='bool'),
-+            update       = dict(default=False, required=False, type='bool'),
-             components   = dict(default="", aliases=["files","component"], required=False, type='list')),
-         supports_check_mode = True
-     )