Index: head/lang/chibi-scheme/Makefile
===================================================================
--- head/lang/chibi-scheme/Makefile	(revision 552509)
+++ head/lang/chibi-scheme/Makefile	(revision 552510)
@@ -1,45 +1,46 @@
 # Created by: Tobias Kortkamp <tobias.kortkamp@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	chibi-scheme
 DISTVERSION=	0.9.1
 CATEGORIES=	lang
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Minimal Scheme implementation for use as a C extension language
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	ashinn
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 MAKE_ARGS=	IMAGE_FILES="" \
 		LDCONFIG=${TRUE}
 ALL_TARGET=	all doc libchibi-scheme.a
 TEST_TARGET=	test
 
 PORTSCOUT=	skipv:stable
 PLIST_SUB=	SOVERSION=${DISTVERSION}
 
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's@ -g -g3 -O3 @ @' \
-		-e '/$$(SO)/ s@$$(INSTALL_EXE) -m0755 @$$(BSD_INSTALL_LIB) @' \
-		-e '/tools/ s@$$(INSTALL) -m0755 @$$(BSD_INSTALL_SCRIPT) @' \
-		-e 's@$$(INSTALL_EXE) -m0755 @$$(BSD_INSTALL_PROGRAM) @' \
-		-e '/$$(MANDIR)/ s@$$(INSTALL) -m0644 @$$(BSD_INSTALL_MAN) @' \
-		-e 's@$$(INSTALL) -m0644 @$$(BSD_INSTALL_DATA) @' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} \
+	    -e '/$$(SO)/s|$$(INSTALL_EXE) -m0755|$$(BSD_INSTALL_LIB)|' \
+	    -e '/tools/s|$$(INSTALL) -m0755|$$(BSD_INSTALL_SCRIPT)|' \
+	    -e 's|$$(INSTALL_EXE) -m0755|$$(BSD_INSTALL_PROGRAM)|' \
+	    -e '/$$(MANDIR)/s|$$(INSTALL) -m0644|$$(BSD_INSTALL_MAN)|' \
+	    -e 's|$$(INSTALL) -m0644|$$(BSD_INSTALL_DATA)|' \
+	    ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's|-g -g3 -O3 ||' ${WRKSRC}/Makefile.detect
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/doc/chibi.html ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/lib
 
 .include <bsd.port.mk>
Index: head/lang/chibi-scheme/files/patch-Makefile
===================================================================
--- head/lang/chibi-scheme/files/patch-Makefile	(revision 552509)
+++ head/lang/chibi-scheme/files/patch-Makefile	(revision 552510)
@@ -1,11 +1,11 @@
---- Makefile.orig	2020-10-14 09:49:18.314212000 +0000
-+++ Makefile	2020-10-14 09:51:06.922727000 +0000
-@@ -11,7 +11,7 @@
+--- Makefile.orig	2020-08-13 02:03:03 UTC
++++ Makefile
+@@ -11,7 +11,7 @@ CHIBI_FFI ?= $(CHIBI) -q tools/chibi-ffi
  CHIBI_FFI_DEPENDENCIES ?= $(CHIBI_DEPENDENCIES) tools/chibi-ffi
  
  CHIBI_DOC ?= $(CHIBI) tools/chibi-doc
 -CHIBI_DOC_DEPENDENCIES ?= $(CHIBI_DEPENDENCIES) tools/chibi-doc
 +CHIBI_DOC_DEPENDENCIES ?= $(CHIBI_DEPENDENCIES) tools/chibi-doc $(COMPILED_LIBS)
  
  GENSTATIC ?= ./tools/chibi-genstatic
  
Index: head/lang/chibi-scheme/files/patch-Makefile.detect
===================================================================
--- head/lang/chibi-scheme/files/patch-Makefile.detect	(revision 552509)
+++ head/lang/chibi-scheme/files/patch-Makefile.detect	(revision 552510)
@@ -1,10 +1,10 @@
---- Makefile.detect.orig	2020-07-31 15:00:38 UTC
+--- Makefile.detect.orig	2020-10-16 13:28:43 UTC
 +++ Makefile.detect
-@@ -75,6 +75,7 @@ CLIBFLAGS = -fPIC
- CLINKFLAGS = -shared
- LIBDL = 
- RLDFLAGS=-Wl,-R$(LIBDIR)
+@@ -9,6 +9,7 @@ PLATFORM=macosx
+ else
+ ifeq ($(shell uname),FreeBSD)
+ PLATFORM=bsd
 +LIBCHIBI_FLAGS = -Wl,-soname,libchibi-scheme$(SO).$(SOVERSION_MAJOR)
  else
- ifeq ($(PLATFORM),solaris)
- SO = .so
+ ifeq ($(shell uname),NetBSD)
+ PLATFORM=bsd