From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 30 09:40:06 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D65E516A4CF for ; Tue, 30 Mar 2004 09:40:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B59D743D3F for ; Tue, 30 Mar 2004 09:40:06 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2UHe6bv037183 for ; Tue, 30 Mar 2004 09:40:06 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2UHe62x037182; Tue, 30 Mar 2004 09:40:06 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 30 Mar 2004 09:40:06 -0800 (PST) Resent-Message-Id: <200403301740.i2UHe62x037182@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, Marco Molteni Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B083916A4D1 for ; Tue, 30 Mar 2004 09:31:26 -0800 (PST) Received: from www.citello.it (host170-131.pool80117.interbusiness.it [80.117.131.170]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20C6343D1F for ; Tue, 30 Mar 2004 09:31:26 -0800 (PST) (envelope-from molter@tin.it) Received: from gattaccio.codalunga (ANice-205-1-8-73.w81-53.abo.wanadoo.fr [81.53.106.73]) by www.citello.it (Postfix) with ESMTP id 7602364B for ; Tue, 30 Mar 2004 19:31:23 +0200 (CEST) Received: by gattaccio.codalunga (Postfix, from userid 1001) id 6B5C84155; Tue, 30 Mar 2004 19:26:10 +0200 (CEST) Message-Id: <20040330192609.48183959@localhost> Date: Tue, 30 Mar 2004 19:26:09 +0200 From: Marco Molteni To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64945: [PATCH] graphics/hpoj: unbreak build on fbsd 5.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2004 17:40:07 -0000 >Number: 64945 >Category: ports >Synopsis: [PATCH] graphics/hpoj: unbreak build on fbsd 5.x >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Mar 30 09:40:06 PST 2004 >Closed-Date: >Last-Modified: >Originator: Marco Molteni >Release: FreeBSD 5.2-CURRENT i386 >Organization: Citello Networks >Environment: System: FreeBSD gattaccio 5.2-CURRENT >Description: Port graphics/hpoj is marked BROKEN on fbsd 5.x: BROKEN= "ffs() clash, see i386/41930" If you look at i386/41930, you will see that it is a nasty C preprocessor problem on an include file that triggers a duplicated definition and so an error. Following patch, which is limited to the port in question and so shouldn't raise any eyebrowns, fixes the problem with a classic preprocessor trick. >How-To-Repeat: cd /usr/ports/graphics/hpoj && make >Fix: Apply following patch diff -uNr hpoj/Makefile hpoj-marco/Makefile --- hpoj/Makefile Tue Mar 30 19:04:30 2004 +++ hpoj-marco/Makefile Tue Mar 30 19:04:45 2004 @@ -50,9 +50,6 @@ .include -.if ${ARCH} == "i386" && ${OSVERSION} > 500000 -BROKEN= "ffs() clash, see i386/41930" -.endif .if ${ARCH} != "i386" BROKEN= "Configure fails on !i386" diff -uNr hpoj/files/patch-mlcd-ParPort.h hpoj-marco/files/patch-mlcd-ParPort.h --- hpoj/files/patch-mlcd-ParPort.h Thu Jan 1 01:00:00 1970 +++ hpoj-marco/files/patch-mlcd-ParPort.h Tue Mar 30 19:01:14 2004 @@ -0,0 +1,13 @@ +--- mlcd/ParPort.h.orig Tue Mar 30 18:42:02 2004 ++++ mlcd/ParPort.h Tue Mar 30 18:51:23 2004 +@@ -32,6 +32,10 @@ + #include + #include + extern "C" { ++ #undef fls ++ #define fls iamdirtybutloved ++ #undef ffs__ParPort ++ #define ffs__ParPort iamdirtybutfancied + #include + } + #else -- >Release-Note: >Audit-Trail: >Unformatted: