Bump revision in order to make it easier to compare with

local jemalloc of NetBSD:

- restrict "os_overcommits" workaround to NetBSD < 8.0

- add debug option

4 files changed, 23 insertions, 11 deletions

diff --git a/devel/jemalloc/Makefile b/devel/jemalloc/Makefile
index 68e5696deb3..4565857ca1e 100644
--- a/devel/jemalloc/Makefile
+++ b/devel/jemalloc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2018/08/22 09:43:31 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/03/17 13:28:22 rin Exp $
 
 DISTNAME=	jemalloc-5.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jemalloc/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
@@ -29,4 +29,6 @@ BUILD_TARGET=		all dist
 TEST_TARGET=		check
 TEST_ENV=		LD_LIBRARY_PATH=${WRKSRC}/lib
 
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/jemalloc/distinfo b/devel/jemalloc/distinfo
index 4a45c7065cf..67d59612f03 100644
--- a/devel/jemalloc/distinfo
+++ b/devel/jemalloc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2019/02/17 08:40:08 mrg Exp $
+$NetBSD: distinfo,v 1.10 2019/03/17 13:28:22 rin Exp $
 
 SHA1 (jemalloc-5.1.0.tar.bz2) = 92fdc0b38680aaee1fa7ccd89cbf1af61224ff46
 RMD160 (jemalloc-5.1.0.tar.bz2) = 52b1340ca8cafd7414aa5e3a7a028cb1feba0b80
@@ -7,4 +7,4 @@ Size (jemalloc-5.1.0.tar.bz2) = 515622 bytes
 SHA1 (patch-Makefile.in) = 62e04375dec9aab678fed5bc32559deb942e799f
 SHA1 (patch-configure) = 5dec3fb5b2ece549e40743780db3057dd83cc17e
 SHA1 (patch-include_jemalloc_internal_jemalloc_internal_types.h) = 07f2d661d8141152fc7c80f24f9dab4be90cb4b3
-SHA1 (patch-src_pages.c) = 7c9eea2409b283c5dd80e52349c4dda26ae5befa
+SHA1 (patch-src_pages.c) = 12cf807a946e68f7cc247549762a301633b86f9e
diff --git a/devel/jemalloc/options.mk b/devel/jemalloc/options.mk
new file mode 100644
index 00000000000..7caaaf7422d
--- /dev/null
+++ b/devel/jemalloc/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.1 2019/03/17 13:28:22 rin Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.jemalloc
+PKG_SUPPORTED_OPTIONS=		debug
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
diff --git a/devel/jemalloc/patches/patch-src_pages.c b/devel/jemalloc/patches/patch-src_pages.c
index d1d818d2986..0aa4a72a260 100644
--- a/devel/jemalloc/patches/patch-src_pages.c
+++ b/devel/jemalloc/patches/patch-src_pages.c
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_pages.c,v 1.2 2017/08/27 12:12:25 adam Exp $
+$NetBSD: patch-src_pages.c,v 1.3 2019/03/17 13:28:22 rin Exp $
 
-Set os_overcommits to true on NetBSD since NetBSD does overcommit.
-This also has the benefit of not triggering the issue reported in
+Set os_overcommits to true on NetBSD < 8.0 as a workaround for
+the issue reported in kern/52239 and
 https://github.com/jemalloc/jemalloc/issues/837 .
 
---- src/pages.c.orig	2017-07-02 00:44:25.000000000 +0000
-+++ src/pages.c
-@@ -414,6 +414,8 @@ pages_boot(void) {
+--- src/pages.c.orig	2018-05-09 04:15:01.000000000 +0900
++++ src/pages.c	2019-03-17 22:02:09.325743870 +0900
+@@ -582,6 +582,8 @@ pages_boot(void) {
  		mmap_flags |= MAP_NORESERVE;
  	}
  #  endif
-+#elif defined __NetBSD__
++#elif defined(__NetBSD__) && !__NetBSD_Prereq__(8,0,0)
 +	os_overcommits = true;
  #else
  	os_overcommits = false;