git: 15f9fa2d5b3c - 2022Q1 - x11/cde: Fix build under 14-CURRENT

From: Cy Schubert <>
Date: Sun, 13 Feb 2022 01:21:29 UTC
The branch 2022Q1 has been updated by cy:


commit 15f9fa2d5b3c6c3babc70ba1037426b2a4e7532d
Author:     Cy Schubert <>
AuthorDate: 2022-02-12 18:14:18 +0000
Commit:     Cy Schubert <>
CommitDate: 2022-02-13 01:21:14 +0000

    x11/cde: Fix build under 14-CURRENT
    Under 14-CURRENT MALLOC_PRODUCTION is not set which puts malloc() into
    debug mode. In debug mode malloc() enables opt.junk to write junk to
    newly malloc()ed heap in order to help developers discover memory
    allocation bugs. Unfortunately CDE's dtinfogen assumes newly malloc()ed
    memory is zero filled (i.e. not filled with junk), resulting in
    "flex scanner jammed". This likely causes parsing of the junk past the
    end of any legitimate statements. This affects stock 14-CURRENT without
    MALLOC_PRODUCTION enabled. This is accomplished by setting the
    make environment variable MALLOC_CONF=junk:false. See malloc(3) for
    a complete description of MALLOC_CONF=junk:false.
    (cherry picked from commit 50324bba317cf1f58e8c434e0e2ed129cded3887)
 x11/cde/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11/cde/Makefile b/x11/cde/Makefile
index 257ecc4ea23c..afc2a5219849 100644
--- a/x11/cde/Makefile
+++ b/x11/cde/Makefile
@@ -37,6 +37,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 SUB_FILES=	pkg-message
 LDFLAGS+=	-z muldefs #--allow-multiple-definition