git: 0e66f4260178 - main - shells/modernish: Fix build

Mateusz Piotrowski 0mp at FreeBSD.org
Wed Apr 28 12:58:01 UTC 2021


The branch main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0e66f4260178b5e9528cd6009d4c3c735bf46350

commit 0e66f4260178b5e9528cd6009d4c3c735bf46350
Author:     Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-04-28 12:47:43 +0000
Commit:     Mateusz Piotrowski <0mp at FreeBSD.org>
CommitDate: 2021-04-28 12:57:47 +0000

    shells/modernish: Fix build
    
    It looks like modernish requires /dev/tty to be available during the
    installation as it tries to run its install-time test suite. A solution
    to that is wrapping ./install.sh with script(1) to make a TTY available.
    Interestingly, if we replace script(1) with daemon(8), we can reproduce
    the error present in the pkg fallout logs.
---
 shells/modernish/Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/shells/modernish/Makefile b/shells/modernish/Makefile
index 1a708410c92c..44a444f33226 100644
--- a/shells/modernish/Makefile
+++ b/shells/modernish/Makefile
@@ -16,14 +16,10 @@ NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-extract:
-	${MV} ${WRKSRC}/lib/modernish/cap/BUG_DEVTTY.t ${WRKDIR}
-
 do-install:
 	cd ${WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ${SH} -x ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH}
-
-	${INSTALL_DATA} ${WRKDIR}/BUG_DEVTTY.t ${STAGEDIR}${PREFIX}/lib/modernish/cap/BUG_DEVTTY.t
+	${SETENV} ${MAKE_ENV} script -q /dev/stdout \
+		${SH} -x ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH}
 
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR:H}


More information about the dev-commits-ports-all mailing list