@@ -, +, @@ 
 systems again
---
 devel/elfutils/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--- b/devel/elfutils/Makefile	
+++ b/devel/elfutils/Makefile	
@@ -15,7 +15,6 @@ LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING-GPLV2
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING-LGPLV3
 
-IGNORE_FreeBSD_11=	fails to build: fails to compile dwarf_abbrev_hash.c
 BROKEN_armv6=		fails to build: fails to compile i386_disasm.c
 BROKEN_armv7=		fails to build: fails to compile i386_disasm.c
 BROKEN_sparc64=		sparc patch does not apply cleanly to 0.172
@@ -43,12 +42,23 @@ CFLAGS+=	-Wno-null-dereference -Wno-unused-value
 CFLAGS+=	-Wno-cast-function-type
 # Give i386 a prayer of building, and we can fix the warnings later:
 CFLAGS_i386+=	-Wno-error
+.if ${OSVERSION} < 1200000
+# Ignore complaints about function redifinitions
+CFLAGS+=	-Wno-error
+.endif
 
 # Avoid conflict with binutils / elftoolchain programs with the same names:
 CONFIGURE_ARGS+=	--program-prefix=eu-
 # Disable debuginfod until option support can be added:
 CONFIGURE_ARGS+=	--disable-debuginfod
 
+post-patch:
+.if ${OSVERSION} < 1200000
+# Use the fallback atomics shipped in the distfile
+	${REINPLACE_CMD} -e 's@HAVE_STDATOMIC_H@HAVE_STDATOMIC_H_@' \
+		${WRKSRC}/lib/atomics.h
+.endif
+
 pre-configure:
 	@${CP} -a \
 	    ${LOCALBASE}/share/gnulib/lib/obstack.c \
-- 
---
 devel/dwarves/Makefile | 2 --
 1 file changed, 2 deletions(-)
--- b/devel/dwarves/Makefile	
+++ b/devel/dwarves/Makefile	
@@ -15,8 +15,6 @@ LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/lib/bpf/LICENSE.BSD-2-Clause
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/lib/bpf/LICENSE.LPGL-2.1
 
-IGNORE_FreeBSD_11=	inherited from dependency devel/elfutils
-
 BUILD_DEPENDS=	gnulib>=0:devel/gnulib
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libdw.so:devel/elfutils
--