- Update to 2.6.1

Changelog:
	http://www.cmake.org/pipermail/cmake/2008-August/023188.html

bsd.cmake.mk
- Use VERBOSE mode when BATCH is defined to get more informative logs
  on pointyhat/tinderbox

4 files changed, 15 insertions, 6 deletions

diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk
index 72f7652a543b..d663c5bd67d5 100644
--- a/Mk/bsd.cmake.mk
+++ b/Mk/bsd.cmake.mk
@@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=DEBUG
 #
 # Force makefile verbosity if needed
 #
-.if defined(CMAKE_VERBOSE)
+.if defined(CMAKE_VERBOSE) || defined(BATCH)
 CMAKE_ARGS+=	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 .endif
 
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 8b240fbc5ec0..f434dd44a5df 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \
 		${MASTER_SITE_LOCAL}
@@ -27,6 +26,7 @@ MAN1=		ccmake.1 \
 		cmakecommands.1 \
 		cmakecompat.1 \
 		cmakemodules.1 \
+		cmakepolicies.1	\
 		cmakeprops.1 \
 		cmakevars.1 \
 		cpack.1 \
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index ff59c379a0e6..83ecb921c99a 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (cmake-2.6.0.tar.gz) = e95ae003672dfc6c8151a1ee49a0d4a6
-SHA256 (cmake-2.6.0.tar.gz) = 4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
-SIZE (cmake-2.6.0.tar.gz) = 3460096
+MD5 (cmake-2.6.1.tar.gz) = 6717f4bc3cfcced4172ad98660ce7599
+SHA256 (cmake-2.6.1.tar.gz) = 2e0040fd2ecd4fbe29db0429eeeecd078f2f8b2bf0e5fafced209c32bea20d80
+SIZE (cmake-2.6.1.tar.gz) = 3518689
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 08655f6fa5bf..145ee9b0b944 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -83,6 +83,7 @@ bin/ctest
 %%DATADIR%%/Modules/CPack.VolumeIcon.icns.in
 %%DATADIR%%/Modules/CPack.background.png.in
 %%DATADIR%%/Modules/CPack.cmake
+%%DATADIR%%/Modules/CPack.distribution.dist.in
 %%DATADIR%%/Modules/CPackDeb.cmake
 %%DATADIR%%/Modules/CPackRPM.cmake
 %%DATADIR%%/Modules/CPackZIP.cmake
@@ -228,6 +229,7 @@ bin/ctest
 %%DATADIR%%/Modules/ITKCompatibility.cmake
 %%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake
 %%DATADIR%%/Modules/KDE3Macros.cmake
+%%DATADIR%%/Modules/MacOSXBundleInfo.plist.in
 %%DATADIR%%/Modules/MacroAddFileDependencies.cmake
 %%DATADIR%%/Modules/NSIS.InstallOptions.ini.in
 %%DATADIR%%/Modules/NSIS.template.in
@@ -261,6 +263,7 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake
 %%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake
+%%DATADIR%%/Modules/Platform/Linux-PGI-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Linux-SunPro-C.cmake
 %%DATADIR%%/Modules/Platform/Linux-SunPro-CXX.cmake
 %%DATADIR%%/Modules/Platform/Linux-SunPro-Fortran.cmake
@@ -354,6 +357,7 @@ bin/ctest
 %%DATADIR%%/Templates/staticLibFooter.dsptemplate
 %%DATADIR%%/Templates/staticLibHeader.dsptemplate
 %%DATADIR%%/include/cmCPluginAPI.h
+%%DOCSDIR%%/ccmake.docbook
 %%DOCSDIR%%/ccmake.html
 %%DOCSDIR%%/ccmake.txt
 %%DOCSDIR%%/cmake-commands.html
@@ -362,14 +366,19 @@ bin/ctest
 %%DOCSDIR%%/cmake-compatcommands.txt
 %%DOCSDIR%%/cmake-modules.html
 %%DOCSDIR%%/cmake-modules.txt
+%%DOCSDIR%%/cmake-policies.html
+%%DOCSDIR%%/cmake-policies.txt
 %%DOCSDIR%%/cmake-properties.html
 %%DOCSDIR%%/cmake-properties.txt
 %%DOCSDIR%%/cmake-variables.html
 %%DOCSDIR%%/cmake-variables.txt
+%%DOCSDIR%%/cmake.docbook
 %%DOCSDIR%%/cmake.html
 %%DOCSDIR%%/cmake.txt
+%%DOCSDIR%%/cpack.docbook
 %%DOCSDIR%%/cpack.html
 %%DOCSDIR%%/cpack.txt
+%%DOCSDIR%%/ctest.docbook
 %%DOCSDIR%%/ctest.html
 %%DOCSDIR%%/ctest.txt
 @dirrm %%DOCSDIR%%