[kde-freebsd] [PATCH] devel/cmake: use all required include dirs in FindSDL.cmake

[Dmitry Marakasov]

>Submitter-Id:	current-users
>Originator:	Dmitry Marakasov
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] devel/cmake: use all required include dirs in FindSDL.cmake
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 8.0-RELEASE i386
>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 at 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 ---