Update to 2.8.2

Respect WX_CONFIG [1]

PR:		ports/146805 [1]
Reported by:	rene@

5 files changed, 33 insertions, 7 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 6346317acf1e..e300da19d18d 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.8.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 4b4d5ac58662..409d74eeea14 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (cmake-2.8.1.tar.gz) = feadc2e5ebbfed0efc90178583503725
-SHA256 (cmake-2.8.1.tar.gz) = 7eae74ab7673974a68e395c211854d318f0af2d320590a670339ee8ee9422242
-SIZE (cmake-2.8.1.tar.gz) = 3605586
+MD5 (cmake-2.8.2.tar.gz) = 8c967d5264657a798f22ee23976ff0d9
+SHA256 (cmake-2.8.2.tar.gz) = 766ff169af798599d7dd42e41e9f4533d73942a2bb928235115412dce5b81406
+SIZE (cmake-2.8.2.tar.gz) = 5392016
diff --git a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
new file mode 100644
index 000000000000..205123667259
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
@@ -0,0 +1,11 @@
+--- ./Modules/FindwxWidgets.cmake.orig	2010-06-28 19:15:57.000000000 +0400
++++ ./Modules/FindwxWidgets.cmake	2010-07-06 02:06:02.277945209 +0400
+@@ -689,7 +689,7 @@
+     # UNIX: Start actual work.
+     #-----------------------------------------------------------------
+     # Support cross-compiling, only search in the target platform.
+-    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config
++    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
+       ONLY_CMAKE_FIND_ROOT_PATH
+       )
+ 
diff --git a/devel/cmake/files/patch-Modules_FindwxWindows.cmake b/devel/cmake/files/patch-Modules_FindwxWindows.cmake
new file mode 100644
index 000000000000..6a93bb08d8be
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_FindwxWindows.cmake
@@ -0,0 +1,12 @@
+--- ./Modules/FindwxWindows.cmake.orig	2010-06-28 19:15:57.000000000 +0400
++++ ./Modules/FindwxWindows.cmake	2010-07-06 02:06:30.769844610 +0400
+@@ -599,7 +599,8 @@
+ 
+     # 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
++    FIND_PROGRAM(CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
++      PATHS
+       $ENV{WXWIN}
+       $ENV{WXWIN}/bin
+       ../wx/bin
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 161f66e9a681..1b866a4dba1e 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -133,6 +133,8 @@ bin/ctest
 %%DATADIR%%/Modules/CheckTypeSizeMap.cmake.in
 %%DATADIR%%/Modules/CheckVariableExists.c
 %%DATADIR%%/Modules/CheckVariableExists.cmake
+%%DATADIR%%/Modules/Compiler/Clang-C.cmake
+%%DATADIR%%/Modules/Compiler/Clang-CXX.cmake
 %%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/GNU-C.cmake
 %%DATADIR%%/Modules/Compiler/GNU-CXX.cmake
@@ -209,6 +211,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindGTK2.cmake
 %%DATADIR%%/Modules/FindGTest.cmake
 %%DATADIR%%/Modules/FindGettext.cmake
+%%DATADIR%%/Modules/FindGit.cmake
 %%DATADIR%%/Modules/FindGnuTLS.cmake
 %%DATADIR%%/Modules/FindGnuplot.cmake
 %%DATADIR%%/Modules/FindHDF5.cmake
@@ -378,6 +381,8 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/Haiku.cmake
 %%DATADIR%%/Modules/Platform/IRIX.cmake
 %%DATADIR%%/Modules/Platform/IRIX64.cmake
+%%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake
 %%DATADIR%%/Modules/Platform/Linux-GNU-C.cmake
 %%DATADIR%%/Modules/Platform/Linux-GNU-CXX.cmake
 %%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake
@@ -425,6 +430,7 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/Windows-Borland-C.cmake
 %%DATADIR%%/Modules/Platform/Windows-Borland-CXX.cmake
 %%DATADIR%%/Modules/Platform/Windows-Borland.cmake
+%%DATADIR%%/Modules/Platform/Windows-G95-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake
 %%DATADIR%%/Modules/Platform/Windows-GNU-CXX.cmake
 %%DATADIR%%/Modules/Platform/Windows-GNU-Fortran.cmake
@@ -524,7 +530,6 @@ bin/ctest
 %%DOCSDIR%%/cmcurl/COPYING
 %%DOCSDIR%%/cmexpat/COPYING
 %%DOCSDIR%%/cmsys/Copyright.txt
-%%DOCSDIR%%/cmtar/COPYRIGHT
 %%DOCSDIR%%/cmzlib/Copyright.txt
 %%DOCSDIR%%/cpack.docbook
 %%DOCSDIR%%/cpack.html
@@ -533,7 +538,6 @@ bin/ctest
 %%DOCSDIR%%/ctest.html
 %%DOCSDIR%%/ctest.txt
 @dirrm %%DOCSDIR%%/cmzlib
-@dirrm %%DOCSDIR%%/cmtar
 @dirrm %%DOCSDIR%%/cmsys
 @dirrm %%DOCSDIR%%/cmexpat
 @dirrm %%DOCSDIR%%/cmcurl