diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index eb07edd25e58..f14f7a7249cf 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -1,38 +1,39 @@
 # Created by: gahr
 
 PORTNAME=	mysql-connector-c
 PORTVERSION=	6.1.11
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-C
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL database connector for C
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_SSL=	openssl
 BROKEN_SSL_REASON_openssl=	variable has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
 
 USES=		cmake compiler:features mysql ssl
 CMAKE_ARGS+=	-DOPENSSL_INCLUDE_DIR="${OPENSSLINC}"
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
 CFLAGS+=	-march=i586
 .endif
 
 .if ${SSL_DEFAULT} == base
 BROKEN_FreeBSD_12=	incomplete definition of type 'struct dh_st'
 BROKEN_FreeBSD_13=	incomplete definition of type 'struct dh_st'
 CMAKE_ARGS+=	-DWITH_SSL="system"
 .else
 CMAKE_ARGS+=	-DWITH_SSL="${OPENSSLBASE}"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql-connector-c/files/patch-cmake_install__macros.cmake b/databases/mysql-connector-c/files/patch-cmake_install__macros.cmake
new file mode 100644
index 000000000000..4debda0bd44e
--- /dev/null
+++ b/databases/mysql-connector-c/files/patch-cmake_install__macros.cmake
@@ -0,0 +1,13 @@
+--- cmake/install_macros.cmake.orig	2021-04-22 20:14:44 UTC
++++ cmake/install_macros.cmake
+@@ -362,8 +362,8 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
+         CONFIGURATIONS Release RelWithDebInfo
+         COMPONENT ${ARG_COMPONENT}
+         OPTIONAL)
+-    ENDIF()
+-  ENDFOREACH()
++    ENDFOREACH()
++  ENDIF()
+ 
+ ENDFUNCTION()
+