git: 4ae82fd2ee20 - main - x11-wm/nscde: fix packaging when uname -m != uname -p

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd

commit 4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-09-13 17:04:30 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-09-13 17:04:30 +0000

    x11-wm/nscde: fix packaging when uname -m != uname -p
    
    pkg-static: Unable to access file /wrkdirs/usr/ports/x11-wm/nscde/work/stage/usr/local/lib/NsCDE/FreeBSD_powerpc64/XOverrideFontCursor.so:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/x11-wm/nscde/work/stage/usr/local/libexec/NsCDE/FreeBSD_powerpc64/colorpicker:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/x11-wm/nscde/work/stage/usr/local/libexec/NsCDE/FreeBSD_powerpc64/fpclock:No such file or directory
---
 x11-wm/nscde/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile
index fa80bb7f6959..3f5c8fc5e2b0 100644
--- a/x11-wm/nscde/Makefile
+++ b/x11-wm/nscde/Makefile
@@ -65,7 +65,6 @@ SUB_LIST=	EXAMPLESDIR=${EXAMPLESDIR} \
 		PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/NsCDE-${DISTVERSION}
-PLIST_SUB=	ARCH=${ARCH}
 
 OPTIONS_DEFINE=			DOCS EXAMPLES
 OPTIONS_DEFAULT=		DOCS EXAMPLES KSH2020 SUDO
@@ -86,6 +85,11 @@ SUDO_RUN_DEPENDS=	sudo:security/sudo
 
 _SUDOFILES=	data/fvwm/Functions.fvwmconf.in lib/scripts/SysActionDialog
 
+.include <bsd.port.pre.mk>
+
+UNAME_M!=	${UNAME} -m
+PLIST_SUB+=	ARCH=${UNAME_M}
+
 post-patch-DOAS-on:
 	( for SUDOF in ${_SUDOFILES}; do ${REINPLACE_CMD} -e "s@sudo \\-n@doas@g" ${WRKSRC}/$${SUDOF}; done )
 
@@ -96,4 +100,4 @@ post-install-EXAMPLES-on:
 post-install-EXAMPLES-off:
 	${RM} -fr ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/*
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>