x11/cde: Update to 2.4.0

This commit updates x11/cde from 2.3.2 to 2.4.0. 2.4.0 fixes a local
privilege escalation in dteseesion, DtSvc.

Other changes include:

- 2.4.0 builds under FreeBSD 14-CURRENT using both poudriere (as before)
  and now directly on the command line using make.

- i386 is now broken because it cannot bind to a temporary of type va_list.

- This commit also changes maintainership to myself (cy) as requested
  by crees (maintainer) in PR/257148.

PR:		257148
Submitted by:	cy
Reported by:	cy
Approved by:	crees
MFH:		2021-Q3
Security:	CVE-2020-2696/VU#308289
Security:	VuXML: 848bdd06-f93a-11eb-9f7d-206a8a720317

x11/cde/Makefile

@@ -1,16 +1,16 @@
 PORTNAME=	cde
-DISTVERSION=	2.3.2
+DISTVERSION=	2.4.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/cdesktopenv/src/
 
-MAINTAINER=	crees@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Common Desktop Environment
 
 LICENSE=	LGPL21
 
 BROKEN_mips64=		fails to build: ./config/imake/imake: No such file or directory
 BROKEN_powerpc64=	fails to build: ./config/imake/imake: No such file or directory
-BROKEN_FreeBSD_14=	jams flex scanner
+BROKEN_i386=		cannot bind to a temporary of type va_list
 
 BUILD_DEPENDS=	ksh93:shells/ksh93			\
 		bdftopcf:x11-fonts/bdftopcf		\
@@ -85,11 +85,11 @@ post-patch:
 
 # we need to remove a few LOCALBASE
 	@${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtinfogen|/etc/dtinfogen|g' \
-		${WRKSRC}/databases/CDE-RUN.udb \
+		${WRKSRC}/databases/CDE-RUN.src \
 		${WRKSRC}/config/cf/cde.tmpl
 	@${REINPLACE_CMD} -e 's|${LOCALBASE}/etc/dtsr|/etc/dtsr|g' -e \
 		's|${LOCALBASE}/etc/dtinfo_start|/etc/dtinfo_start|g' \
-		${WRKSRC}/databases/CDE-RUN.udb \
+		${WRKSRC}/databases/CDE-RUN.src \
 		${WRKSRC}/programs/tttypes/dtinfo_start.ptype \
 		${WRKSRC}/programs/tttypes/dtinfo.ptype
 	@${REINPLACE_CMD} -e 's|${LOCALBASE}||g' \

x11/cde/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1612966762
-SHA256 (cde-2.3.2.tar.gz) = 7dd1f4e22dd018be2c310354314f469d835f8441f4b69f511f88e412a1a43909
-SIZE (cde-2.3.2.tar.gz) = 57552496
+TIMESTAMP = 1626123275
+SHA256 (cde-2.4.0.tar.gz) = 023df9d71f625583f36c2e3f7e57ddf85a8798eda203b40ba583c12c0c446e1e
+SIZE (cde-2.4.0.tar.gz) = 58841593

x11/cde/files/patch-lib_DtSearch_raima_dbtype.h

@@ -1,13 +0,0 @@
-Remove unnecessary and conflicting global variable
-
---- lib/DtSearch/raima/dbtype.h.orig	2021-02-11 09:26:30.733694000 +0000
-+++ lib/DtSearch/raima/dbtype.h	2021-02-11 09:25:05.275302000 +0000
-@@ -405,7 +405,7 @@
- struct sk {
-    INT sk_fld;
-    CHAR_P sk_val;
--} __SK__;
-+};
- typedef struct { struct sk *ptr; LOCK_DESC } SK_P;
- 
- /* node key search path stack entry: one per level per key field */

x11/cde/files/patch-programs_dtcm_dtcm_calendarA.c

@@ -1,14 +1,11 @@
-We don't use inetd-- that involves messing with inetd.conf.  May as well
-just launch as a daemon, which also deals with rpcbind dependency.
-
---- programs/dtcm/dtcm/calendarA.c.orig	2016-09-14 10:18:38 UTC
-+++ programs/dtcm/dtcm/calendarA.c
-@@ -2051,7 +2051,7 @@ error_open(Calendar *c) {
+--- programs/dtcm/dtcm/calendarA.c.orig	2021-07-03 12:35:15.000000000 -0700
++++ programs/dtcm/dtcm/calendarA.c	2021-07-12 13:58:22.306477000 -0700
+@@ -2047,7 +2047,7 @@
  	set_message(c->message_text, buf);
  
- 	sprintf(buf, "%s\n%s: %s, %s: %s", catgets(c->DT_catd, 1, 91,
+ 	sprintf(buf, "%s\n%s: %s, %s: %s", CATGETS(c->DT_catd, 1, 91,
 -				   		"rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin inetd.conf for rpc.cmsd is correct for your host."),
-+				   		"rpc.cmsd is not responding for your user name.\nMake sure that rpc.cmsd is running and enabled\nin /etc/rc.conf (dtcms_enable=yes)."),
++				   		"rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin /etc/rc.conf for rpc.cmsd is correct for your host."),
  		nl_user, name,
  		nl_host, host);