From nobody Sat Nov 13 00:58:30 2021 X-Original-To: dev-commits-ports-branches@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 E5898183B6B2; Sat, 13 Nov 2021 00:58:30 +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 4HrcX65DB2z54sK; Sat, 13 Nov 2021 00:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 93BA91A70; Sat, 13 Nov 2021 00:58:30 +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 1AD0wUwc009720; Sat, 13 Nov 2021 00:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AD0wUTM009719; Sat, 13 Nov 2021 00:58:30 GMT (envelope-from git) Date: Sat, 13 Nov 2021 00:58:30 GMT Message-Id: <202111130058.1AD0wUTM009719@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 3f44b1f472c1 - 2021Q4 - x11-wm/river: restore /usr fix accidentally removed in 1d4d1fedb94d List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 3f44b1f472c12a703dd589ccb37547a09ed43a6b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f44b1f472c12a703dd589ccb37547a09ed43a6b commit 3f44b1f472c12a703dd589ccb37547a09ed43a6b Author: Jan Beich AuthorDate: 2021-11-13 00:55:59 +0000 Commit: Jan Beich CommitDate: 2021-11-13 00:58:27 +0000 x11-wm/river: restore /usr fix accidentally removed in 1d4d1fedb94d The manpage still has /usr refernces e.g., /usr/include/xkbcommon/xkbcommon-keysyms.h /usr/include/linux/input-event-codes.h (cherry picked from commit 0bef5c19453e3ed661f845a20fd1c4979112642c) --- x11-wm/river/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 8de81e744f7f..12567a4058bf 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -63,6 +63,9 @@ post-patch: # Respect devel/pkgconf default search @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ ${WRKSRC}/build.zig +# Respect PREFIX in path references + @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ + ${WRKSRC}/doc/${PORTNAME}ctl.1.scd do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})