git: 98b88b839df1 - main - x11/cde: actually fix build on powerpc64le

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=98b88b839df1a88f538b8bfdc74e9734b0df7ea3

commit 98b88b839df1a88f538b8bfdc74e9734b0df7ea3
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-02-14 11:38:50 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-02-14 11:38:50 +0000

    x11/cde: actually fix build on powerpc64le
    
    This port doesn't respect setting FLAGS via Makefile, so -DPOWERPC64LE goes unnoticed.
    
    Switch to ifdef __powerpc64__.
---
 x11/cde/Makefile                                                  | 8 +-------
 .../patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c    | 4 ++--
 .../patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c    | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/x11/cde/Makefile b/x11/cde/Makefile
index afc2a5219849..c7c9b65ba024 100644
--- a/x11/cde/Makefile
+++ b/x11/cde/Makefile
@@ -41,12 +41,6 @@ MAKE_ENV=	MALLOC_CONF=junk:false
 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!' \
@@ -125,4 +119,4 @@ post-install:
 	# Only a problem on armv7 so far
 	${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete
 
-.include <bsd.port.post.mk>
+.include <bsd.port.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 004f6a5212b9..e729a3b2dcf2 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
@@ -4,7 +4,7 @@
  	va_list*		vp = va;
  	Hash_region_f		region = 0;
  	void*			handle;
-+#ifdef POWERPC64LE
++#ifdef __powerpc64__
 +	va_listarg		tmpval;
 +#endif
  
@@ -14,7 +14,7 @@
  				va_copy(*vp, ap);
  				vp++;
  			}
-+#ifdef POWERPC64LE
++#ifdef __powerpc64__
 +			tmpval = va_listval(va_arg(ap, va_listarg));
 +			va_copy(ap, tmpval);
 +#else
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 ae486604c41e..8e6ada6ebe27 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
@@ -4,7 +4,7 @@
  	char**		p_string;
  	char*		prv_f = 0;
  	va_list		prv_ap;
-+#ifdef POWERPC64LE
++#ifdef __powerpc64__
 +	va_listarg	tmpval;
 +#endif
  
@@ -14,7 +14,7 @@
  			prv_f = f;
  			f = va_arg(ap, char*);
  			va_copy(prv_ap, ap);
-+#ifdef POWERPC64LE
++#ifdef __powerpc64__
 +			tmpval = va_listval(va_arg(ap, va_listarg));
 +			va_copy(ap, tmpval);
 +#else