From owner-svn-ports-head@freebsd.org Thu Jan 21 22:26:51 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98FE84E1C33; Thu, 21 Jan 2021 22:26:51 +0000 (UTC) (envelope-from adridg@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 4DMH7H3yRMz3H7G; Thu, 21 Jan 2021 22:26:51 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7AE1313EA4; Thu, 21 Jan 2021 22:26:51 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10LMQpug092538; Thu, 21 Jan 2021 22:26:51 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10LMQphV092537; Thu, 21 Jan 2021 22:26:51 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202101212226.10LMQphV092537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 21 Jan 2021 22:26:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562252 - head/games/cowsay X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/games/cowsay X-SVN-Commit-Revision: 562252 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 22:26:51 -0000 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