From nobody Sat Mar 16 08:04:31 2024 X-Original-To: dev-commits-ports-all@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 4TxYYW4Fw5z5CmRj; Sat, 16 Mar 2024 08:04:31 +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 4TxYYW3LqBz4PYf; Sat, 16 Mar 2024 08:04:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710576271; 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=a/Wsd7z6P6/RYnGTFRXC6zmQar7pLIjhJWkyOkHLLjU=; b=OisWYYlqDp1xt8HIEoO+a+UtZF2z7UMtgmHjBCUmaBaVeo5rPvY1FMZNZSm3nHOcIKDM4X llM4plHgoKyvuos2CHI6lgxMoe1zZOn9eRAFwdeDd8FEWlZcpXqdWqzjDhS12rFkAU8XOP NFIPNuWpoL9Bd8KPxNGDkjEIvRjmaNUDUGLk7vNOVnT78Qsr34IBkhVci8YBo+or8+Ws5o xjSn0EO+F55k4PchoNoz6zSlQ1/mo7ReMUZ/PdFNkAuR13oX3sMqxOyQXgJwGVR4jwVZgL 7/aXe3oUZ3KgHCOCaTeI/lxvoh5BpsgVTAtSwrMZ/jt4bczHcdTFwBJJYC2gnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710576271; a=rsa-sha256; cv=none; b=BxVKHZ4ySl8qzrHRxk2X4bkuW3vkupqqJASSZphef0UC9lT6zkggla13zLMWor8QBI3mTF yEYAdnNsCBqjtPmLIMc0wbacrJ6SsJkxhzquZhsPftm20NxLmDVtHHPe57rfgag/+PiUEK T0q73+klc3Xwm2qtu+MiJT7oKC1nB0PWTVRzAmRRyTCHxI9XT6zSNjjK1jpe0WrQOq0CV0 FnJk05+JLmURWOkNCUOahU0pEQyc949hTHToQKSlJc+XhVaGbCSbOSRADnPFKG5nUebGBt M6odPnskOsTh70c3kXOT5DefVCJv1vht+E3YxP7Awaoqxbp/HGEBcB+bErwOqQ== 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=1710576271; 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=a/Wsd7z6P6/RYnGTFRXC6zmQar7pLIjhJWkyOkHLLjU=; b=bzaMMwm+YT6dF875JVDgrb08HNoDglcHnRWLEhFnJH/oh6Gt720AwnRbacx4ogx3occgCt peg+E/5PPJvYAXC61nzdEfedSKOC2FbGzRXd1Y7qBXZ+GAR2Piu6sohUeHW2tYQhjuXKMV UGf5vdvTdpMaaBO7RKUr0WhY6W60kUHV+94l/9NQqSyjekj1i3NOhPaEX5+SAezHLvLIe5 1dyvs2EBa6WnWnMXqJvjIyMLv7O7IRiUo73VBRHjUPDDzswGV3t1XT9UKqZ70bJU9vW9I0 5cAPgiAsmIixefBGR2r16YWZ5zO7hLUCGm/yTI73W6bpkl+po5Dwn+haLj8f7Q== 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 4TxYYW2yfVzn0w; Sat, 16 Mar 2024 08:04:31 +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 42G84VIc036207; Sat, 16 Mar 2024 08:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42G84V0N036204; Sat, 16 Mar 2024 08:04:31 GMT (envelope-from git) Date: Sat, 16 Mar 2024 08:04:31 GMT Message-Id: <202403160804.42G84V0N036204@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: 4c0ac6f6d1e1 - main - www/elinks: Revert build-fix with ssl from ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4c0ac6f6d1e1199df4faec6df61086851c2ae814 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c0ac6f6d1e1199df4faec6df61086851c2ae814 commit 4c0ac6f6d1e1199df4faec6df61086851c2ae814 Author: Felix Palmen AuthorDate: 2024-03-16 06:49:09 +0000 Commit: Felix Palmen CommitDate: 2024-03-16 08:03:50 +0000 www/elinks: Revert build-fix with ssl from ports The build fix was only needed for breakage caused by pkgconf which has meanwhile been fixed. This reverts commit 9de718aaf747cace995ffcf592edf64e3fdd9317. --- www/elinks/files/patch-meson.build | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/www/elinks/files/patch-meson.build b/www/elinks/files/patch-meson.build index b85b42c91d52..3785cea7bae0 100644 --- a/www/elinks/files/patch-meson.build +++ b/www/elinks/files/patch-meson.build @@ -11,16 +11,6 @@ if compiler.has_header('libgen.h') conf_data.set('HAVE_LIBGEN_H', 1) endif -@@ -396,7 +400,8 @@ if conf_data.get('CONFIG_OPENSSL') - if conf_data.get('CONFIG_OPENSSL') - ssldeps = dependency('openssl', static: st, required: false) - if not ssldeps.found() -- ssldeps = compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib']) -+ ssldeps = compiler.find_library('crypto', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib']) -+ ssldeps += compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib']) - endif - deps += ssldeps - conf_data.set('USE_OPENSSL', true) @@ -959,7 +964,7 @@ endif conf_data.set('HAVE_ICONV', 1) endif