Date: Thu, 28 Jan 2010 17:50:30 +0300 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kde@FreeBSD.org Subject: ports/143313: [PATCH] devel/cmake: fix warning in FindSDL.cmake Message-ID: <20100128145030.813C7B829@hades.panopticon> Resent-Message-ID: <201001281500.o0SF0JnJ031361@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143313
>Category: ports
>Synopsis: [PATCH] devel/cmake: fix warning 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: Thu Jan 28 15:00:19 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:
My change to FindSDL.cmake introduced a (harmless) warning in apps that use FIND_PACKAGE(SDL):
---
CMake Warning at /usr/local/share/cmake/Modules/FindSDL.cmake:108 (IF):
given arguments:
"NOT" "/usr/local/include/SDL" "/usr/local/include" "MATCHES" ".framework"
Unknown arguments specified
Call Stack (most recent call first):
CMakeLists.txt:3 (FIND_PACKAGE)
---
The patch fixes it. Also fix plist to respect apps that install their own modules into share/cmake/Modules (currently, textproc/soprano and net-im/qutim)
Port maintainer (kde@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- cmake-2.8.0_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.37
diff -u -u -r1.37 Makefile
--- Makefile 25 Jan 2010 20:11:13 -0000 1.37
+++ Makefile 28 Jan 2010 14:34:02 -0000
@@ -7,7 +7,7 @@
PORTNAME= cmake
PORTVERSION= 2.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/cmake/pkg-plist,v
retrieving revision 1.22
diff -u -u -r1.22 pkg-plist
--- pkg-plist 9 Dec 2009 19:31:57 -0000 1.22
+++ pkg-plist 28 Jan 2010 14:33:52 -0000
@@ -513,5 +513,5 @@
@dirrm %%DATADIR%%/Modules/FortranCInterface
@dirrm %%DATADIR%%/Modules/FindCUDA
@dirrm %%DATADIR%%/Modules/Compiler
-@dirrm %%DATADIR%%/Modules
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/Modules
+@dirrmtry %%DATADIR%%
Index: files/patch-Modules_FindSDL.cmake
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/cmake/files/patch-Modules_FindSDL.cmake,v
retrieving revision 1.1
diff -u -u -r1.1 patch-Modules_FindSDL.cmake
--- files/patch-Modules_FindSDL.cmake 25 Jan 2010 20:11:13 -0000 1.1
+++ files/patch-Modules_FindSDL.cmake 28 Jan 2010 14:32:40 -0000
@@ -1,5 +1,5 @@
---- ./Modules/FindSDL.cmake.orig 2009-11-13 21:32:52.000000000 +0300
-+++ ./Modules/FindSDL.cmake 2010-01-25 22:23:16.749128606 +0300
+--- Modules/FindSDL.cmake.orig 2009-11-13 21:32:52.000000000 +0300
++++ Modules/FindSDL.cmake 2010-01-28 17:32:40.000000000 +0300
@@ -81,6 +81,11 @@
/opt/csw # Blastwave
/opt
@@ -12,3 +12,21 @@
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
# SDL-1.1 is the name used by FreeBSD ports...
+@@ -100,7 +105,7 @@
+ #MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
+
+ IF(NOT SDL_BUILDING_LIBRARY)
+- IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
++ IF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
+ # Non-OS X framework versions expect you to also dynamically link to
+ # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
+ # seem to provide SDLmain for compatibility even though they don't
+@@ -116,7 +121,7 @@
+ /opt/csw
+ /opt
+ )
+- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
++ ENDIF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
+ ENDIF(NOT SDL_BUILDING_LIBRARY)
+
+ # SDL may require threads on your system.
--- cmake-2.8.0_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100128145030.813C7B829>