From nobody Mon Mar 11 11:06:30 2024 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 4TtYqp70W8z5ClDY; Mon, 11 Mar 2024 11:06: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 4TtYqp6NZ4z41gp; Mon, 11 Mar 2024 11:06:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710155190; 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=i8FEF+3uw7G1MtsjJ21GuM+7B9NaBwI+qUCWn/qeo/o=; b=RxoeWBQ4CoJYd8JRH7Hq/8KoNOBRpfxWWvS0BB9nOFhDCdQ51Rfmo9bRZocFT+ieFVP6SG NyMUZtA0CAq1zIe5pizp0Udf26FDr8yLjw6Qb+vTrgnCiPrmxFX+r2MSWEuUBOEFjJ0wNO v0o3XQfzd2xtfbjGUWzmBay/+RWqGqt55FtWWWXk6DRvTawZPuYYc8cXverTerCAHQY90r Xi/KmytrwUBIuVUSG87bxqfnRZrw1/dmSDcyORBck6yCem681WtFDd5eHbmVo9AC0N6KKs eRnrMlM75sxq8nld6UDJQQKcsN1oOPX4HwFOvGTcvefoRdMZZpdo2Eb0FR6Lgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710155190; a=rsa-sha256; cv=none; b=PxX3JL8zD8e+OrFFgrTn8CaSw57AZIqym/6jDgfv5F8pSgwMfQN97mz6O4Qd81Enu7oGE8 TTl6atqaaZcOHxNBhrpoHE39YsfsjcpRGDWeaLHiIJ4D8NHrlxLsUGKIZOummFl3GVD+BH NkmeV/xleqSZGY/o1e+LJpjEuLv+SquaY1N8x8WC2ieJoPwaiAnXeWDJnxP2Ched6FMR6g 5lxnyU9noY4u7Gv69mMCoDCNtfjG0+M/0+TCSxKJv/sMA5K/h7w/qlmfo/aI+tm/Bs4URK Fttfsqhd/kxlg6g3V3SUQy6mw76V5dcTsknBS6JmYvOSmJnJma/eZbqnyx1EpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710155190; 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=i8FEF+3uw7G1MtsjJ21GuM+7B9NaBwI+qUCWn/qeo/o=; b=R46AfPK8fbyavyGpp6eUPYThc+IFndCpEVF8fNwvzkzRR9EuH+qEylU9o9kvbny5woN3qH 05A0pn4/LC0lltIG8ZzQjAbRKlT/lLTIDWZRGFAgXxRaGylWSQMZP91WSGc8Qmi5o2zeTc 3JbIVuBXXSk6s6PBA/0yc0kiSrPDC9dSlsxESbeqGjkRYK/0D8xxhGH8WZnSVUxfeaqGcT 1QQ7tH87FCZKDigtdqKmS2GxB55TDSlSW4Sv7tPjuyVYqSdpL57Tvrq1V1oZ65Nl3jHFN4 cZ+5ZZNrcnhiXyqXp3IcsLKQIRn8iuoR8S2xhEmYwgRe0hTlfn+o1jVIt/WepA== 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 4TtYqp5zhbzRR8; Mon, 11 Mar 2024 11:06:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42BB6U4v077105; Mon, 11 Mar 2024 11:06:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BB6Uje077102; Mon, 11 Mar 2024 11:06:30 GMT (envelope-from git) Date: Mon, 11 Mar 2024 11:06:30 GMT Message-Id: <202403111106.42BB6Uje077102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 1128357fc9df - main - games/coffeebreak: Correct sed and patch applied twice 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1128357fc9dfbcb35d4346cc9a45041224607f73 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1128357fc9dfbcb35d4346cc9a45041224607f73 commit 1128357fc9dfbcb35d4346cc9a45041224607f73 Author: Nuno Teixeira AuthorDate: 2024-03-11 10:55:45 +0000 Commit: Nuno Teixeira CommitDate: 2024-03-11 11:06:22 +0000 games/coffeebreak: Correct sed and patch applied twice Last commit "Move man to share/man" I used patch to set MANDIR and sed to fix hardcoded PREFIX=/usr/local on wrksrc Makefile. Simplify and correct changes with use of MAKE_ARGS. Not bumping port revision as is doesn't change build. Reported by: danfe Approved by: portmgr (blanket) Fixes: 021fcd36af22 Move man pages to share/man --- games/coffeebreak/Makefile | 6 +++--- games/coffeebreak/files/patch-Makefile | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/games/coffeebreak/Makefile b/games/coffeebreak/Makefile index 50bfc8a5c13d..1d41976a3023 100644 --- a/games/coffeebreak/Makefile +++ b/games/coffeebreak/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= 0mp +MAKE_ARGS= MANDIR=${STAGEDIR}${PREFIX}/share/man \ + PREFIX=${PREFIX} + NO_ARCH= yes NO_BUILD= yes PLIST_FILES= bin/coffeebreak \ share/man/man6/coffeebreak.6.gz -post-patch: - ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile - .include diff --git a/games/coffeebreak/files/patch-Makefile b/games/coffeebreak/files/patch-Makefile deleted file mode 100644 index 7b8a2c2a1945..000000000000 --- a/games/coffeebreak/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2024-03-09 06:57:33 UTC -+++ Makefile -@@ -27,7 +27,7 @@ BINDIR = $(DESTDIR)$(PREFIX)/bin - - PREFIX = /usr/local - BINDIR = $(DESTDIR)$(PREFIX)/bin --MANDIR = $(DESTDIR)$(PREFIX)/man -+MANDIR = $(DESTDIR)$(PREFIX)/share/man - MAN6DIR = $(MANDIR)/man6 - - install: