diff --git a/cad/graywolf/Makefile b/cad/graywolf/Makefile
index 222f1c0fe06b..16b73a51e341 100644
--- a/cad/graywolf/Makefile
+++ b/cad/graywolf/Makefile
@@ -1,13 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	graywolf
-DISTVERSION=	0.1.6-3
-DISTVERSIONSUFFIX=	-g6c5e24f
+DISTVERSION=	0.1.6-4
+DISTVERSIONSUFFIX=	-gf47937b
 PORTREVISION=	1
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES+=	af606a0e8c6f693448978a300e5603fd5a8f2aef.patch:-p1 # https://github.com/rubund/graywolf/pull/41
+PATCHFILES=	af606a0e8c6f693448978a300e5603fd5a8f2aef.patch:-p1 # https://github.com/rubund/graywolf/pull/41
+PATCHFILES+=	2b23616f26d8f9a9fa03010322fa967a2dc204e3.patch:-p1 \
+		b0692b44dfc21ded1ad61c8a2e47d262d14ebabe.patch:-p1 \
+		9b6a45849ddf1d48b7d0bffa914919a785f6db44.patch:-p1 \
+		56698bb3178b606dec6749cf1f893acceca4ca62.patch:-p1 \
+		0740f436419a9cce323936e0dec2355dde59a97e.patch:-p1 \
+		a9a092d9c2dab31993bc2955c5ed730c9234df29.patch:-p1 # https://github.com/rubund/graywolf/pull/48
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fork of TimberWolf, a placement tool in VLSI design
@@ -17,15 +23,22 @@ LICENSE=	GPLv2
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 LIB_DEPENDS=	libgsl.so:math/gsl
+TEST_DEPENDS=	bash:shells/bash \
+		rsync:net/rsync
 
-USES=		cmake compiler:c11 pkgconfig xorg
-USE_GITHUB=	yes
-GH_ACCOUNT=	rubund
+USES=		cmake compiler:c11 pkgconfig shebangfix xorg
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	rubund
+
+SHEBANG_GLOB=	*.sh
+
 USE_GCC=	any # lots of obviously incorrect C where clang fails, which gcc nevertheless magically finds a way to compile
 
 CFLAGS+=	-fcommon
 
+TEST_TARGET=	test
+
 .include <bsd.port.mk>
diff --git a/cad/graywolf/distinfo b/cad/graywolf/distinfo
index 4545ae22b00b..d6cbe1a9aad9 100644
--- a/cad/graywolf/distinfo
+++ b/cad/graywolf/distinfo
@@ -1,5 +1,17 @@
-TIMESTAMP = 1585083525
-SHA256 (rubund-graywolf-0.1.6-3-g6c5e24f_GH0.tar.gz) = 79f8a15e8e6228bd3f5bdb5fccfdcc1b891327d6ced166eac180d523ee60662f
-SIZE (rubund-graywolf-0.1.6-3-g6c5e24f_GH0.tar.gz) = 910961
+TIMESTAMP = 1612297202
+SHA256 (rubund-graywolf-0.1.6-4-gf47937b_GH0.tar.gz) = 36ef4035cce5b9ee4ce1d353c3cfdff0ccfcd362ea2fbf1ddefc7e450ea11daa
+SIZE (rubund-graywolf-0.1.6-4-gf47937b_GH0.tar.gz) = 911077
 SHA256 (af606a0e8c6f693448978a300e5603fd5a8f2aef.patch) = 204e248dc611986e98c7593522d6364fae1319844c34ddb54ef280ba53262721
 SIZE (af606a0e8c6f693448978a300e5603fd5a8f2aef.patch) = 1106
+SHA256 (2b23616f26d8f9a9fa03010322fa967a2dc204e3.patch) = 01332cd1f0c7711cd4929249af704866a806f2ebd81a53a46a7e3eefb9e6e667
+SIZE (2b23616f26d8f9a9fa03010322fa967a2dc204e3.patch) = 856
+SHA256 (b0692b44dfc21ded1ad61c8a2e47d262d14ebabe.patch) = 6dbc67bdc7f4de080992cccbb490ca972ffa7c7f92080c3c8208b403eaf28a5f
+SIZE (b0692b44dfc21ded1ad61c8a2e47d262d14ebabe.patch) = 653
+SHA256 (9b6a45849ddf1d48b7d0bffa914919a785f6db44.patch) = e77f1863f051ea796680f0a21325e06734719e3bfec1a693002972e123943302
+SIZE (9b6a45849ddf1d48b7d0bffa914919a785f6db44.patch) = 585
+SHA256 (56698bb3178b606dec6749cf1f893acceca4ca62.patch) = 84420fed94c0120ec6e5e2cc329cea57d44fb6936364e24685aef2b8753b1ee7
+SIZE (56698bb3178b606dec6749cf1f893acceca4ca62.patch) = 954
+SHA256 (0740f436419a9cce323936e0dec2355dde59a97e.patch) = 88411a1ac914dffa5d5b4fba85b759df89f3c5e421f2024b4ab0aec08a1efd8a
+SIZE (0740f436419a9cce323936e0dec2355dde59a97e.patch) = 1257
+SHA256 (a9a092d9c2dab31993bc2955c5ed730c9234df29.patch) = 61e4bf2a64891febcef9ed8bec914931430ab5e2293da98a9aa97db281737060
+SIZE (a9a092d9c2dab31993bc2955c5ed730c9234df29.patch) = 729