From 33d586e8ec514cbd8c9a1563e3dbf05e301b4167 Mon Sep 17 00:00:00 2001
From: kurt <kurt@openbsd.org>
Date: Mon, 23 Dec 2019 20:18:53 +0000
Subject: [PATCH] Backport auxv.h header inclusion fix. okay landry@

---
 www/firefox-esr/Makefile                      |  3 ++-
 .../patch-config_system-headers_mozbuild      | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 www/firefox-esr/patches/patch-config_system-headers_mozbuild

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index cfb89ed3e3f..43732a6322d 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.113 2019/12/23 09:04:11 landry Exp $
+# $OpenBSD: Makefile,v 1.114 2019/12/23 20:18:53 kurt Exp $
 
 COMMENT =	Firefox web browser, Extended Support Release
 ONLY_FOR_ARCHS =	amd64 i386 aarch64
@@ -8,6 +8,7 @@ MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	firefox
 MOZILLA_CODENAME =	browser
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
+REVISION =		0
 
 WRKDIST =	${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
 HOMEPAGE =	https://www.mozilla.org/firefox/organizations/
diff --git a/www/firefox-esr/patches/patch-config_system-headers_mozbuild b/www/firefox-esr/patches/patch-config_system-headers_mozbuild
new file mode 100644
index 00000000000..26228c370f9
--- /dev/null
+++ b/www/firefox-esr/patches/patch-config_system-headers_mozbuild
@@ -0,0 +1,27 @@
+$OpenBSD: patch-config_system-headers_mozbuild,v 1.1 2019/12/23 20:18:53 kurt Exp $
+
+https://hg.mozilla.org/mozilla-central/rev/d3885b9d42d3
+
+Index: config/system-headers.mozbuild
+--- config/system-headers.mozbuild.orig
++++ config/system-headers.mozbuild
+@@ -814,7 +814,6 @@ system_headers = [
+     'synch.h',
+     'syncmgr.h',
+     'sys/atomic_op.h',
+-    'sys/auxv.h',
+     'sys/bitypes.h',
+     'sys/byteorder.h',
+     'syscall.h',
+@@ -1345,6 +1344,11 @@ if CONFIG['MOZ_WAYLAND']:
+         'wayland-client.h',
+         'wayland-egl.h',
+         'wayland-util.h',
++    ]
++
++if CONFIG['OS_TARGET'] in ('Android', 'Linux', 'FreeBSD'):
++    system_headers += [
++        'sys/auxv.h',
+     ]
+ 
+ if CONFIG['OS_TARGET'] == 'Linux' and CONFIG['CPU_ARCH'].startswith('mips'):