diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
index 37694221837c..8c02dc5a2669 100644
--- a/lang/guile2/Makefile
+++ b/lang/guile2/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	guile
 DISTVERSION=	2.2.7
 PORTREVISION=	5
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 WWW=		https://www.gnu.org/software/guile/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libltdl.so:devel/libltdl \
 		libunistring.so:devel/libunistring \
 		libffi.so:devel/libffi
 RUN_DEPENDS=	guile-aclocal>=3:lang/guile-aclocal
 
 USES=		guile:${PORTVERSION:R},env \
 		charsetfix compiler:c11 cpe gmake iconv libtool localbase \
-		makeinfo ncurses pathfix pkgconfig readline tar:lz
+		ncurses pathfix pkgconfig readline tar:lz
 CPE_VENDOR=	gnu
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-suffix=-${GUILE_VER}
 # eliminate some pointless configure warnings/errors
-CONFIGURE_ENV+= gl_cv_func_working_mktime=yes \
+CONFIGURE_ENV+=	gl_cv_func_working_mktime=yes \
 		ac_cv_header_sys_timeb_h=0
 
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 INFO=		guile r5rs
 INFO_PATH=	${GUILE_INFO_PATH}
 
 OPTIONS_DEFINE=	NLS THREADS
 OPTIONS_DEFAULT=THREADS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 THREADS_LIB_DEPENDS_OFF=libgc.so:devel/boehm-gc
 THREADS_CONFIGURE_ON=	--with-bdw-gc=bdw-gc-threaded
 THREADS_CONFIGURE_OFF=	--with-bdw-gc=bdw-gc
 THREADS_CONFIGURE_WITH=	threads
 
 post-patch:
 	@${RM} -r ${WRKSRC}/prebuilt/32-bit-big-endian
 
 # DO NOT try and add rules here to strip .go files, no matter how loudly
 # testport / stage-qa shouts at you about it, because .go files (which are
 # compiled bytecode) are not intended to be stripped and doing so causes
 # breakage at run time.
 
 post-install:
 	for p in guile guild guile-tools guile-config guile-snarf; do \
 	  ${LN} -s $${p}-${GUILE_VER} ${STAGEDIR}${PREFIX}/bin/$${p}${GUILE_SFX}; \
 	done
 	${MV} ${STAGEDIR}${PREFIX}/man/man1/guile-${GUILE_VER}.1 \
 	      ${STAGEDIR}${PREFIX}/man/man1/guile${GUILE_SFX}.1
 
 .include <bsd.port.mk>
diff --git a/lang/guile2/files/patch-libguile_filesys.c b/lang/guile2/files/patch-libguile_filesys.c
index 135030ac6257..847a52cde611 100644
--- a/lang/guile2/files/patch-libguile_filesys.c
+++ b/lang/guile2/files/patch-libguile_filesys.c
@@ -1,12 +1,12 @@
---- libguile/filesys.c.orig	2017-02-06 04:37:29 UTC
+--- libguile/filesys.c.orig	2019-06-30 14:31:23 UTC
 +++ libguile/filesys.c
-@@ -1486,6 +1486,9 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1
+@@ -1513,6 +1513,9 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1, 1, 0,
        mode_bits = scm_i_mode_bits (mode);
      }
  
 +#ifdef __FreeBSD__
 +  open_flags &= O_APPEND | O_DIRECT | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
 +#endif
    SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
    if (rv == -1)
      SCM_SYSERROR;
diff --git a/lang/guile2/files/patch-libguile_numbers.c b/lang/guile2/files/patch-libguile_numbers.c
index e54c471050c5..66b871902b85 100644
--- a/lang/guile2/files/patch-libguile_numbers.c
+++ b/lang/guile2/files/patch-libguile_numbers.c
@@ -1,23 +1,23 @@
---- libguile/numbers.c.orig	2016-12-15 00:03:33 UTC
+--- libguile/numbers.c.orig	2020-03-07 17:29:32 UTC
 +++ libguile/numbers.c
 @@ -45,7 +45,11 @@
  #  include <config.h>
  #endif
  
 +/* With old GCC, do not override _Static_assert: it conflicts with
 +   #include <complex.h> below. */
 +#if defined(__clang__) || (__GNUC__ * 10 + __GNUC_MINOR__ >= 46)
  #include <verify.h>
 +#endif
  #include <assert.h>
  
  #include <math.h>
-@@ -183,7 +187,7 @@ static double atanh (double x) { return 0.5 * log ((1 
+@@ -191,7 +195,7 @@ static double atanh (double x) { return 0.5 * log ((1 
  
  
  #if defined (GUILE_I)
 -#if defined HAVE_COMPLEX_DOUBLE
 +#if defined HAVE_COMPLEX_DOUBLE && (HAVE_CLOG || HAVE_CLOG10 || HAVE_CEXP || HAVE_USABLE_CSQRT) && defined (SCM_COMPLEX_VALUE)
  
  /* For an SCM object Z which is a complex number (ie. satisfies
     SCM_COMPLEXP), return its value as a C level "complex double". */
diff --git a/lang/guile2/files/patch-libguile_posix.c b/lang/guile2/files/patch-libguile_posix.c
index adf781adf214..49c9cf6c74d9 100644
--- a/lang/guile2/files/patch-libguile_posix.c
+++ b/lang/guile2/files/patch-libguile_posix.c
@@ -1,10 +1,10 @@
---- libguile/posix.c.orig	2019-07-01 05:21:54.000000000 -0700
-+++ libguile/posix.c	2021-11-23 12:10:16.007364000 -0800
+--- libguile/posix.c.orig	2019-07-01 12:21:54 UTC
++++ libguile/posix.c
 @@ -28,6 +28,7 @@
  #include <uniconv.h>
  
  #ifdef HAVE_SCHED_H
 +#define _WITH_CPU_SET_T
  # include <sched.h>
  #endif