- Update to 1.8.3

- MASTER_SITES dir depend on PORTVERSION
- Utilize DOCSDIR and DATADIR

PR:		61226
Submitted by:	Sergey Matveychuk <sem@ciam.ru>

3 files changed, 151 insertions, 136 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 74009227d7c6..ce48868831c6 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	1.6.7
+PORTVERSION=	1.8.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v1.6/
+MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A cross-platform make
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--docdir=${DOCSDIR:S|^${PREFIX}||} --datadir=${DATADIR:S|^${PREFIX}||}
 
 MAN1=	cmake.1
 
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 7e1c3c00ff95..6306f0568ac5 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1 +1 @@
-MD5 (cmake-1.6.7.tar.gz) = eaad0a2183f4bcc1cbd26bd9ec13da1a
+MD5 (cmake-1.8.3.tar.gz) = 781afe6ed9000e303bf6ac3e4e384dce
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 92b23f302e89..e45ba3d2b140 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -1,136 +1,150 @@
 bin/ccmake
 bin/cmake
-bin/cmaketest
 bin/ctest
-share/CMake/Modules/Dart.cmake
-share/CMake/Modules/Documentation.cmake
-share/CMake/Modules/FindCABLE.cmake
-share/CMake/Modules/FindCurses.cmake
-share/CMake/Modules/FindCygwin.cmake
-share/CMake/Modules/FindDart.cmake
-share/CMake/Modules/FindDoxygen.cmake
-share/CMake/Modules/FindFLTK.cmake
-share/CMake/Modules/FindGCCXML.cmake
-share/CMake/Modules/FindGLU.cmake
-share/CMake/Modules/FindGLUT.cmake
-share/CMake/Modules/FindGTK.cmake
-share/CMake/Modules/FindGnuplot.cmake
-share/CMake/Modules/FindITK.cmake
-share/CMake/Modules/FindJNI.cmake
-share/CMake/Modules/FindJPEG.cmake
-share/CMake/Modules/FindJava.cmake
-share/CMake/Modules/FindMPI.cmake
-share/CMake/Modules/FindOpenGL.cmake
-share/CMake/Modules/FindPerl.cmake
-share/CMake/Modules/FindPythonLibs.cmake
-share/CMake/Modules/FindQt.cmake
-share/CMake/Modules/FindSelfPackers.cmake
-share/CMake/Modules/FindTCL.cmake
-share/CMake/Modules/FindTclsh.cmake
-share/CMake/Modules/FindUnixCommands.cmake
-share/CMake/Modules/FindVTK.cmake
-share/CMake/Modules/FindWget.cmake
-share/CMake/Modules/FindWish.cmake
-share/CMake/Modules/FindX11.cmake
-share/CMake/Modules/Platform/IRIX.cmake
-share/CMake/Modules/Platform/OpenBSD.cmake
-share/CMake/Modules/Platform/SINIX.cmake
-share/CMake/Modules/Platform/SCO_SV.cmake
-share/CMake/Modules/Platform/Windows.cmake
-share/CMake/Modules/Platform/ULTRIX.cmake
-share/CMake/Modules/Platform/NetBSD.cmake
-share/CMake/Modules/Platform/MP-RAS.cmake
-share/CMake/Modules/Platform/CYGWIN.cmake
-share/CMake/Modules/Platform/True64.cmake
-share/CMake/Modules/Platform/Xenix.cmake
-share/CMake/Modules/Platform/HP-UX.cmake
-share/CMake/Modules/Platform/Darwin.cmake
-share/CMake/Modules/Platform/BSDOS.cmake
-share/CMake/Modules/Platform/UNIX_SV.cmake
-share/CMake/Modules/Platform/Windows-cl.cmake
-share/CMake/Modules/Platform/SunOS.cmake
-share/CMake/Modules/Platform/IRIX64.cmake
-share/CMake/Modules/Platform/OSF1.cmake
-share/CMake/Modules/Platform/RISCos.cmake
-share/CMake/Modules/Platform/AIX.cmake
-share/CMake/Modules/Platform/UnixWare.cmake
-share/CMake/Modules/Platform/FreeBSD.cmake
-share/CMake/Modules/Platform/Linux-como.cmake
-share/CMake/Modules/Platform/Linux.cmake
-share/CMake/Modules/Platform/Windows-bcc32.cmake
-share/CMake/Modules/Platform/gcc.cmake
-share/CMake/Modules/FindLATEX.cmake
-share/CMake/Modules/CheckIncludeFiles.cmake
-share/CMake/Modules/CMakeVS7FindMake.cmake
-share/CMake/Modules/TestForANSIForScope.cmake
-share/CMake/Modules/FindMFC.cmake
-share/CMake/Modules/TestCXXAcceptsFlag.cmake
-share/CMake/Modules/CMakeNMakeFindMake.cmake
-share/CMake/Modules/FindThreads.cmake
-share/CMake/Modules/CMakeVS7BackwardCompatibility.cmake
-share/CMake/Modules/UseVTK40.cmake
-share/CMake/Modules/CMakeBorlandFindMake.cmake
-share/CMake/Modules/CMakeDetermineCXXCompiler.cmake
-share/CMake/Modules/FindPNG.cmake
-share/CMake/Modules/FindwxWindows.cmake
-share/CMake/Modules/CMakeExportBuildSettings.cmake
-share/CMake/Modules/CheckIncludeFileCXX.cmake
-share/CMake/Modules/CheckVariableExists.cmake
-share/CMake/Modules/CMakeImportBuildSettings.cmake
-share/CMake/Modules/CMakeDetermineCCompiler.cmake
-share/CMake/Modules/CheckLibraryExists.cmake
-share/CMake/Modules/FindZLIB.cmake
-share/CMake/Modules/CMakeDetermineSystem.cmake
-share/CMake/Modules/CMakeBackwardCompatibilityCXX.cmake
-share/CMake/Modules/CheckSizeOf.cmake
-share/CMake/Modules/CMakeSystemSpecificInformation.cmake
-share/CMake/Modules/CMakeVS6BackwardCompatibility.cmake
-share/CMake/Modules/CMakeBackwardCompatibilityC.cmake
-share/CMake/Modules/UseVTKConfig40.cmake
-share/CMake/Modules/FindAVIFile.cmake
-share/CMake/Modules/FindMPEG2.cmake
-share/CMake/Modules/CMakeDefaultMakeRuleVariables.cmake
-share/CMake/Modules/CMakeVS71FindMake.cmake
-share/CMake/Modules/CMakeDetermineJavaCompiler.cmake
-share/CMake/Modules/UseVTKBuildSettings40.cmake
-share/CMake/Modules/FindSDL.cmake
-share/CMake/Modules/TestForANSIStreamHeaders.cmake
-share/CMake/Modules/CheckSymbolExists.cmake
-share/CMake/Modules/TestBigEndian.cmake
-share/CMake/Modules/FindMPEG.cmake
-share/CMake/Modules/CMakeTestCCompiler.cmake
-share/CMake/Modules/CheckIncludeFile.cmake
-share/CMake/Modules/CMakeUnixFindMake.cmake
-share/CMake/Modules/CheckTypeSize.cmake
-share/CMake/Modules/TestForSTDNamespace.cmake
-share/CMake/Modules/CMakePrintSystemInformation.cmake
-share/CMake/Modules/CMakeTestCXXCompiler.cmake
-share/CMake/Modules/FindHTMLHelp.cmake
-share/CMake/Modules/CMakeVS6FindMake.cmake
-share/CMake/Modules/FindTIFF.cmake
-share/CMake/Modules/CheckFunctionExists.cmake
-share/CMake/Modules/FindImageMagick.cmake
-share/CMake/Modules/TestForANSIStreamHeaders.cxx
-share/CMake/Modules/TestForAnsiForScope.cxx
-share/CMake/Modules/DummyCXXFile.cxx
-share/CMake/Modules/TestForSTDNamespace.cxx
-share/CMake/Modules/CheckIncludeFile.c.in
-share/CMake/Modules/CMakeBuildSettings.cmake.in
-share/CMake/Modules/CMakeSystem.cmake.in
-share/CMake/Modules/CheckIncludeFile.cxx.in
-share/CMake/Modules/CMakeCXXCompiler.cmake.in
-share/CMake/Modules/CMakeJavaCompiler.cmake.in
-share/CMake/Modules/CMakeCCompiler.cmake.in
-share/CMake/Modules/CheckLibraryExists.lists.in
-share/CMake/Modules/CheckTypeSize.c
-share/CMake/Modules/CMakeTestGNU.c
-share/CMake/Modules/TestBigEndian.c
-share/CMake/Modules/CheckFunctionExists.c
-share/CMake/Modules/CheckVariableExists.c
-share/CMake/Templates/install-sh
-share/CMake/include/cmCPluginAPI.h
-@dirrm share/CMake/Modules/Platform
-@dirrm share/CMake/Templates
-@dirrm share/CMake/Modules
-@dirrm share/CMake/include
-@dirrm share/CMake
+%%DOCSDIR%%/Copyright.txt
+%%DOCSDIR%%/ccmake.html
+%%DOCSDIR%%/ccmake.txt
+%%DOCSDIR%%/cmake.html
+%%DOCSDIR%%/cmake.txt
+%%DOCSDIR%%/ctest.html
+%%DOCSDIR%%/ctest.txt
+%%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake
+%%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake
+%%DATADIR%%/Modules/CMakeBorlandFindMake.cmake
+%%DATADIR%%/Modules/CMakeBuildSettings.cmake.in
+%%DATADIR%%/Modules/CMakeCCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeCXXCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeDefaultMakeRuleVariables.cmake
+%%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineSystem.cmake
+%%DATADIR%%/Modules/CMakeExportBuildSettings.cmake
+%%DATADIR%%/Modules/CMakeFindFrameworks.cmake
+%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
+%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
+%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
+%%DATADIR%%/Modules/CMakePrintSystemInformation.cmake
+%%DATADIR%%/Modules/CMakeSystem.cmake.in
+%%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
+%%DATADIR%%/Modules/CMakeTestCCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestGNU.c
+%%DATADIR%%/Modules/CMakeTestNMakeCLVersion.c
+%%DATADIR%%/Modules/CMakeUnixFindMake.cmake
+%%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake
+%%DATADIR%%/Modules/CMakeVS6FindMake.cmake
+%%DATADIR%%/Modules/CMakeVS71FindMake.cmake
+%%DATADIR%%/Modules/CMakeVS7BackwardCompatibility.cmake
+%%DATADIR%%/Modules/CMakeVS7FindMake.cmake
+%%DATADIR%%/Modules/CheckForPthreads.c
+%%DATADIR%%/Modules/CheckFunctionExists.c
+%%DATADIR%%/Modules/CheckFunctionExists.cmake
+%%DATADIR%%/Modules/CheckIncludeFile.c.in
+%%DATADIR%%/Modules/CheckIncludeFile.cmake
+%%DATADIR%%/Modules/CheckIncludeFile.cxx.in
+%%DATADIR%%/Modules/CheckIncludeFileCXX.cmake
+%%DATADIR%%/Modules/CheckIncludeFiles.cmake
+%%DATADIR%%/Modules/CheckLibraryExists.cmake
+%%DATADIR%%/Modules/CheckLibraryExists.lists.in
+%%DATADIR%%/Modules/CheckSizeOf.cmake
+%%DATADIR%%/Modules/CheckSymbolExists.cmake
+%%DATADIR%%/Modules/CheckTypeSize.c
+%%DATADIR%%/Modules/CheckTypeSize.cmake
+%%DATADIR%%/Modules/CheckVariableExists.c
+%%DATADIR%%/Modules/CheckVariableExists.cmake
+%%DATADIR%%/Modules/Dart.cmake
+%%DATADIR%%/Modules/DartConfiguration.tcl.in
+%%DATADIR%%/Modules/Documentation.cmake
+%%DATADIR%%/Modules/DummyCXXFile.cxx
+%%DATADIR%%/Modules/FindAVIFile.cmake
+%%DATADIR%%/Modules/FindCABLE.cmake
+%%DATADIR%%/Modules/FindCurses.cmake
+%%DATADIR%%/Modules/FindCygwin.cmake
+%%DATADIR%%/Modules/FindDart.cmake
+%%DATADIR%%/Modules/FindDoxygen.cmake
+%%DATADIR%%/Modules/FindFLTK.cmake
+%%DATADIR%%/Modules/FindGCCXML.cmake
+%%DATADIR%%/Modules/FindGLU.cmake
+%%DATADIR%%/Modules/FindGLUT.cmake
+%%DATADIR%%/Modules/FindGTK.cmake
+%%DATADIR%%/Modules/FindGnuplot.cmake
+%%DATADIR%%/Modules/FindHTMLHelp.cmake
+%%DATADIR%%/Modules/FindITK.cmake
+%%DATADIR%%/Modules/FindImageMagick.cmake
+%%DATADIR%%/Modules/FindJNI.cmake
+%%DATADIR%%/Modules/FindJPEG.cmake
+%%DATADIR%%/Modules/FindJava.cmake
+%%DATADIR%%/Modules/FindLATEX.cmake
+%%DATADIR%%/Modules/FindMFC.cmake
+%%DATADIR%%/Modules/FindMPEG.cmake
+%%DATADIR%%/Modules/FindMPEG2.cmake
+%%DATADIR%%/Modules/FindMPI.cmake
+%%DATADIR%%/Modules/FindOpenGL.cmake
+%%DATADIR%%/Modules/FindPNG.cmake
+%%DATADIR%%/Modules/FindPerl.cmake
+%%DATADIR%%/Modules/FindPythonLibs.cmake
+%%DATADIR%%/Modules/FindQt.cmake
+%%DATADIR%%/Modules/FindSDL.cmake
+%%DATADIR%%/Modules/FindSelfPackers.cmake
+%%DATADIR%%/Modules/FindTCL.cmake
+%%DATADIR%%/Modules/FindTIFF.cmake
+%%DATADIR%%/Modules/FindTclsh.cmake
+%%DATADIR%%/Modules/FindThreads.cmake
+%%DATADIR%%/Modules/FindUnixCommands.cmake
+%%DATADIR%%/Modules/FindVTK.cmake
+%%DATADIR%%/Modules/FindWget.cmake
+%%DATADIR%%/Modules/FindWish.cmake
+%%DATADIR%%/Modules/FindX11.cmake
+%%DATADIR%%/Modules/FindZLIB.cmake
+%%DATADIR%%/Modules/FindwxWindows.cmake
+%%DATADIR%%/Modules/Platform/AIX.cmake
+%%DATADIR%%/Modules/Platform/BSDOS.cmake
+%%DATADIR%%/Modules/Platform/CYGWIN.cmake
+%%DATADIR%%/Modules/Platform/Darwin.cmake
+%%DATADIR%%/Modules/Platform/FreeBSD.cmake
+%%DATADIR%%/Modules/Platform/HP-UX.cmake
+%%DATADIR%%/Modules/Platform/IRIX.cmake
+%%DATADIR%%/Modules/Platform/IRIX64.cmake
+%%DATADIR%%/Modules/Platform/Linux-como.cmake
+%%DATADIR%%/Modules/Platform/Linux.cmake
+%%DATADIR%%/Modules/Platform/MP-RAS.cmake
+%%DATADIR%%/Modules/Platform/NetBSD.cmake
+%%DATADIR%%/Modules/Platform/OSF1.cmake
+%%DATADIR%%/Modules/Platform/OpenBSD.cmake
+%%DATADIR%%/Modules/Platform/RISCos.cmake
+%%DATADIR%%/Modules/Platform/SCO_SV.cmake
+%%DATADIR%%/Modules/Platform/SINIX.cmake
+%%DATADIR%%/Modules/Platform/SunOS.cmake
+%%DATADIR%%/Modules/Platform/True64.cmake
+%%DATADIR%%/Modules/Platform/ULTRIX.cmake
+%%DATADIR%%/Modules/Platform/UNIX_SV.cmake
+%%DATADIR%%/Modules/Platform/UnixWare.cmake
+%%DATADIR%%/Modules/Platform/Windows-bcc32.cmake
+%%DATADIR%%/Modules/Platform/Windows-cl.cmake
+%%DATADIR%%/Modules/Platform/Windows-gcc.cmake
+%%DATADIR%%/Modules/Platform/Windows.cmake
+%%DATADIR%%/Modules/Platform/Xenix.cmake
+%%DATADIR%%/Modules/Platform/gcc.cmake
+%%DATADIR%%/Modules/TestBigEndian.c
+%%DATADIR%%/Modules/TestBigEndian.cmake
+%%DATADIR%%/Modules/TestCXXAcceptsFlag.cmake
+%%DATADIR%%/Modules/TestForANSIForScope.cmake
+%%DATADIR%%/Modules/TestForANSIStreamHeaders.cmake
+%%DATADIR%%/Modules/TestForANSIStreamHeaders.cxx
+%%DATADIR%%/Modules/TestForAnsiForScope.cxx
+%%DATADIR%%/Modules/TestForSTDNamespace.cmake
+%%DATADIR%%/Modules/TestForSTDNamespace.cxx
+%%DATADIR%%/Modules/UseVTK40.cmake
+%%DATADIR%%/Modules/UseVTKBuildSettings40.cmake
+%%DATADIR%%/Modules/UseVTKConfig40.cmake
+%%DATADIR%%/Modules/Use_wxWindows.cmake
+%%DATADIR%%/Modules/readme.txt
+%%DATADIR%%/Templates/install-sh
+%%DATADIR%%/include/cmCPluginAPI.h
+@dirrm %%DATADIR%%/include
+@dirrm %%DATADIR%%/Templates
+@dirrm %%DATADIR%%/Modules/Platform
+@dirrm %%DATADIR%%/Modules
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%