From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 6 01:30:20 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 AB66C16A4DD for ; Wed, 6 Sep 2006 01:30:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2785E43D45 for ; Wed, 6 Sep 2006 01:30:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k861UJ72022397 for ; Wed, 6 Sep 2006 01:30:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k861UJjd022396; Wed, 6 Sep 2006 01:30:19 GMT (envelope-from gnats) Resent-Date: Wed, 6 Sep 2006 01:30:19 GMT Resent-Message-Id: <200609060130.k861UJjd022396@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, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 641FA16A4DA for ; Wed, 6 Sep 2006 01:21:34 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx3.mail.ru (mx3.mail.ru [194.67.23.149]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB5CA43D45 for ; Wed, 6 Sep 2006 01:21:33 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=3352 helo=nexii.panopticon) by mx3.mail.ru with esmtp id 1GKm6e-0002G3-00 for FreeBSD-gnats-submit@freebsd.org; Wed, 06 Sep 2006 05:21:32 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id 7D82B17054 for ; Wed, 6 Sep 2006 05:21:08 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id B016B4064; Wed, 6 Sep 2006 05:21:37 +0400 (MSD) Message-Id: <20060906012137.B016B4064@hades.panopticon> Date: Wed, 6 Sep 2006 05:21:37 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102930: [PATCH] devel/ode: fix include file X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2006 01:30:20 -0000 >Number: 102930 >Category: ports >Synopsis: [PATCH] devel/ode: fix include file >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Sep 06 01:30:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.1-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Fri Aug 11 00:27:45 MSD 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: ${PREFIX}/include/ode/config.h installed by ode has some defines that shouldn't be there: --- cut --- /* Name of package */ #define PACKAGE "ODE" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "ode@q12.org" /* Define to the full name of this package. */ #define PACKAGE_NAME "ODE" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "ODE 0.6.0-rc1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ode" /* Define to the version of this package. */ #define PACKAGE_VERSION "0.6.0-rc1" /* Version number of package */ #define VERSION "0.6.0-rc1" --- /cut --- These will conflict with internal config.h files of ports that depend on ode. Usually that's lead to warnings, but sometimes (games/fwp case, which use -Werror) to errors. Example is here: http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.6.2006072612/fwp-0.0.7.log So, comment out these defines in post-install. >How-To-Repeat: cd /usr/ports/games/xmoto && make (warnings will be displayed) cd /usr/ports/games/fwp && make (won't build, because of warnings coupled with -Werror) >Fix: --- ode.patch begins here --- diff -ruN ode.orig/Makefile ode/Makefile --- ode.orig/Makefile Wed Sep 6 04:24:48 2006 +++ ode/Makefile Wed Sep 6 04:53:05 2006 @@ -61,4 +61,8 @@ @${FIND} ${WRKSRC} -type f -name "*.h" -print0 | ${XARGS} -0 ${REINPLACE_CMD} \ -i "" -e 's|||g' +post-install: + ${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/include/ode/config.h \ + > ${PREFIX}/include/ode/config.h + .include --- ode.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: