Date: Mon, 6 Sep 2021 15:16:45 GMT From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e47c577da6ce - main - biology/emboss: Put emboss-shell in default PATH Message-ID: <202109061516.186FGjeC014343@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=e47c577da6ce40e629041a92a327d9648ef72bd0 commit e47c577da6ce40e629041a92a327d9648ef72bd0 Author: Jason W. Bacon <jwb@FreeBSD.org> AuthorDate: 2021-09-06 15:13:03 +0000 Commit: Jason W. Bacon <jwb@FreeBSD.org> CommitDate: 2021-09-06 15:13:03 +0000 biology/emboss: Put emboss-shell in default PATH PREFIX is overridden by default in the port Makefile, so PREFIX/bin is not normally in PATH. The purpose of emboss-shell is to prepend PREFIX/bin to PATH to give access to emboss tools. Also fix tcsh detection. PR: 258316 --- biology/emboss/Makefile | 3 ++- biology/emboss/distinfo | 2 +- biology/emboss/files/emboss-shell.in | 2 +- biology/emboss/pkg-plist | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile index aa966ad37b6d..24862d3e1732 100644 --- a/biology/emboss/Makefile +++ b/biology/emboss/Makefile @@ -54,7 +54,8 @@ pre-install: @ ${REINPLACE_CMD} -e 's#%%DATADIR%%#${PREFIX}/share/${PORTNAME:tu}#' ${CONFIG_FILE} post-install: + @${MKDIR} ${STAGEDIR}${LOCALBASE}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/emboss-shell ${STAGEDIR}${LOCALBASE}/bin ${INSTALL_DATA} ${CONFIG_FILE} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/emboss-shell ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/biology/emboss/distinfo b/biology/emboss/distinfo index d36d2d7c9e0b..ea7511984c28 100644 --- a/biology/emboss/distinfo +++ b/biology/emboss/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630936830 +TIMESTAMP = 1630940920 SHA256 (emboss/EMBOSS-6.6.0.tar.gz) = 7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e SIZE (emboss/EMBOSS-6.6.0.tar.gz) = 117962028 diff --git a/biology/emboss/files/emboss-shell.in b/biology/emboss/files/emboss-shell.in index 525b04bcc397..319aad3bfa2a 100755 --- a/biology/emboss/files/emboss-shell.in +++ b/biology/emboss/files/emboss-shell.in @@ -20,7 +20,7 @@ EOM export PATH=${emboss_bin}:$PATH # Invoke the user's chosen shell -if echo $SHELL | grep -q '/t?csh'; then +if echo $SHELL | egrep -q '/t?csh'; then args='-f' fi exec $SHELL $args diff --git a/biology/emboss/pkg-plist b/biology/emboss/pkg-plist index 7ab1e1f9b74b..281c02c28196 100644 --- a/biology/emboss/pkg-plist +++ b/biology/emboss/pkg-plist @@ -77,7 +77,7 @@ bin/edamisid bin/edamname bin/edialign bin/einverted -bin/emboss-shell +%%LOCALBASE%%/bin/emboss-shell bin/embossdata bin/embossupdate bin/embossversion
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109061516.186FGjeC014343>