Date: Mon, 11 Mar 2024 11:06:30 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1128357fc9df - main - games/coffeebreak: Correct sed and patch applied twice Message-ID: <202403111106.42BB6Uje077102@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1128357fc9dfbcb35d4346cc9a45041224607f73 commit 1128357fc9dfbcb35d4346cc9a45041224607f73 Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-03-11 10:55:45 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> 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 <bsd.port.mk> 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403111106.42BB6Uje077102>