From owner-dev-commits-ports-all@freebsd.org Fri Sep 24 13:11:59 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 44B5466D72D; Fri, 24 Sep 2021 13:11:59 +0000 (UTC) (envelope-from git@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 4HGC9W0jNcz4pZ9; Fri, 24 Sep 2021 13:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CDC24173AB; Fri, 24 Sep 2021 13:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18ODBwiW058592; Fri, 24 Sep 2021 13:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18ODBwn3058591; Fri, 24 Sep 2021 13:11:58 GMT (envelope-from git) Date: Fri, 24 Sep 2021 13:11:58 GMT Message-Id: <202109241311.18ODBwn3058591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 7bcdcaa5437f - main - comms/predict: fix ncurses with ports and futur split in base MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bcdcaa5437f420895609d977bdea0f6e8589e9d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 13:11:59 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bcdcaa5437f420895609d977bdea0f6e8589e9d commit 7bcdcaa5437f420895609d977bdea0f6e8589e9d Author: Baptiste Daroussin AuthorDate: 2021-09-24 09:10:35 +0000 Commit: Baptiste Daroussin 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 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}