From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 28 15:00:21 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 501FE10656A3 for ; Thu, 28 Jan 2010 15:00:21 +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 A808D8FC29 for ; Thu, 28 Jan 2010 15:00:19 +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 o0SF0JEU031362 for ; Thu, 28 Jan 2010 15:00:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0SF0JnJ031361; Thu, 28 Jan 2010 15:00:19 GMT (envelope-from gnats) Resent-Date: Thu, 28 Jan 2010 15:00:19 GMT Resent-Message-Id: <201001281500.o0SF0JnJ031361@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 C864B1065672; Thu, 28 Jan 2010 14:50:33 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.104.116]) by mx1.freebsd.org (Postfix) with ESMTP id 609728FC12; Thu, 28 Jan 2010 14:50:32 +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 1NaVhL-0002k9-OD; Thu, 28 Jan 2010 17:50:19 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 9B126B84D; Thu, 28 Jan 2010 17:50:30 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 813C7B829; Thu, 28 Jan 2010 17:50:30 +0300 (MSK) Message-Id: <20100128145030.813C7B829@hades.panopticon> Date: Thu, 28 Jan 2010 17:50:30 +0300 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kde@FreeBSD.org Subject: ports/143313: [PATCH] devel/cmake: fix warning 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: Thu, 28 Jan 2010 15:00:21 -0000 >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: