diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile
index bbc423bc50c7..1355aa375af2 100644
--- a/editors/hexcurse/Makefile
+++ b/editors/hexcurse/Makefile
@@ -1,31 +1,24 @@
 PORTNAME=	hexcurse
-PORTVERSION=	1.60.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.60.0
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Versatile ncurses-based hex editor
 WWW=		https://BSDforge.com/projects/editors/hexcurse/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	LonnyGomes
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-
-PLIST_FILES=	bin/hexcurse share/man/man1/hexcurse.1.gz
-
-.include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=deprecated-non-prototype
-.endif
 
-CFLAGS+=	-Wno-error=format-truncation
+PLIST_FILES=	bin/hexcurse share/man/man1/hexcurse.1.gz
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/hexcurse/files/patch-include_hex.h b/editors/hexcurse/files/patch-include_hex.h
index cc8717d0680b..0270248207f8 100644
--- a/editors/hexcurse/files/patch-include_hex.h
+++ b/editors/hexcurse/files/patch-include_hex.h
@@ -1,11 +1,11 @@
---- include/hex.h.orig	2015-11-17 20:33:09.000000000 -0800
-+++ include/hex.h	2021-03-15 11:33:30.825153000 -0700
-@@ -126,7 +126,7 @@
+--- include/hex.h.orig	2015-11-18 04:33:09 UTC
++++ include/hex.h
+@@ -126,7 +126,7 @@ extern bool color_enabled;
  #define max(a,b) ((a) >(b) ? (a) : (b))
  #endif
  
 -FILE *fpIN;		        		/* global file ptr           */
 +extern FILE *fpIN;		       		/* global file ptr           */
  
  /* function prototypes */
  
diff --git a/editors/hexcurse/files/patch-src_file.c b/editors/hexcurse/files/patch-src_file.c
index 691e9500ff98..83385f4a3006 100644
--- a/editors/hexcurse/files/patch-src_file.c
+++ b/editors/hexcurse/files/patch-src_file.c
@@ -1,11 +1,11 @@
---- src/file.c.orig	2015-11-17 20:33:09.000000000 -0800
-+++ src/file.c	2021-03-15 11:34:15.464468000 -0700
+--- src/file.c.orig	2015-11-18 04:33:09 UTC
++++ src/file.c
 @@ -18,6 +18,8 @@
  \******************************************************************************/
  #include "hex.h"
  
 +FILE *fpIN;			/* global file ptr           */
 +
  /*******************************************************\
   * Description: prints out a line of text to the screen*
   *		the current address line and both the          *