Index: head/devel/check/Makefile
===================================================================
--- head/devel/check/Makefile	(revision 543740)
+++ head/devel/check/Makefile	(revision 543741)
@@ -1,38 +1,39 @@
 # Created by: mikeh@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	check
 PORTVERSION=	0.15.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Unit test framework for C
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 USES=		autoreconf libtool makeinfo pathfix pkgconfig
 
 CONFIGURE_ENV=	ac_cv_path_AWK_PATH=${AWK}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 INFO=		check
 
 GH_ACCOUNT=	libcheck
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|COPYING.LESSER||' \
 		-e '/^docdir = / s|$$(PACKAGE)|check|' \
 			${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} \
 		-e '/^exampledir = / s|(docdir)/example|(datadir)/examples/check|' \
 		-e '/^example[a-z]*dir = / s|(docdir)/example/|(exampledir)/|' \
 			${WRKSRC}/doc/Makefile.am
 
 .include <bsd.port.mk>
Index: head/devel/check/files/patch-src-check.c
===================================================================
--- head/devel/check/files/patch-src-check.c	(nonexistent)
+++ head/devel/check/files/patch-src-check.c	(revision 543741)
@@ -0,0 +1,43 @@
+Revert:		https://github.com/libcheck/check/commit/7ac1fcbcefe8813e2a75388ec61e20a184ddc8c8
+
+--- src/check.c.orig	2020-07-22 14:19:48 UTC
++++ src/check.c
+@@ -362,24 +362,25 @@ void _mark_point(const char *file, int line)
+     send_loc_info(file, line);
+ }
+ 
+-void _ck_assert_failed(const char *file, int line, const char *expr,
+-                       const char *msg, ...)
++void _ck_assert_failed(const char *file, int line, const char *expr, ...)
+ {
++    const char *msg;
++    va_list ap;
+     char buf[BUFSIZ];
+     const char *to_send;
+ 
+     send_loc_info(file, line);
+ 
++    va_start(ap, expr);
++    msg = (const char *)va_arg(ap, char *);
++
+     /*
+      * If a message was passed, format it with vsnprintf.
+      * Otherwise, print the expression as is.
+      */
+     if(msg != NULL)
+     {
+-        va_list ap;
+-        va_start(ap, msg);
+         vsnprintf(buf, BUFSIZ, msg, ap);
+-        va_end(ap);
+         to_send = buf;
+     }
+     else
+@@ -387,6 +388,7 @@ void _ck_assert_failed(const char *file, int line, con
+         to_send = expr;
+     }
+ 
++    va_end(ap);
+     send_failure_info(to_send);
+     if(cur_fork_status() == CK_FORK)
+     {

Property changes on: head/devel/check/files/patch-src-check.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/check/files/patch-src-check.h.in
===================================================================
--- head/devel/check/files/patch-src-check.h.in	(nonexistent)
+++ head/devel/check/files/patch-src-check.h.in	(revision 543741)
@@ -0,0 +1,48 @@
+Revert:		https://github.com/libcheck/check/commit/7ac1fcbcefe8813e2a75388ec61e20a184ddc8c8
+
+--- src/check.h.in.orig	2020-07-22 14:19:48 UTC
++++ src/check.h.in
+@@ -480,7 +480,7 @@ static void __testname ## _fn (int _i CK_ATTRIBUTE_UNU
+  */
+ #define fail_if(expr, ...)\
+   (expr) ? \
+-     _ck_assert_failed(__FILE__, __LINE__, "Failure '"#expr"' occurred" , ## __VA_ARGS__) \
++     _ck_assert_failed(__FILE__, __LINE__, "Failure '"#expr"' occurred" , ## __VA_ARGS__, NULL) \
+      : _mark_point(__FILE__, __LINE__)
+ 
+ /*
+@@ -500,12 +500,12 @@ static void __testname ## _fn (int _i CK_ATTRIBUTE_UNU
+  */
+ #if @HAVE_FORK@
+ CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char *file, int line,
+-                                            const char *expr, const char *msg,
+-                                            ...) CK_ATTRIBUTE_NORETURN CK_ATTRIBUTE_FORMAT(printf, 4, 5);
++                                            const char *expr,
++                                            ...) CK_ATTRIBUTE_NORETURN CK_ATTRIBUTE_FORMAT(printf, 3, 4);
+ #else
+ CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char *file, int line,
+-                                            const char *expr, const char *msg,
+-                                            ...) CK_ATTRIBUTE_FORMAT(printf, 4, 5);
++                                            const char *expr,
++                                            ...) CK_ATTRIBUTE_FORMAT(printf, 3, 4);
+ #endif
+ 
+ /**
+@@ -535,7 +535,7 @@ CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char
+ #define ck_assert_msg(expr, ...) \
+   (expr) ? \
+      _mark_point(__FILE__, __LINE__) : \
+-     _ck_assert_failed(__FILE__, __LINE__, "Assertion '"#expr"' failed" , ## __VA_ARGS__)
++     _ck_assert_failed(__FILE__, __LINE__, "Assertion '"#expr"' failed" , ## __VA_ARGS__, NULL)
+ 
+ /**
+  * Unconditionally fail the test
+@@ -554,7 +554,7 @@ CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char
+  *
+  * @since 0.9.6
+  */
+-#define ck_abort_msg(...) _ck_assert_failed(__FILE__, __LINE__, "Failed" , ## __VA_ARGS__)
++#define ck_abort_msg(...) _ck_assert_failed(__FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL)
+ 
+ /* Signed and unsigned integer comparison macros with improved output compared to ck_assert(). */
+ /* OP may be any comparison operator. */

Property changes on: head/devel/check/files/patch-src-check.h.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property