From nobody Tue Dec 31 08:37:13 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YMmYP3Y7Dz5j6Xh; Tue, 31 Dec 2024 08:37:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMmYP2zGCz4Km0; Tue, 31 Dec 2024 08:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735634233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VX309h+dKul6X89+ZefNYw8G9nKNeh4hvlQfdgNvlAc=; b=whAE1u3NolL5l+n+bxoJwKXHCoHvJjLscqvHTKs9Gfy1zqt6/XHtU2C8CmXjpOhAVTJhQj uW3X5S5iI8VqOkAfnNur4H0wJlg1sfE3c7vSF7XoZRyt0P/dDWxJrOf40S2RcDCN/TTvzD vqfsFiSy/BgM44sCT5YwarYUeSW+xcwyrIz3KZNnHRxZFUXC/njy0NF5O2wM9jhs92CgYl jGYdD9PLvFyl9jR0UvpPOoxhYUVpBt6otn2w3W/e2zVMcX5aUx/GKbLyI4Jq188cWZEfkC +W9ZayYgd5soGxhX6eZ6ZjVjQ67QRsxIMzXv06/PJn6ovVsVZWZUgKLCE1Hrig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735634233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VX309h+dKul6X89+ZefNYw8G9nKNeh4hvlQfdgNvlAc=; b=FFFmvkVFl5jyJ4XteO1VvGPx1Q21XdoSTzhbFFSzls+FE58MhifJuOmseH7d5SxSRZarQB FFUNiiUD7pmaqROYwQaCJcnrx7cd+MnCfrjIyDvEORuvZXI467uQIWEXfJYq4QRF+fDw2i Z7FPnAOp4AbRHHIYHiLrLAl9n0An4gr6x2WA2oqhoM7NSTpwNRHnD7OWyYr0EvYnGQsez0 vM4VgU+89+yEK/K87bovxS088pRlDYjMPI8oJSpzfRJmumqJX5vr9VgWgYdn16qtuz2na3 FHqKlj9cdjx7Mpuw77dpMpP1TbTUsOiLxJWuzknLKQdvC47mBfYzuH4F1Yd8lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735634233; a=rsa-sha256; cv=none; b=WlgNCGCDHA95uZY1cChQ/eDgKCg6lygf9z8WibeH/byxVIAOph7oSMY2ru9XF01cddrA40 BZvb7xjWgb7o7+h0CHTfTE2eav0f95C9rWoak+pb91F5BolxfS33rQgrmmKUubEx/L6QjZ JdQq7D1C/RqESW9SBNJK6BIn0vFrFv1W7pmEOjCPA5y/AR5h+1ih/od/OH4Sd/m09/JTmj EskMEfOCttyLXlXGMj+sgb/AbKZbwj+jR99/wrvYhpqvRuMy14zN3/nxV/wknmPavR5r1x qlPTHHbUQ2BzPqAfK/TCDShapvVY5n7ln3wAcaCHO5wpKuWlR+vmkKGp5TF5Hw== 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 4YMmYP2SGczXt6; Tue, 31 Dec 2024 08:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BV8bDIu045357; Tue, 31 Dec 2024 08:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BV8bD54045354; Tue, 31 Dec 2024 08:37:13 GMT (envelope-from git) Date: Tue, 31 Dec 2024 08:37:13 GMT Message-Id: <202412310837.4BV8bD54045354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: c8ea8c20274e - main - ftp/libfilezilla: fix build on 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8ea8c20274e8974737189257cda8ed08c324797 Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8ea8c20274e8974737189257cda8ed08c324797 commit c8ea8c20274e8974737189257cda8ed08c324797 Author: Martin Neubauer AuthorDate: 2024-12-31 08:35:34 +0000 Commit: Kurt Jaeger CommitDate: 2024-12-31 08:36:43 +0000 ftp/libfilezilla: fix build on 15 - missed the Makefile patch because I build on an older version of 15 PR: 283373 --- ftp/libfilezilla/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile index d9377f7017af..d69893dc0472 100644 --- a/ftp/libfilezilla/Makefile +++ b/ftp/libfilezilla/Makefile @@ -20,4 +20,10 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 191 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_libfilezilla_string.hpp +.endif + +.include