From nobody Tue Sep 13 17:14:20 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MRqnm3PyJz4bvgD; Tue, 13 Sep 2022 17:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MRqnm31f4z3M3Z; Tue, 13 Sep 2022 17:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wwft7rcsh5NpvCM8g7C3YrQkcH0NwoNth7wzvit5IjI=; b=VUqg8V1TW+CV273kU0+L6iiQv8bLKaMlmRMKZ1U7/ieO5VTI7UW7fKQSNeXhs9wYGcvtVJ loQO/WwkvHKUhgh5VJlZGFdJpU67jMqx/SrgIz8ADp3sAYwakCIDnpgYov363KoZ2pItsC O+yTvV9YJaPRXSyV4S57pN+4pj5LlT7u24f9noFnwSh5oYiSI1eU8U58W5F31UD0qV54dv MDbOnjOAhuAQrkZWQoTn+EikExOwu+dLMipIYNL2o29qswi52YnfnvAxMi9F+kpYQE3Hb5 OtDvivpQ4sN5Lgj5SwZV0/HNOZ7k4dtzmgYOeyBqfYaiMK+5xyBfTHjdLl6J3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MRqnm1qpYzPb9; Tue, 13 Sep 2022 17:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28DHEKve023754; Tue, 13 Sep 2022 17:14:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DHEK34023753; Tue, 13 Sep 2022 17:14:20 GMT (envelope-from git) Date: Tue, 13 Sep 2022 17:14:20 GMT Message-Id: <202209131714.28DHEK34023753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 4ae82fd2ee20 - main - x11-wm/nscde: fix packaging when uname -m != uname -p List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wwft7rcsh5NpvCM8g7C3YrQkcH0NwoNth7wzvit5IjI=; b=YIzDKUfADd4I9XGkWRJyiwvtTJJ4oRDsln+7jtKF5EY+8Do0mvrXaVaAOHenFB+hA0DrZd eKG4HgHmKlYnkI7Iq7CSXYEWsomw/9EoGioR6dYfOt5csUInUJpsjjBdLx+00NSEEeQ2jv WLOjSghO+9YiBgxaNVT8OsabPOsNqVFiw9zT7aEgMk868yERFgVeicrXlnW5suZ4nShzV9 iIpVVdRkFCL1tUVK/wmP9IamQwRBfzDB7VDZehSSJwJw2CptSp+/4pF9Wd0xrFD6Mg3QrF Y6kJB4YGvHJemcfHDG7+Q1OafR9QaanAMwaaF822nHMiKfF8YRqSMEx0knuXVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663089260; a=rsa-sha256; cv=none; b=q/1pLtR7IqLbTvs0A9EiWbAB2x07hfGKZD+EYAEX19ikxFE3DlmclhZr4GH8WxWIkteXVp lu3VkOzHnEWkLp7uhrzknzzyK9DUuAwOWR+IzqmKGMcsMjl9ChqKX2CGKOW98qh38RMmD7 vXfasSct/PNNUV8aOLo0bmB6WPRqVMyFqYdFZaYWxzibDl0+ER5tLSybuJEUwhaUyHI7yR KviAQvuen6cIzjZcnLPuIGDNp1/wbXhpRiELQZl6845km4OweL600QktfvYRew8lECIX/s QDGdzKr0uBXL13ieKASBo0FxpI55518zSceRGMg3TdUL3R1Q61h/iOA5/qwY0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd commit 4ae82fd2ee2059cd9ee0ec99bd6fd8062cd5dbdd Author: Piotr Kubaj AuthorDate: 2022-09-13 17:04:30 +0000 Commit: Piotr Kubaj 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 + +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 +.include