From owner-dev-commits-ports-all@freebsd.org Wed May 12 23:48:50 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 A4B6D64FC62; Wed, 12 May 2021 23:48:50 +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 4FgWhf4CQsz3jCh; Wed, 12 May 2021 23:48:50 +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 827AE14979; Wed, 12 May 2021 23:48:50 +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 14CNmocI067987; Wed, 12 May 2021 23:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14CNmob7067986; Wed, 12 May 2021 23:48:50 GMT (envelope-from git) Date: Wed, 12 May 2021 23:48:50 GMT Message-Id: <202105122348.14CNmob7067986@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 560db241dceb - main - security/zeek: Unbreak build when PREFIX is not /usr/local MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 560db241dceb91e8dae36b14ce39e89b3ecbebe3 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: Wed, 12 May 2021 23:48:50 -0000 The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=560db241dceb91e8dae36b14ce39e89b3ecbebe3 commit 560db241dceb91e8dae36b14ce39e89b3ecbebe3 Author: Craig Leres AuthorDate: 2021-05-12 23:47:01 +0000 Commit: Craig Leres CommitDate: 2021-05-12 23:47:01 +0000 security/zeek: Unbreak build when PREFIX is not /usr/local --- security/zeek/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/security/zeek/Makefile b/security/zeek/Makefile index 55cc4261f6c2..1d52451ba418 100644 --- a/security/zeek/Makefile +++ b/security/zeek/Makefile @@ -140,8 +140,7 @@ pre-install-ZEEKCTL-on: post-install-NETMAP-on: ${MKDIR} ${WRKDIR}/zeek-bin ${CP} ${STAGEDIR}${PREFIX}/bin/zeek-config ${WRKDIR}/zeek-bin - ${REINPLACE_CMD} -e 's|=/usr/local|=${STAGEDIR}${PREFIX}|' \ - -e '/^include_dir=/s|:/usr/local|:${STAGEDIR}${PREFIX}|' \ + ${REINPLACE_CMD} -e 's|${PREFIX}|${STAGEDIR}${PREFIX}|g' \ ${WRKDIR}/zeek-bin/zeek-config cd ${WRKSRC_zeek_netmap} && ${SETENV} PATH=${WRKDIR}/zeek-bin:${PATH} \ ./configure --with-netmap=/usr \