Index: head/devel/got/Makefile
===================================================================
--- head/devel/got/Makefile	(revision 559591)
+++ head/devel/got/Makefile	(revision 559592)
@@ -1,31 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	got
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://gameoftrees.org/releases/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Game of Trees version control system
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-USES=		compiler:c11 uidfix
+USES=		uidfix
 
 n=		${.newline}
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.[cy]' -exec \
 	    ${REINPLACE_CMD} '1,/^#include "/{ \
 	    /^#include "/i\$n#include "openbsd-compat.h"\$n$n}' \
 	    {} +
 	${CP} -R ${FILESDIR}/openbsd-compat ${WRKSRC}
 
 # The regression test suite requires:
 #  installed got
 #  installed git
 #  ssh to 127.0.0.1
 run-test:
 	@(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} regress)
 
 .include <bsd.port.mk>
Index: head/devel/got/files/patch-Makefile.inc
===================================================================
--- head/devel/got/files/patch-Makefile.inc	(revision 559591)
+++ head/devel/got/files/patch-Makefile.inc	(revision 559592)
@@ -1,16 +1,22 @@
---- Makefile.inc.orig	2020-11-26 12:53:05 UTC
+--- Makefile.inc.orig	2020-12-19 00:55:45 UTC
 +++ Makefile.inc
-@@ -4,6 +4,13 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
+@@ -4,6 +4,19 @@ CPPFLAGS += -DGOT_LIBEXECDIR=${LIBEXECDIR} -DGOT_VERSI
  #CFLAGS += -DGOT_OBJ_CACHE_DEBUG
  #CFLAGS += -DGOT_DIFF_NO_MMAP
  
++# work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63567
++.include <bsd.compiler.mk>
++.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
++CSTD = gnu89
++.endif
++
 +OPENBSD_COMPAT := ${.PARSEDIR}/openbsd-compat
 +CFLAGS += ${CPPFLAGS} -I${OPENBSD_COMPAT}
 +CFLAGS += -Wno-pointer-sign
 +
 +LDFLAGS += -L${OPENBSD_COMPAT}
 +LDADD += -lopenbsd-compat -lmd
 +
  .if "${GOT_RELEASE}" == "Yes"
  PREFIX ?= /usr/local
  BINDIR ?= ${PREFIX}/bin