ports/146805: devel/cmake: add rules for wxgtk-2-2.[864]-config

[Rene Ladan]

>Number:         146805
>Category:       ports
>Synopsis:       devel/cmake: add rules for wxgtk-2-2.[864]-config
>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:   Fri May 21 20:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rene Ladan
>Release:        FreeBSD 8.0-amd64
>Organization:
>Environment:
FreeBSD acer.rene-ladan.nl 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC 2010     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Currently devel/cmake (2.8.1_1) does not properly detect wxWidgets when it is installed. This is because it looks for wx-config, which is not installed on FreeBSD systems, but not for wxgtk2-2.[864]-config, which is installed.

The attached patch adds detection for this to FindwxWidgets.cmake and FindwxWindows.cmake. The patch also bumps the PORTREVISION.
>How-To-Repeat:
Install one of x11-toolkits/wxgtk2[468] and devel/cmake

% cat ../testwx/CMakeLists.txt
cmake_minimum_required(VERSION 2.4.6)
find_package(wxWidgets REQUIRED)

%cmake ../testwx/
<bails out on FindwxWidgets.cmake line 807>
>Fix:



Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/cmake/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	17 May 2010 22:47:59 -0000	1.40
+++ Makefile	21 May 2010 19:19:49 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmake
 PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
Index: files/patch-Modules_FindwxWidgets.cmake
===================================================================
RCS file: files/patch-Modules_FindwxWidgets.cmake
diff -N files/patch-Modules_FindwxWidgets.cmake
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Modules_FindwxWidgets.cmake	21 May 2010 19:19:49 -0000
@@ -0,0 +1,13 @@
+--- Modules/FindwxWidgets.cmake.orig	2010-05-21 20:43:05.000000000 +0200
++++ Modules/FindwxWidgets.cmake	2010-05-21 21:02:00.000000000 +0200
+@@ -681,8 +681,8 @@
+     # UNIX: Start actual work.
+     #-----------------------------------------------------------------
+     # Support cross-compiling, only search in the target platform.
+-    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config
+-      ONLY_CMAKE_FIND_ROOT_PATH
++    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE NAMES wx-config wxgtk2-2.8-config
++      wxgtk2-2.6-config wxgtk2-2.4-config ONLY_CMAKE_FIND_ROOT_PATH
+       )
+ 
+     IF(wxWidgets_CONFIG_EXECUTABLE)
Index: files/patch-Modules_FindwxWindows.cmake
===================================================================
RCS file: files/patch-Modules_FindwxWindows.cmake
diff -N files/patch-Modules_FindwxWindows.cmake
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Modules_FindwxWindows.cmake	21 May 2010 19:19:49 -0000
@@ -0,0 +1,14 @@
+--- Modules/FindwxWindows.cmake.orig	2010-05-21 20:43:05.000000000 +0200
++++ Modules/FindwxWindows.cmake	2010-05-21 21:03:29.000000000 +0200
+@@ -599,8 +599,9 @@
+ 
+     # wx-config should be in your path anyhow, usually no need to set WXWIN or
+     # search in ../wx or ../../wx
+-    FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE wx-config
+-      $ENV{WXWIN}
++    FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE NAMES wx-config
++      wxgtk2-2.8-config wxgtk2-2.6-config wxgtk2-2.4-config
++      PATHS $ENV{WXWIN}
+       $ENV{WXWIN}/bin
+       ../wx/bin
+       ../../wx/bin )


>Release-Note:
>Audit-Trail:
>Unformatted: