From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 20 17:40:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE91F1065676 for ; Fri, 20 May 2011 17:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 83CBA8FC15 for ; Fri, 20 May 2011 17:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4KHeBox081029 for ; Fri, 20 May 2011 17:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4KHeBTN081028; Fri, 20 May 2011 17:40:11 GMT (envelope-from gnats) Resent-Date: Fri, 20 May 2011 17:40:11 GMT Resent-Message-Id: <201105201740.p4KHeBTN081028@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Christoph Moench-Tegeder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97E8D106566C for ; Fri, 20 May 2011 17:37:46 +0000 (UTC) (envelope-from cmt@burggraben.net) Received: from smtp.burggraben.net (ns.exwg.net [88.198.69.35]) by mx1.freebsd.org (Postfix) with ESMTP id 5456F8FC0C for ; Fri, 20 May 2011 17:37:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id BD3F4600098 for ; Fri, 20 May 2011 19:19:03 +0200 (CEST) Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GusytgRsK7lX for ; Fri, 20 May 2011 19:19:03 +0200 (CEST) Received: from elch.exwg.net (pC19F60A5.dip.t-dialin.net [193.159.96.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "elch.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS for ; Fri, 20 May 2011 19:19:03 +0200 (CEST) Received: by elch.exwg.net (Postfix, from userid 1000) id A1787AC840; Fri, 20 May 2011 19:19:02 +0200 (CEST) Message-Id: <20110520171902.A1787AC840@elch.exwg.net> Date: Fri, 20 May 2011 19:19:02 +0200 (CEST) From: Christoph Moench-Tegeder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157217: [PATCH] unbreak graphics/graphviz on -RELEASE (missing log2()) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christoph Moench-Tegeder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2011 17:40:11 -0000 >Number: 157217 >Category: ports >Synopsis: [PATCH] unbreak graphics/graphviz on -RELEASE (missing log2()) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 20 17:40:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Christoph Moench-Tegeder >Release: FreeBSD 8.2-RELEASE-p1 amd64 >Organization: >Environment: System: FreeBSD elch.exwg.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #7: Thu Apr 21 15:56:09 CEST 2011 cmt@elch.exwg.net:/usr/obj/usr/src/sys/CMT amd64 graphics/graphviz 2.28.0 >Description: The build of graphics/graphviz on -RELEASE fails because log2() is not defined on those versions. The same problem (log2f() in that case) happened with graphics/gegl some time ago (see ports/155183). >How-To-Repeat: try to build graphviz on 8.2-RELEASE >Fix: I blatantly copied the version check from graphics/gegl/files/patch-tools_exp_combine.cpp diff -Nru graphics/graphviz.orig/files/patch-lib-ortho-trapezoid.c graphics/graphviz/files/patch-lib-ortho-trapezoid.c --- graphics/graphviz.orig/files/patch-lib-ortho-trapezoid.c 1970-01-01 01:00:00.000000000 +0100 +++ graphics/graphviz/files/patch-lib-ortho-trapezoid.c 2011-05-20 18:59:05.000000000 +0200 @@ -0,0 +1,14 @@ +--- lib/ortho/trapezoid.c.orig 2011-05-20 18:55:22.000000000 +0200 ++++ lib/ortho/trapezoid.c 2011-05-20 18:57:31.000000000 +0200 +@@ -30,6 +30,11 @@ + #define log2(x) (log(x)/log(2)) + #endif + ++#include ++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) ++#define log2(x) (log(x)/log(2)) ++#endif ++ + /* Node types */ + + #define T_X 1 >Release-Note: >Audit-Trail: >Unformatted: