svn commit: r547315 - in head: dns/yadifa finance/beanie

[Alexey Dokuchaev]

Author: danfe
Date: Wed Sep  2 03:43:59 2020
New Revision: 547315
URL: https://svnweb.freebsd.org/changeset/ports/547315

Log:
  Ensure that there is only one variable definition per each object, as
  the C (and C++) standards mandated for years and compilers started to
  enforce as of recently (Clang 11, GCC 10).
  
  Reported by:	pkg-fallout

Modified:
  head/dns/yadifa/Makefile
  head/finance/beanie/Makefile

Modified: head/dns/yadifa/Makefile
==============================================================================
--- head/dns/yadifa/Makefile	Wed Sep  2 03:34:32 2020	(r547314)
+++ head/dns/yadifa/Makefile	Wed Sep  2 03:43:59 2020	(r547315)
@@ -38,6 +38,11 @@ USE_RC_SUBR=	${PORTNAME}d
 PORTDOCS=	AUTHORS COPYING ChangeLog \
 		INSTALL NEWS README TODO VERSION
 
+post-patch:
+# Fix the build with -fno-common (for Clang 11 and GCC 10)
+	@${REINPLACE_CMD} -e '/\*g_client_logger/d' \
+		${WRKSRC}/bin/yadifa/yadifa.c
+
 post-configure:
 	${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile
 	${REINPLACE_CMD} -e 's|/usr/local/var|/var|' -e 's|/var/zones|/var/${PORTNAME}|' ${WRKSRC}/etc/yadifad.conf.example

Modified: head/finance/beanie/Makefile
==============================================================================
--- head/finance/beanie/Makefile	Wed Sep  2 03:34:32 2020	(r547314)
+++ head/finance/beanie/Makefile	Wed Sep  2 03:43:59 2020	(r547315)
@@ -22,5 +22,8 @@ MAKE_JOBS_UNSAFE=	yes
 post-patch:
 	@${CP} ${WRKSRC}/beanie.mk.sample ${WRKSRC}/beanie.mk
 	@${CP} ${WRKSRC}/tmac/lhead.sample.r ${WRKSRC}/tmac/lhead.r
+# Fix the build with -fno-common (for Clang 11 and GCC 10)
+	@${REINPLACE_CMD} -e 's,int[[:blank:]]*itemno,extern &,' \
+		${WRKSRC}/import/salesorder.c
 
 .include <bsd.port.mk>