- Update to 2.8.3.

Approved by:	tabthorpe (mentor)

5 files changed, 29 insertions, 24 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 5aae439d0628..f5a628d8c57f 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTVERSION=	2.8.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
+MASTER_SITES=	http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	A cross-platform Makefile generator
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 409d74eeea14..f5e61f5396f4 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,2 @@
-MD5 (cmake-2.8.2.tar.gz) = 8c967d5264657a798f22ee23976ff0d9
-SHA256 (cmake-2.8.2.tar.gz) = 766ff169af798599d7dd42e41e9f4533d73942a2bb928235115412dce5b81406
-SIZE (cmake-2.8.2.tar.gz) = 5392016
+SHA256 (cmake-2.8.3.tar.gz) = 689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288
+SIZE (cmake-2.8.3.tar.gz) = 5436543
diff --git a/devel/cmake/files/patch-Modules_FindPythonInterp.cmake b/devel/cmake/files/patch-Modules_FindPythonInterp.cmake
index 818e493ac5be..e38e39cdeede 100644
--- a/devel/cmake/files/patch-Modules_FindPythonInterp.cmake
+++ b/devel/cmake/files/patch-Modules_FindPythonInterp.cmake
@@ -1,11 +1,11 @@
---- ./Modules/FindPythonInterp.cmake.orig	2009-02-21 23:36:50.000000000 +0300
-+++ ./Modules/FindPythonInterp.cmake	2009-03-20 13:20:18.000000000 +0300
-@@ -7,7 +7,7 @@
- #
+--- Modules/FindPythonInterp.cmake.orig	2010-11-03 20:58:27.000000000 +0100
++++ Modules/FindPythonInterp.cmake	2010-11-17 10:51:18.700039887 +0100
+@@ -20,7 +20,7 @@
+ #  License text for the above reference.)
  
  FIND_PROGRAM(PYTHON_EXECUTABLE
--  NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
-+  NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+-  NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
++  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
    PATHS
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
diff --git a/devel/cmake/files/patch-Modules__FindPythonLibs.cmake b/devel/cmake/files/patch-Modules__FindPythonLibs.cmake
deleted file mode 100644
index 834bc6867c42..000000000000
--- a/devel/cmake/files/patch-Modules__FindPythonLibs.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Modules/FindPythonLibs.cmake.orig	2010-10-22 00:22:09.782579808 +0400
-+++ ./Modules/FindPythonLibs.cmake	2010-10-22 00:22:47.930509363 +0400
-@@ -27,7 +27,7 @@
- # Search for the python framework on Apple.
- CMAKE_FIND_FRAMEWORKS(Python)
- 
--FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
-   IF(WIN32)
-     FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 1b866a4dba1e..ecdc4c6ae3c3 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -60,6 +60,7 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
 %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
 %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
+%%DATADIR%%/Modules/CMakeParseArguments.cmake
 %%DATADIR%%/Modules/CMakeParseImplicitLinkInfo.cmake
 %%DATADIR%%/Modules/CMakePlatformId.h.in
 %%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
@@ -227,6 +228,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindKDE4.cmake
 %%DATADIR%%/Modules/FindLAPACK.cmake
 %%DATADIR%%/Modules/FindLATEX.cmake
+%%DATADIR%%/Modules/FindLibArchive.cmake
 %%DATADIR%%/Modules/FindLibXml2.cmake
 %%DATADIR%%/Modules/FindLibXslt.cmake
 %%DATADIR%%/Modules/FindLua50.cmake
@@ -252,6 +254,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindPhysFS.cmake
 %%DATADIR%%/Modules/FindPike.cmake
 %%DATADIR%%/Modules/FindPkgConfig.cmake
+%%DATADIR%%/Modules/FindPostgreSQL.cmake
 %%DATADIR%%/Modules/FindProducer.cmake
 %%DATADIR%%/Modules/FindProtobuf.cmake
 %%DATADIR%%/Modules/FindPythonInterp.cmake
@@ -347,6 +350,21 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/BSDOS.cmake
 %%DATADIR%%/Modules/Platform/BeOS.cmake
 %%DATADIR%%/Modules/Platform/BlueGeneL.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-base.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-dynamic.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-C.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
+%%DATADIR%%/Modules/Platform/BlueGeneP-static.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake