Date: Thu, 21 Jan 2021 22:26:51 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562252 - head/games/cowsay Message-ID: <202101212226.10LMQphV092537@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Thu Jan 21 22:26:51 2021 New Revision: 562252 URL: https://svnweb.freebsd.org/changeset/ports/562252 Log: Fix build artifacts in games/cowsay `cowsay -h` still reported 3.03 (this was an upstream error) and the manpage contained STAGEDIR paths; fix that with some sed-work. I've added comments in the makefile explaining how we're mulching this ancient perl script. Note that this uses `${SED} -i` rather than `${REINPLACE_CMD}` because that's what the port was already doing. I didn't want to change style at the same time. PR: 245324 Approved by: maintainer timeout (2 weeks) Modified: head/games/cowsay/Makefile Modified: head/games/cowsay/Makefile ============================================================================== --- head/games/cowsay/Makefile Thu Jan 21 22:20:40 2021 (r562251) +++ head/games/cowsay/Makefile Thu Jan 21 22:26:51 2021 (r562252) @@ -4,7 +4,7 @@ PORTNAME= cowsay PORTVERSION= 3.04 DISTVERSIONPREFIX= cowsay- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= lifanov@FreeBSD.org @@ -27,7 +27,17 @@ post-patch: do-install: cd ${WRKSRC}; ${SH} install.sh ${STAGEDIR}${PREFIX} + # The sources have not had their version updated in the last release; + # normally this would be a patch (replacing the relevant "3.03" by + # something like %%PORTVERSION%%) and then a substitution, but there + # is no future release planned anyway. + ${SED} -i '' 's,3\.03,${PORTVERSION}_${PORTREVISION},' ${STAGEDIR}${PREFIX}/bin/cowsay + # Since we called install.sh with a **stage** path, that is the path + # that gets edited into the script and manpage; remove the stage + # bit from both so that after installation cowsay uses, and the manpage + # mentions, the prefix path, not the stage path. @${SED} -i '' 's,${STAGEDIR},,' ${STAGEDIR}${PREFIX}/bin/cowsay + @${SED} -i '' 's,${STAGEDIR},,' ${STAGEDIR}${PREFIX}/man/man1/cowsay.1 ${INSTALL_DATA} ${FILESDIR}/box.cow ${STAGEDIR}${PREFIX}/share/cows ${INSTALL_DATA} ${FILESDIR}/jkh.cow ${STAGEDIR}${PREFIX}/share/cows ${INSTALL_DATA} ${FILESDIR}/tux-stab.cow ${STAGEDIR}${PREFIX}/share/cows
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101212226.10LMQphV092537>