Module Name:    src
Committed By:   snj
Date:           Thu Dec  8 07:43:44 UTC 2016

Modified Files:
        src/distrib/sets/lists/man [netbsd-7]: mi
        src/lib/libc/stdlib [netbsd-7]: Makefile.inc

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1288):
        distrib/sets/lists/man/mi: revisions 1.1521, 1.1522
        lib/libc/stdlib/Makefile.inc: revision 1.92
Add malloc.conf.5 (link to jemalloc.3).
--
Add malloc.conf.0 to fix build with MKCATPAGES


To generate a diff of this commit:
cvs rdiff -u -r1.1485.2.10 -r1.1485.2.11 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/stdlib/Makefile.inc

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

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1485.2.10 src/distrib/sets/lists/man/mi:1.1485.2.11
--- src/distrib/sets/lists/man/mi:1.1485.2.10	Thu Oct  6 05:51:23 2016
+++ src/distrib/sets/lists/man/mi	Thu Dec  8 07:43:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1485.2.10 2016/10/06 05:51:23 snj Exp $
+# $NetBSD: mi,v 1.1485.2.11 2016/12/08 07:43:44 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2109,6 +2109,7 @@
 ./usr/share/man/cat5/magic.0			man-util-catman		.cat
 ./usr/share/man/cat5/mailer.conf.0		man-mailwrapper-catman	.cat
 ./usr/share/man/cat5/man.conf.0			man-man-catman		.cat
+./usr/share/man/cat5/malloc.conf.0		man-sys-catman		.cat
 ./usr/share/man/cat5/map3270.0			man-obsolete		obsolete
 ./usr/share/man/cat5/master.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/master.passwd.0		man-sys-catman		.cat
@@ -5076,6 +5077,7 @@
 ./usr/share/man/html5/lvm.conf.html		man-lvm-htmlman		lvm,html
 ./usr/share/man/html5/magic.html		man-util-htmlman	html
 ./usr/share/man/html5/mailer.conf.html		man-mailwrapper-htmlman	html
+./usr/share/man/html5/malloc.conf.html		man-sys-htmlman		html
 ./usr/share/man/html5/man.conf.html		man-man-htmlman		html
 ./usr/share/man/html5/map3270.html		man-obsolete		obsolete
 ./usr/share/man/html5/master.html		man-postfix-htmlman	postfix,html
@@ -7995,6 +7997,7 @@
 ./usr/share/man/man5/lvm.conf.5			man-lvm-man		lvm,.man
 ./usr/share/man/man5/magic.5			man-util-man		.man
 ./usr/share/man/man5/mailer.conf.5		man-mailwrapper-man	.man
+./usr/share/man/man5/malloc.conf.5		man-sys-man		.man
 ./usr/share/man/man5/man.conf.5			man-man-man		.man
 ./usr/share/man/man5/map3270.5			man-obsolete		obsolete
 ./usr/share/man/man5/master.5			man-postfix-man		postfix,.man

Index: src/lib/libc/stdlib/Makefile.inc
diff -u src/lib/libc/stdlib/Makefile.inc:1.82.2.2 src/lib/libc/stdlib/Makefile.inc:1.82.2.3
--- src/lib/libc/stdlib/Makefile.inc:1.82.2.2	Sat May 16 17:58:46 2015
+++ src/lib/libc/stdlib/Makefile.inc	Thu Dec  8 07:43:44 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.82.2.2 2015/05/16 17:58:46 snj Exp $
+#	$NetBSD: Makefile.inc,v 1.82.2.3 2016/12/08 07:43:44 snj Exp $
 #	from: @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
 
 # stdlib sources
@@ -69,6 +69,7 @@ MLINKS+=hcreate.3 hdestroy.3 hcreate.3 h
 MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3
 MLINKS+=hcreate.3 hdestroy1.3 hcreate.3 hdestroy1_r.3
 MLINKS+=insque.3 remque.3
+MLINKS+=jemalloc.3 malloc.conf.5
 MLINKS+=lsearch.3 lfind.3
 MLINKS+=malloc.3 calloc.3 malloc.3 realloc.3 malloc.3 free.3
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3

Reply via email to