From nobody Tue Apr 11 23:04:19 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 4Px1ch2FfZz44lRv; Tue, 11 Apr 2023 23:04:20 +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 4Px1ch01Vqz4HRq; Tue, 11 Apr 2023 23:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254260; 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=2AB5PYlVdczy7GxP9W+4O+KzU39d0ong7zTJHzevOuU=; b=WkEwkIMjZSb2sjR9TPfdqDATGdO7BCvA4k0nLsBKAjG94icvWl5AVun+bsZIy76zAS6Inr BbpP/15zE9p5jPaDItBtVY+l6bNIsukhFSZgGDh3wbjcYIvG5M9Yu2LpoWulu7i2j5Uv+q wQu0KHh7msksAL/c23JzKbLDSLFnQmFhVwcGXnLBKN8ebaXgOjn8APmTt7Yd/pMvZIThRn OmQTpCTQe/o2gHOHms+QEr3s/vFWlCdm34MYyjn+xuC5ck390EVSeUOBhHn4mN7PWMpdGq swjr/y9Fx02ZfI3eSfwcxR5B4l5zDH3tigNfoYvufm4aHDxYlc/XeYzu+ZCk/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254260; 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=2AB5PYlVdczy7GxP9W+4O+KzU39d0ong7zTJHzevOuU=; b=RinyfP1mOqWmRaQPHUf5Rxr6a9NVEFY+lqef5Db54uM8oBW6xv4LLQWFYaWcbKqrFoii26 iAo2ptIR6PTNc6u/EGEs1c/gVZmUuqSgpPN05FwqJ50MOn+WfcXKcr1HXpsHj8CtBDj2U4 k5juFQbi2pvlD8KUkWeyBmxHAE/7jl+QWmvCp4xz3GSTpxIsEVp1E1lUYz7Oak5Q8ymUEP Rg8z7ddVqyNhklJdU+l5Q2kYjUqZT1mpvP1FpFX6hMeaKdZKTS48SVbWymJe8brZcaCFrZ EArv3xiVQAYvgm7Ld4zgMKKXpOnCA2lKHKIcAKBQ9SLQf0vnvKKcUfU4TNbYXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681254260; a=rsa-sha256; cv=none; b=QOnsuj20qAAWG0Pyitgnrx4MHeP38jLAugY2H0peDXh5vaEljU8vY/PbrVKEjT6aat5GST QWEOpKOm2c08KO9NmSvD2Y5YDxFkALU5q6YX8C4KZWJaYMnDz3so3/FbnOxiDWSHkeN9/J o07AkuOjiSOeb71kj0fYwbdbrYsMHgwHvWU19V4/sLZRV2iM9y0Y27GSUOqbz7FaSadeBH 3Lkb8g4IZqU6nYDse8n+j8ON8mlBS4qdUk3vHmBviE65Lkyf0PAoUt5A9DVMx9JBeznUxs WN8TAfRqs/1jZofP0rE/UBdFFd0mbjy3tyfbWYAwJXceGEmt9FwI4h3LxZLMEg== 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 4Px1cg58knzcB4; Tue, 11 Apr 2023 23:04:19 +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 33BN4JSZ071866; Tue, 11 Apr 2023 23:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BN4Jrg071865; Tue, 11 Apr 2023 23:04:19 GMT (envelope-from git) Date: Tue, 11 Apr 2023 23:04:19 GMT Message-Id: <202304112304.33BN4Jrg071865@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 915ae070bbd1 - main - textproc/htdig: fix build on armv7 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 915ae070bbd154fa69bab92785fe9fb5ee00e0a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=915ae070bbd154fa69bab92785fe9fb5ee00e0a7 commit 915ae070bbd154fa69bab92785fe9fb5ee00e0a7 Author: Robert Clausecker AuthorDate: 2023-04-10 13:37:04 +0000 Commit: Robert Clausecker CommitDate: 2023-04-11 23:02:42 +0000 textproc/htdig: fix build on armv7 Work around a polymorphism error by using monomorphic fabs() instead of fabs(). --- textproc/htdig/Makefile | 2 +- textproc/htdig/files/patch-htsearch_Display.cc | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile index 8533687aba91..dd9f401a1bf8 100644 --- a/textproc/htdig/Makefile +++ b/textproc/htdig/Makefile @@ -1,6 +1,6 @@ PORTNAME= htdig PORTVERSION= 3.2.0.b6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/3.2.0b6 DISTNAME= htdig-3.2.0b6 diff --git a/textproc/htdig/files/patch-htsearch_Display.cc b/textproc/htdig/files/patch-htsearch_Display.cc new file mode 100644 index 000000000000..4ecb7c6fdd02 --- /dev/null +++ b/textproc/htdig/files/patch-htsearch_Display.cc @@ -0,0 +1,20 @@ +--- htsearch/Display.cc.orig 2023-04-10 13:24:24 UTC ++++ htsearch/Display.cc +@@ -42,7 +42,7 @@ using namespace std; + #endif /* HAVE_STD */ + + #include +-#include // for abs ++#include // for fabs + #include + + #ifndef _MSC_VER /* _WIN32 */ +@@ -1541,7 +1541,7 @@ Display::buildMatchList() + // seconds in a 365 days year). The formula gives less weight + // as the distance between the date document and the current time + // increases (the absolute value is for documents with future date) +-#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(abs((n) - (dd)) / 31536000))) ++#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(fabs((n) - (dd)) / 31536000))) + date_score = DATE_FACTOR(date_factor, now, thisRef->DocTime()); + score += date_score; + }