diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile
index 8f3d618e6e64..4320f8fd9948 100644
--- a/deskutils/remind/Makefile
+++ b/deskutils/remind/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	remind
 DISTVERSION=	04.02.00
 CATEGORIES=	deskutils
 # upstream moves distfiles to OLD once a new release appears
 MASTER_SITES=	https://dianne.skoll.ca/projects/remind/download/ \
 		https://dianne.skoll.ca/projects/remind/download/OLD/
 
 MAINTAINER=	fuz@fuz.su
 COMMENT=	Sophisticated calendar and alarm program
 WWW=		https://dianne.skoll.ca/projects/remind/
 
 LICENSE=	GPLv2
 
 USES=		autoreconf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-perl-build-artifacts
 MAKE_ARGS=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 INSTALL_TARGET=	${WITH_DEBUG:Dinstall:Uinstall-stripped}
 
 # disable LTO on riscv64
 EXTRA_PATCHES_riscv64=	${FILESDIR}/extra-patch-configure.in
 EXTRA_PATCHES=	${EXTRA_PATCHES_${ARCH}}
 
 OPTIONS_DEFINE=	A4 TCLTK REM2HTML REM2PDF
 OPTIONS_DEFAULT=	LANG_US REM2HTML REM2PDF
 OPTIONS_SINGLE=	LANGUAGE
 OPTIONS_SINGLE_LANGUAGE=	LANG_US LANG_DE LANG_NL LANG_FI LANG_FR \
 				LANG_NN LANG_DA LANG_PL LANG_PBR LANG_IT \
 				LANG_RO LANG_ES LANG_IS
 OPTIONS_SUB=	yes
 A4_DESC=	Use A4 instead of Letter paper
 LANGUAGE_DESC=	User interface language
 REM2HTML_DESC=	Build and install rem2html (requires Perl)
 REM2PDF_DESC=	Build and install rem2pdf (requires Perl)
 
 # do not sort these -- correspond to enumeration in source code
 LANG.US=	ENGLISH
 LANG.DE=	GERMAN
 LANG.NL=	DUTCH
 LANG.FI=	FINNISH
 LANG.FR=	FRENCH
 LANG.NN=	NORWEGIAN
 LANG.DA=	DANISH
 LANG.PL=	POLISH
 LANG.PBR=	BRAZPORT
 LANG.IT=	ITALIAN
 LANG.RO=	ROMANIAN
 LANG.ES=	SPANISH
 LANG.IS=	ICELANDIC
 CFLAGS+=	-DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}}
 
 TCLTK_USES=	tk
 TCLTK_RUN_DEPENDS=	dtplite:devel/tcllib
 
 REM2HTML_USES=	perl5
 REM2HTML_RUN_DEPENDS=	p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS
 
 REM2PDF_USES=	perl5
 REM2PDF_RUN_DEPENDS=	p5-Cairo>0:graphics/p5-Cairo \
 			p5-Pango>0:x11-toolkits/p5-Pango
 
 # hard wired customisation variables
 DEFAULT_LATITUDE?=	45.42055555555555
 DEFAULT_LONGITUDE?=	-75.68972222222223
 LOCATION?=	Ottawa
 
 .include <bsd.port.options.mk>
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} \
 	    -e 's#DEFAULT_LATITUDE 39#DEFAULT_LATITUDE ${DEFAULT_LATITUDE}#' \
 	    -e 's#DEFAULT_LONGITUDE 39#DEFAULT_LONGITUDE ${DEFAULT_LONGITUDE}#' \
 	    -e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h
 
-post-patch-A4-on:
+pre-configure-A4-on:
 	@${REINPLACE_CMD} -e 's#"Letter", 612, 792#"A4", 595, 842#' ${WRKSRC}/src/custom.h
 
-post-patch-TCLTK-on:
+pre-configure-TCLTK-on:
 	@${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind
 
 do-build:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all
 
 do-install:
 	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 
 do-install-REM2HTML-on:
 	cd ${WRKSRC}/rem2html && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
 
 do-install-REM2PDF-on:
 	cd ${WRKSRC}/rem2pdf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.top ${MAKE_ARGS} all
 	cd ${WRKSRC}/rem2pdf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.top ${MAKE_ARGS} install
 
 post-install-TCLTK-off:
 	${RM} ${STAGEDIR}${PREFIX}/bin/tkremind
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/tkremind.1
 
 .include <bsd.port.mk>
diff --git a/deskutils/remind/files/patch-src_Makefile.in b/deskutils/remind/files/patch-src_Makefile.in
index b97ab8f15d13..3314391e7576 100644
--- a/deskutils/remind/files/patch-src_Makefile.in
+++ b/deskutils/remind/files/patch-src_Makefile.in
@@ -1,15 +1,15 @@
---- src/Makefile.in.orig	2022-02-10 22:15:01 UTC
+--- src/Makefile.in.orig	2022-10-14 15:06:27 UTC
 +++ src/Makefile.in
 @@ -52,8 +52,11 @@ remind: $(REMINDOBJS)
  
- install-nostripped: all
+ install: all
  	-mkdir -p $(DESTDIR)$(bindir) || true
 -	for prog in $(PROGS) $(SCRIPTS) ; do \
 +	for prog in $(PROGS) ; do \
  		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
 +	done
 +	for script in $(SCRIPTS) ; do \
 +		$(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir) || exit 1; \
  	done
  	rm -f $(DESTDIR)$(bindir)/rem > /dev/null 2>&1 || true
  	ln -s remind $(DESTDIR)$(bindir)/rem
diff --git a/deskutils/remind/files/patch-src_funcs.c b/deskutils/remind/files/patch-src_funcs.c
new file mode 100644
index 000000000000..90e64dbf9c68
--- /dev/null
+++ b/deskutils/remind/files/patch-src_funcs.c
@@ -0,0 +1,13 @@
+--- src/funcs.c.orig	2022-10-19 10:26:29 UTC
++++ src/funcs.c
+@@ -29,9 +29,7 @@
+ 
+ #include <unistd.h>
+ 
+-#ifdef HAVE_SYS_FILE_H
+-#include <sys/file.h>
+-#endif
++#include <fcntl.h>
+ 
+ #include <sys/types.h>
+