From owner-freebsd-ports Sun Nov 24 16:10: 6 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF7A737B401 for ; Sun, 24 Nov 2002 16:10:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 144C643E4A for ; Sun, 24 Nov 2002 16:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP0A1x3094897 for ; Sun, 24 Nov 2002 16:10:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAP0A1GA094896; Sun, 24 Nov 2002 16:10:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBACD37B401 for ; Sun, 24 Nov 2002 16:07:13 -0800 (PST) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4476643E6E for ; Sun, 24 Nov 2002 16:07:12 -0800 (PST) (envelope-from root@cultdeadsheep.org) Received: (qmail 35495 invoked by uid 0); 25 Nov 2002 00:07:10 -0000 Message-Id: <20021125000710.35494.qmail@cultdeadsheep.org> Date: 25 Nov 2002 00:07:10 -0000 From: Clement Laforet Reply-To: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45694: [bento-fix] : sysutils/xosview Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 45694 >Category: ports >Synopsis: [bento-fix] : sysutils/xosview >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 24 16:10:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 4.6-STABLE i386 >Organization: cotds.org >Environment: System: FreeBSD goofy.cultdeadsheep.org 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jul 4 10:05:12 CEST 2002 root@goofy.cultdeadsheep.org:/usr/obj/usr/src/sys/GOOFY i386 >Description: * Mark xosview as broken due to gcc(c++) bug (but you can compile it with gcc from ports (tested with g++31)) * Fix a bug to make xosview compile with gcc31 from ports * Change WWW address in pkg-descr >How-To-Repeat: N/A. >Fix: --- xosview.diff begins here --- diff -Nru xosview.orig/Makefile xosview/Makefile --- xosview.orig/Makefile Sun Nov 24 23:59:58 2002 +++ xosview/Makefile Sun Nov 24 23:43:59 2002 @@ -18,4 +18,11 @@ GNU_CONFIGURE= yes MAN1= xosview.1 -.include +.include + +.if ${OSVERSION} >= 500040 && (!defined(FORCE_BUILD) || !defined(CXX)) +BROKEN= "Xosview is broken due to gcc bug. To install it on 5.X system \ + Use FORCE_BUILD=YES and use gcc =< 3.1 (ie define CXX="g++31")" +.endif + +.include diff -Nru xosview.orig/files/patch-general.h xosview/files/patch-general.h --- xosview.orig/files/patch-general.h Thu Jan 1 00:00:00 1970 +++ xosview/files/patch-general.h Sun Nov 24 23:48:08 2002 @@ -0,0 +1,35 @@ +--- general.h.orig Fri Feb 14 07:22:03 1997 ++++ general.h Sun Nov 24 23:47:54 2002 +@@ -1,5 +1,6 @@ + #ifndef General_h + #define General_h ++#include + + // Copyright (c) 1996, 1997 by Brian Grayson (bgrayson@ece.utexas.edu) + // +@@ -20,8 +21,11 @@ + + #ifdef __GNUC__ + /* Grab _G_HAVE_BOOL, if possible. */ ++#if defined(__FreeBSD__) && (__FreeBSD_version < 500035) + #include <_G_config.h> + #endif ++#endif ++ + + #ifndef _G_HAVE_BOOL + /* Every GNU system has _G_config.h, I believe, which tells us +@@ -33,7 +37,13 @@ + #undef false + #undef TRUE + #undef true ++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500035) ++enum Bool {FALSE, TRUE}; ++#define false FALSE ++#define true TRUE ++#else + enum bool { FALSE = 0, false = 0, TRUE = 1, true = 1 }; ++#endif + #endif + + diff -Nru xosview.orig/pkg-descr xosview/pkg-descr --- xosview.orig/pkg-descr Sun Nov 24 23:59:58 2002 +++ xosview/pkg-descr Sun Nov 24 23:57:13 2002 @@ -10,7 +10,7 @@ of the kernel needs to volunteer to help make this a fully functional port! -WWW: http://lore.ece.utexas.edu/~bgrayson/xosview.html +WWW: http://xosview.sourceforge.net/ -- Brian Handy --> handy@physics.montana.edu --- xosview.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message