From nobody Wed Sep 20 07:44:36 2023 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 4Rr9Xk4Mq7z4tFxM; Wed, 20 Sep 2023 07:44:38 +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 4Rr9Xk0vxcz3fZb; Wed, 20 Sep 2023 07:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695195878; 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=SrnKOYhgTNTXD53/w2dbKEnb586XSntQutwQeEjafhI=; b=OmezK10ysiKlwX3tzsB4wo9s29xhhoB3XmY4JtjILydrTZb7mgYzuCWDoeTlXSIq/+FPMF kAmu7WAPsvwlZSOOzEwyyvCnGDAFe4KFLpvhbPUP11Te8L6G8LuOFi6HNfyhQ84RDbbttx Mtoo6XHtVK0SLkTYqKjyo70tOHACurqVMg+SuQ7CI/tNdVACjwsRuEhmHld1wCjifmc+M+ ikomcGn9GYrzPgApft2uiitqLTn/KrbGLpt0hFnzAFl7Z3LShHXi86YvUgNGmrNzc+opzy iuNXKlFBn+yP2Rqy3pzer8FPokjIakLZ2pcCJuIZph9Ymmp+H7nbZC/Faf1Z+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695195878; a=rsa-sha256; cv=none; b=KbOJx1nU8GoUrO6+i6zFYOT7hNV9FlNlX7zMw2ApvLEkUKfAF77M6FB6Wc2NAluduoX3a1 yzKd92T41/3t59NYb0t/uAlhW/HPF8Luf5ALc4u59WYpppGSKOtFOatW7HOJFz8lpM+jjN bJGAhUCbabt2GUUAuGhuHJcI2DKnZalrj+Znrmt+6/Sn6Fgg6YuYSlY4Tec/HrMmt6X53P xcy0QCPOUxneqUOhRtD4nFsOr3eOs6O0SxcC8RlIzMLt/kyxu0OjgBx7MkTzx17wIiGoNt FWpQeNcQkntQFzcKPm8z4wdtuWWB5r0y7Nh7pOBkw9AUItlhysvbsW+VQFt+KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695195878; 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=SrnKOYhgTNTXD53/w2dbKEnb586XSntQutwQeEjafhI=; b=NPagyYTLVrPG7EeH2R4Yusr8SNDCfYxaWJ4IZrGShH53SuLEvtpMJnHCAanP+9GfTxiOgB 7hpxsA02JX2Nhtc8C630gwZotIO9ZqmvWtJoi3DfdrmgC3lfGfU//8OoTp+MvAddm/NCQq u6aUw1OBXhr/US4O8jvklfIS6Sy21ZnHHI1w0ypshWfQufuTHdCsEMz4Yk51d8qFu3ettl tHHIe0IZqjjIuMDmg4SstOqBHF5WDaeu4JhV8qFb4ZRFX+tlPrgUsbYv6p1t4pprzkSEo6 g03CPSiV7Mz/LdvINomdl6OLYXLHXP/xq0ATqFdSkr28p9wNgQeA7T1z6GBqQQ== 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 4Rr9Xh39k1znL8; Wed, 20 Sep 2023 07:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38K7ia05019874; Wed, 20 Sep 2023 07:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38K7iaxM019871; Wed, 20 Sep 2023 07:44:36 GMT (envelope-from git) Date: Wed, 20 Sep 2023 07:44:36 GMT Message-Id: <202309200744.38K7iaxM019871@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 9de718aaf747 - main - www/elinks: Fix build with ssl from ports 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9de718aaf747cace995ffcf592edf64e3fdd9317 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=9de718aaf747cace995ffcf592edf64e3fdd9317 commit 9de718aaf747cace995ffcf592edf64e3fdd9317 Author: Felix Palmen AuthorDate: 2023-09-20 06:53:53 +0000 Commit: Felix Palmen CommitDate: 2023-09-20 07:43:40 +0000 www/elinks: Fix build with ssl from ports Building with ssl from ports used the headers from ports, but still linked the libs from base and therefore failed. Patch meson.build to look for OpenSSL libs in ${OPENSSLLIB} to fix this. Approved by: portmgr (blanket, build fix) --- www/elinks/Makefile | 1 + www/elinks/files/patch-meson.build | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/www/elinks/Makefile b/www/elinks/Makefile index 89663e541e0a..82bf889d751f 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -117,6 +117,7 @@ ZSTD_USES= localbase ZSTD_MESON_TRUE= zstd post-patch: + @${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' ${WRKSRC}/meson.build @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/doc/tools/help2xml @${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' ${WRKSRC}/doc/tools/asciidoc/asciidoc.py diff --git a/www/elinks/files/patch-meson.build b/www/elinks/files/patch-meson.build index 6b13996f5ce9..8ca2f7d08468 100644 --- a/www/elinks/files/patch-meson.build +++ b/www/elinks/files/patch-meson.build @@ -1,6 +1,6 @@ --- meson.build.orig 2023-05-01 08:45:22 UTC +++ meson.build -@@ -178,6 +178,10 @@ endif +@@ -178,6 +178,10 @@ if compiler.has_header('fcntl.h') conf_data.set('HAVE_FCNTL_H', 1) endif @@ -11,7 +11,18 @@ if compiler.has_header('libgen.h') conf_data.set('HAVE_LIBGEN_H', 1) endif -@@ -845,7 +849,7 @@ endif +@@ -344,8 +348,8 @@ gnutlsdeps = [] + ssldeps = [] + + if conf_data.get('CONFIG_OPENSSL') +- ssldeps = dependency('openssl', static: st) +- deps += ssldeps ++ deps += compiler.find_library('crypto', dirs: '%%OPENSSLLIB%%') ++ deps += compiler.find_library('ssl', dirs: '%%OPENSSLLIB%%') + conf_data.set('USE_OPENSSL', true) + conf_data.set('CONFIG_GNUTLS', false) + elif conf_data.get('CONFIG_GNUTLS') +@@ -845,7 +849,7 @@ if compiler.has_function('iconv', prefix: '#include