From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 10 17:20:02 2010 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 A820A1065679 for ; Sun, 10 Jan 2010 17:20:02 +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 859B58FC18 for ; Sun, 10 Jan 2010 17:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0AHK2tp036360 for ; Sun, 10 Jan 2010 17:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0AHK2VL036350; Sun, 10 Jan 2010 17:20:02 GMT (envelope-from gnats) Resent-Date: Sun, 10 Jan 2010 17:20:02 GMT Resent-Message-Id: <201001101720.o0AHK2VL036350@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04BD5106566C; Sun, 10 Jan 2010 17:17:50 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.113.20]) by mx1.freebsd.org (Postfix) with ESMTP id B6ABE8FC0A; Sun, 10 Jan 2010 17:17:49 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NU1Nc-0005DV-UZ; Sun, 10 Jan 2010 20:15:08 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 7C227B84D; Sun, 10 Jan 2010 20:17:47 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 61D9EB833; Sun, 10 Jan 2010 20:17:47 +0300 (MSK) Message-Id: <20100110171747.61D9EB833@hades.panopticon> Date: Sun, 10 Jan 2010 20:17:47 +0300 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kde@FreeBSD.org Subject: ports/142583: [PATCH] devel/cmake: use all required include dirs in FindSDL.cmake X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jan 2010 17:20:02 -0000 >Number: 142583 >Category: ports >Synopsis: [PATCH] devel/cmake: use all required include dirs in FindSDL.cmake >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jan 10 17:20:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 8.0-RELEASE i386 >Organization: >Environment: System: FreeBSD hades.panopticon 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Tue Nov 24 22:31:59 MSK 2009 >Description: FindSDL module correctly detects SDL include dir, (which is in our case ${LOCALBASE}/include/SDL). However, apps that just use SDL via cmake in an usual way: FIND_PACKAGE(SDL) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR}) won't compile out of box, because SDL_stdinc.h includes iconv.h, which is located in ${LOCALBASE}. The patch attached fixes that by adding ${LOCALBASE}/include into ${SDL_INCLUDE_DIR}. This was tested in tinderbox with all ports that USE_CMAKE & USE_SDL without failures. Note that the patch uses fixed path /usr/local, but that is REINPLACEd with correct ${LOCALBASE} by the port along with other /usr/local mentions in other cmake modules. Added file(s): - files/patch-Modules-FindSDL.cmake Port maintainer (kde@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- cmake-2.8.0_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/cmake/Makefile,v retrieving revision 1.35 diff -u -u -r1.35 Makefile --- Makefile 9 Dec 2009 19:31:57 -0000 1.35 +++ Makefile 9 Jan 2010 17:13:17 -0000 @@ -7,7 +7,7 @@ PORTNAME= cmake PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ Index: files/patch-Modules-FindSDL.cmake =================================================================== RCS file: files/patch-Modules-FindSDL.cmake diff -N files/patch-Modules-FindSDL.cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Modules-FindSDL.cmake 9 Jan 2010 17:05:08 -0000 @@ -0,0 +1,10 @@ +--- ./Modules/FindSDL.cmake.orig 2009-11-13 21:32:52.000000000 +0300 ++++ ./Modules/FindSDL.cmake 2010-01-09 20:05:06.000000000 +0300 +@@ -82,6 +82,7 @@ + /opt + ) + #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") ++LIST(APPEND SDL_INCLUDE_DIR /usr/local/include) # needed for iconv.h + + # SDL-1.1 is the name used by FreeBSD ports... + # don't confuse it for the version number. --- cmake-2.8.0_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: