Re: git: 021fcd36af22 - main - games/coffeebreak: Move man pages to share/man
Date: Sun, 10 Mar 2024 10:47:07 UTC
(...) Works fine: === +MAKE_ARGS= PREFIX=${PREFIX} MANDIR=${STAGEDIR}${PREFIX}/share/man PLIST_FILES= bin/coffeebreak \ share/man/man6/coffeebreak.6.gz -post-patch: - ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile - --- a/games/coffeebreak/files/patch-Makefile +++ /dev/null === What do you think? This way it is nicely simplified without patch or sed. Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 10/03/2024 à(s) 10:05): > > (...) > > One possibility is: > > MAKE_ARGS= PREFIX=${PREFIX} MANDIR=${STAGEDIR}${PREFIX}/share/man > but maybe I need to patch 'VAR =' to 'VAR ?=' > > Makefile: > PREFIX = /usr/local > BINDIR = $(DESTDIR)$(PREFIX)/bin > MANDIR = $(DESTDIR)$(PREFIX)/man > MAN6DIR = $(MANDIR)/man6 > > Nuno Teixeira <eduardo@freebsd.org> escreveu (domingo, 10/03/2024 à(s) 09:43): > > > > Hello danfe! > > > > Good point. > > > > The problem here is that I can't use MANDIR in MAKE_ARGS because > > Makefile have $(DESTDIR) defined in MANDIR var. > > MANDIR = $(DESTDIR)$(PREFIX)/man > > > > Also, SED is needed anyway to fix hardcoded "/usr/local" to PREFIX. > > > > Any sugestions to simplify this? > > > > Thanks, > > > > Alexey Dokuchaev <danfe@freebsd.org> escreveu (domingo, 10/03/2024 à(s) 09:16): > > > > > > On Sat, Mar 09, 2024 at 08:31:19AM +0000, Nuno Teixeira wrote: > > > > commit 021fcd36af22585a4bcf6e71ccb9a7d0f6ed204a > > > > > > > > games/coffeebreak: Move man pages to share/man > > > > ... > > > > + > > > > +post-patch: > > > > + ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile > > > > > > > > .include <bsd.port.mk> > > > > ... > > > > +--- 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 > > > > > > We typically don't patch makefiles, esp. twice (sed+patch) when we have > > > MAKE_ARGS for that matter. Grepping "git log" output for MAKE_ARGS can > > > yield plenty of examples. > > > > > > ./danfe > > > > > > > > -- > > Nuno Teixeira > > FreeBSD Committer (ports) > > > > -- > Nuno Teixeira > FreeBSD Committer (ports) -- Nuno Teixeira FreeBSD Committer (ports)