git: 181ced015360 - 2022Q1 - x11/cde: MFH x11/cde fixes

The branch 2022Q1 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=181ced015360d1b86b57298da7be4422e0d28522

commit 181ced015360d1b86b57298da7be4422e0d28522
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-01-20 21:20:59 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-01-23 20:02:29 +0000

    x11/cde: MFH x11/cde fixes
    
    The following MFHs were requested by  Robert Clausecker <fuz@fuz.su>
    in PR/261359:
    
    Requested by:   Robert Clausecker <fuz@fuz.su>
    PR:             261359
    
    --
    x11/cde: Fix armv7 build
    
    In attempting to fix powerpc64le, c66a851d13783558a8fa17ffcf64759a0c1b5bab
    broke armv7. Fix it.
    
    PR:             261359
    Reported by:    Robert Clausecker <fuz@fuz.su>
    Fixes:          c66a851d13783558a8fa17ffcf64759a0c1b5bab
    
    (cherry picked from commit 47d8fb3af3f0e411edcb06a9c694813404c8fe39)
    
    --
    x11/cde: Mark BROKEN on armv7
    
    STAGEDIR contains numerous intermediate files likely used during the
    install process which are not in the final STAGEDIR on other platforms.
    An example of one of the 5830 orphaned files is:
    dt/app-defaults/C/ecp.2AeDmfIk.
    
    PR:             261359
    (cherry picked from commit 03c319e5e9f2bd0244819d0d74159d98c10842d2)
    
    --
    x11/cde: Handle undstrippable outputs
    
    Stripping unstrippable files results in ecp.* files. Deal with the
    fallout.
    
    PR:             261359, 261359
    (cherry picked from commit ba5de232fe34dc71085e96d1df7937bea080f4d6)
    
    --
    x11/cde: Fix a typo
    
    Reported by:    adridg
    
    (cherry picked from commit 235153c84f41c06ba188bf3df297a6e87b2fe339)
---
 x11/cde/Makefile                                          | 10 +++++++++-
 ...h-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c | 15 ++++++++++-----
 ...h-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c | 15 ++++++++++-----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/x11/cde/Makefile b/x11/cde/Makefile
index a87ec364b298..257ecc4ea23c 100644
--- a/x11/cde/Makefile
+++ b/x11/cde/Makefile
@@ -40,6 +40,12 @@ MAKE_JOBS_UNSAFE=yes
 SUB_FILES=	pkg-message
 LDFLAGS+=	-z muldefs #--allow-multiple-definition
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == powerpc64le
+CPPFLAGS+=	-DPOWERPC64LE
+.endif
+
 post-patch:
 	@if [ -f /usr/include/iconv.h ]; then \
 	    ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \
@@ -115,5 +121,7 @@ do-install:
 
 post-install:
 	${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \;
+	# Only a problem on armv7 so far
+	${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
index f050420f5e21..004f6a5212b9 100644
--- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
+++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
@@ -1,20 +1,25 @@
---- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2021-12-13 19:03:46 UTC
-+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
-@@ -49,6 +49,7 @@ hashalloc(Hash_table_t* ref, ...)
+--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2022-01-20 12:56:31.275926000 -0800
++++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c	2022-01-20 12:59:47.461533000 -0800
+@@ -49,6 +49,9 @@
  	va_list*		vp = va;
  	Hash_region_f		region = 0;
  	void*			handle;
++#ifdef POWERPC64LE
 +	va_listarg		tmpval;
++#endif
  
  	va_start(ap, ref);
  
-@@ -151,7 +152,8 @@ hashalloc(Hash_table_t* ref, ...)
+@@ -151,7 +154,12 @@
  				va_copy(*vp, ap);
  				vp++;
  			}
--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
++#ifdef POWERPC64LE
 +			tmpval = va_listval(va_arg(ap, va_listarg));
 +			va_copy(ap, tmpval);
++#else
+ 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
++#endif
  			break;
  		case 0:
  			if (vp > va)
diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
index 5dcf7b11dafe..ae486604c41e 100644
--- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
+++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
@@ -1,20 +1,25 @@
---- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2021-12-13 22:46:02 UTC
-+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c
-@@ -188,6 +188,7 @@ tokscan(register char* s, char** nxt, const char* fmt,
+--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2022-01-20 12:56:38.679529000 -0800
++++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c	2022-01-20 13:02:26.179022000 -0800
+@@ -188,6 +188,9 @@
  	char**		p_string;
  	char*		prv_f = 0;
  	va_list		prv_ap;
++#ifdef POWERPC64LE
 +	va_listarg	tmpval;
++#endif
  
  	va_start(ap, fmt);
  	if (!*s || *s == '\n')
-@@ -233,7 +234,8 @@ tokscan(register char* s, char** nxt, const char* fmt,
+@@ -233,7 +236,12 @@
  			prv_f = f;
  			f = va_arg(ap, char*);
  			va_copy(prv_ap, ap);
--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
++#ifdef POWERPC64LE
 +			tmpval = va_listval(va_arg(ap, va_listarg));
 +			va_copy(ap, tmpval);
++#else
+ 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
++#endif
  			continue;
  		case 'c':
  			p_char = va_arg(ap, char*);