From owner-dev-commits-ports-branches@freebsd.org Sun Jun 6 20:37:37 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 5CC2463D6A0; Sun, 6 Jun 2021 20:37:37 +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 4FypGT2FZLz3tlp; Sun, 6 Jun 2021 20:37:37 +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 354441EA2; Sun, 6 Jun 2021 20:37:37 +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 156KbbSV038877; Sun, 6 Jun 2021 20:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 156KbbWW038876; Sun, 6 Jun 2021 20:37:37 GMT (envelope-from git) Date: Sun, 6 Jun 2021 20:37:37 GMT Message-Id: <202106062037.156KbbWW038876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: 878736cb3e3a - 2021Q2 - net/libwebsockets: Fix LWS_BUILD_HASH MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 878736cb3e3af51565807895660db9e92de32e11 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2021 20:37:37 -0000 The branch 2021Q2 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=878736cb3e3af51565807895660db9e92de32e11 commit 878736cb3e3af51565807895660db9e92de32e11 Author: Juraj Lutter AuthorDate: 2021-06-06 20:25:39 +0000 Commit: Juraj Lutter CommitDate: 2021-06-06 20:37:15 +0000 net/libwebsockets: Fix LWS_BUILD_HASH Pass LWS_BUILD_HASH to cmake instead of patching CMakeLists.txt This fixes ca989f6339de59653820f35a23f6107ee65d2e20 (cherry picked from commit c2f7da2a89ec7bab27dd6b8ab5e2936024a7b3d1) --- net/libwebsockets/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index a1236c01821b..694eb4b3bc4c 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -3,6 +3,7 @@ PORTNAME= libwebsockets DISTVERSIONPREFIX= v DISTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= net devel MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/ @@ -15,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake localbase pkgconfig tar:xz USE_LDCONFIG= yes +CMAKE_ARGS= -DLWS_BUILD_HASH:STRING="${BUILDINFO}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \ LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \ @@ -78,8 +80,4 @@ LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} -post-patch: - @${REINPLACE_CMD} -e 's|%%BUILDINFO%%|${BUILDINFO}|g' \ - ${PATCH_WRKSRC}/CMakeLists.txt - .include