Date: Fri, 24 Sep 2021 13:11:58 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7bcdcaa5437f - main - comms/predict: fix ncurses with ports and futur split in base Message-ID: <202109241311.18ODBwn3058591@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bcdcaa5437f420895609d977bdea0f6e8589e9d commit 7bcdcaa5437f420895609d977bdea0f6e8589e9d Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2021-09-24 09:10:35 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2021-09-24 13:11:52 +0000 comms/predict: fix ncurses with ports and futur split in base While here, avoid useless call on sed where easily possible --- comms/predict/Makefile | 5 ++--- comms/predict/files/Makefile | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/comms/predict/Makefile b/comms/predict/Makefile index 138e6d343db2..7212cf4a9822 100644 --- a/comms/predict/Makefile +++ b/comms/predict/Makefile @@ -14,12 +14,11 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib USES= ncurses INSTALL_TARGET= install install.man +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" STAGEDIR="${STAGEDIR}" post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/predict.h > ${WRKSRC}/predict.h @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/vocalizer.h > ${WRKSRC}/vocalizer/vocalizer.h - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%STAGEDIR%%|${STAGEDIR}|g' \ - -e 's|%%CC%%|${CC}|g' -e 's|%%CFLAGS%%|${CFLAGS}|g' \ - ${FILESDIR}/Makefile > ${WRKSRC}/Makefile + @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile .include <bsd.port.mk> diff --git a/comms/predict/files/Makefile b/comms/predict/files/Makefile index 07935eae81d0..cf449317fbe5 100644 --- a/comms/predict/files/Makefile +++ b/comms/predict/files/Makefile @@ -1,12 +1,7 @@ -PREFIX= %%PREFIX%% -STAGEDIR= %%STAGEDIR%% -CC= %%CC%% -CFLAGS= %%CFLAGS%% - default: all all: predict vocalizer/vocalizer -LIBS = ${LDFLAGS} -pthread -lm -lncurses +LIBS = ${LDFLAGS} -pthread -lm -lncursesw predict: predict.c predict.h ${CC} ${CFLAGS} -o predict predict.c ${LIBS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109241311.18ODBwn3058591>