textproc/discount: Fix build with Clang 16 and remove the workaround

freebsd · Jun 30, 2023 · 249dd4b · 249dd4b
1 parent c962284
commit 249dd4b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile
@@ -38,12 +38,6 @@ EXTRA_CONFIGURE_ON=	--with-dl=both --with-fenced-code --with-github-tags --with-
 SAMPLES_INSTALL_TARGET=	install.samples
 TAB8_CONFIGURE_ON=	--with-tabstops=8
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libmarkdown.a ${STAGEDIR}${PREFIX}/lib/libmarkdown.a
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmarkdown.so

diff --git a/textproc/discount/files/patch-clang16 b/textproc/discount/files/patch-clang16
@@ -0,0 +1,11 @@
+--- main.c.orig	2022-03-30 19:34:50 UTC
++++ main.c
+@@ -308,7 +308,7 @@ main(int argc, char **argv)
+ 	if ( squash )
+ 	    mkd_e_anchor(doc, (mkd_callback_t) anchor_format);
+ 	if ( use_e_codefmt )
+-	    mkd_e_code_format(doc, external_codefmt);
++	    mkd_e_code_format(doc, (mkd_callback_t) external_codefmt);
+
+ 	if ( use_e_codefmt || squash )
+ 	    mkd_e_free(doc, free_it);