aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2022-09-13 17:04:30 +0000
committerPiotr Kubaj <pkubaj@FreeBSD.org>2022-09-13 17:04:30 +0000
commit4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd (patch)
treec143e7099306d436d77e94aaf1f9da56afe3d577
parent86fc8096f5fa98d0d2ddc52d731da343d6a68018 (diff)
downloadports-4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd.tar.gz
ports-4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd.zip
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
-rw-r--r--x11-wm/nscde/Makefile8
1 files 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>