Index: head/devel/py-cookiecutter/Makefile
===================================================================
--- head/devel/py-cookiecutter/Makefile	(revision 559452)
+++ head/devel/py-cookiecutter/Makefile	(revision 559453)
@@ -1,47 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	cookiecutter
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Create projects from cookiecutters (project templates)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}binaryornot>=0.2.0:devel/py-binaryornot@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}binaryornot>=0.4.4:devel/py-binaryornot@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}whichcraft>=0.4.0:devel/py-whichcraft@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}poyo>=0.1.0:devel/py-poyo@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jinja2-time>=0.1.0:devel/py-jinja2-time@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.18.0:www/py-requests@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}poyo>=0.5.0:devel/py-poyo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jinja2-time>=0.2.0:devel/py-jinja2-time@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-slugify>=4.0.0:textproc/py-python-slugify@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 
 # pytest needs a UTF-8 environment, and it will try and write outside
-# ${WRKDIR} unless told not to.  Even so, these tests have failures:
-#
-# cookiecutter/utils.py            50      3    94%
-# cookiecutter/zipfile.py          61      2    97%
+# ${WRKDIR} unless told not to.
 
 TEST_ENV=	TMPDIR=${WRKDIR} HOME=${WRKDIR} LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
 
 do-test:
 	@cd ${WRKSRC} && \
 	${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/pytest-${PYTHON_VER} --cov=cookiecutter tests
 
 .include <bsd.port.mk>
Index: head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh
===================================================================
--- head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh	(nonexistent)
+++ head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh	(revision 559453)
@@ -0,0 +1,8 @@
+--- tests/test-generate-files-permissions/input{{cookiecutter.permissions}}/script.sh.orig	2020-12-28 09:56:38 UTC
++++ tests/test-generate-files-permissions/input{{cookiecutter.permissions}}/script.sh
+@@ -1,3 +1,3 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+-# some bash script
++# some shell script

Property changes on: head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh
===================================================================
--- head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh	(nonexistent)
+++ head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh	(revision 559453)
@@ -0,0 +1,8 @@
+--- tests/test-pyshellhooks/hooks/post_gen_project.sh.orig	2020-12-28 09:59:20 UTC
++++ tests/test-pyshellhooks/hooks/post_gen_project.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ echo 'post generation hook';
+ touch 'shell_post.txt'

Property changes on: head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh
===================================================================
--- head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh	(nonexistent)
+++ head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh	(revision 559453)
@@ -0,0 +1,8 @@
+--- tests/test-pyshellhooks/hooks/pre_gen_project.sh.orig	2020-12-28 10:00:09 UTC
++++ tests/test-pyshellhooks/hooks/pre_gen_project.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ echo 'post generation hook';
+ touch 'shell_pre.txt'

Property changes on: head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh
===================================================================
--- head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh	(nonexistent)
+++ head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh	(revision 559453)
@@ -0,0 +1,8 @@
+--- tests/test-shellhooks/hooks/post_gen_project.sh.orig	2020-12-28 09:54:42 UTC
++++ tests/test-shellhooks/hooks/post_gen_project.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ echo 'post generation hook';
+ touch 'shell_post.txt'

Property changes on: head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh
===================================================================
--- head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh	(nonexistent)
+++ head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh	(revision 559453)
@@ -0,0 +1,8 @@
+--- tests/test-shellhooks/hooks/pre_gen_project.sh.orig	2020-12-28 09:55:19 UTC
++++ tests/test-shellhooks/hooks/pre_gen_project.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ echo 'pre generation hook';
+ touch 'shell_pre.txt'

Property changes on: head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/py-cookiecutter/files/patch-tests_test__hooks.py
===================================================================
--- head/devel/py-cookiecutter/files/patch-tests_test__hooks.py	(nonexistent)
+++ head/devel/py-cookiecutter/files/patch-tests_test__hooks.py	(revision 559453)
@@ -0,0 +1,20 @@
+--- tests/test_hooks.py.orig	2020-12-28 09:57:55 UTC
++++ tests/test_hooks.py
+@@ -42,7 +42,7 @@ def make_test_repo(name):
+         post = 'post_gen_project.sh'
+         filename = os.path.join(hook_dir, post)
+         with open(filename, 'w') as f:
+-            f.write("#!/bin/bash\n")
++            f.write("#!/bin/sh\n")
+             f.write("\n")
+             f.write("echo 'post generation hook';\n")
+             f.write("touch 'shell_post.txt'\n")
+@@ -143,7 +143,7 @@ class TestExternalHooks(object):
+                 f.write("echo. >{{cookiecutter.file}}\n")
+         else:
+             with open(hook_path, 'w') as fh:
+-                fh.write("#!/bin/bash\n")
++                fh.write("#!/bin/sh\n")
+                 fh.write("\n")
+                 fh.write("echo 'post generation hook';\n")
+                 fh.write("touch 'shell_post.txt'\n")

Property changes on: head/devel/py-cookiecutter/files/patch-tests_test__hooks.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property