Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/ham/xlog/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/ham/xlog/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- pkgsrc/ham/xlog/Makefile	2021/02/16 20:10:22	1.97
+++ pkgsrc/ham/xlog/Makefile	2021/02/16 20:22:52	1.98
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2021/02/16 20:10:22 gdt Exp $
+# $NetBSD: Makefile,v 1.98 2021/02/16 20:22:52 gdt Exp $
 #
 
 DISTNAME=	xlog-2.0.20
@@ -21,24 +21,26 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 
 .include "../../mk/compiler.mk"
+
+# Fails with gcc 5.5.0 (netbsd-8), and presumably earlier.
+# OK with gcc 7.4.0.
+# Fails with clang.
+.if !empty(CC_VERSION:Mgcc-[45].*) || !empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+=	rm:-Wno-stringop-truncation
+.endif
+
 .if !empty(PKGSRC_COMPILER:Mclang)
 BUILDLINK_TRANSFORM+=	rm:-Wno-unused-but-set-variable
 # xlog has things like: #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 # https://savannah.nongnu.org/bugs/index.php?60003
-_WRAP_EXTRA_ARGS.CC+=	-Wno-unknown-warning-option
-CWRAPPERS_APPEND.cc+=	-Wno-unknown-warning-option
+_WRAP_EXTRA_ARGS.CC+=	-Wno-error=unknown-warning-option
+CWRAPPERS_APPEND.cc+=	-Wno-error=unknown-warning-option
 # xlog has code that triggers clang warnings
 # https://savannah.nongnu.org/bugs/index.php?60004
 _WRAP_EXTRA_ARGS.CC+=	-Wno-error=parentheses-equality
 CWRAPPERS_APPEND.cc+=	-Wno-error=parentheses-equality
-_WRAP_EXTRA_ARGS.CC+=	-Wno-uninitialized
-CWRAPPERS_APPEND.cc+=	-Wno-uninitialized
-.endif
-
-# Fails with gcc 5.5.0 (netbsd-8), and presumably earlier.
-# OK with gcc 7.4.0, and OK with at least recent clang.
-.if !empty(CC_VERSION:Mgcc-[45].*) 
-BUILDLINK_TRANSFORM+=	rm:-Wno-stringop-truncation
+_WRAP_EXTRA_ARGS.CC+=	-Wno-error=uninitialized
+CWRAPPERS_APPEND.cc+=	-Wno-error=uninitialized
 .endif
 
 .include "../../databases/shared-mime-info/buildlink3.mk"