14 files changed, 85 insertions, 58 deletions

diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk
index 5fcd8cf2b617..ba5c583c122d 100644
--- a/Mk/bsd.cmake.mk
+++ b/Mk/bsd.cmake.mk
@@ -48,7 +48,8 @@ CMAKE_ARGS+=	-DCMAKE_C_COMPILER:STRING="${CC}" \
 				-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
 				-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
 				-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
-				-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}"
+				-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
+				-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES
 
 #
 # Default build type and sourcedir
@@ -73,7 +74,7 @@ CMAKE_ARGS+=	-DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
 # Strip binaries
 #
 .if !defined(WITH_DEBUG)
-CMAKE_ARGS+=	-DCMAKE_INSTALL_DO_STRIP:BOOL=ON
+INSTALL_TARGET?=	install/strip
 .endif
 
 #
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 196af4c62521..263c4dfc3a31 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	strigi
 PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	SF
 
diff --git a/deskutils/strigi/files/patch-config.h.cmake b/deskutils/strigi/files/patch-config.h.cmake
new file mode 100644
index 000000000000..8a05f93576a7
--- /dev/null
+++ b/deskutils/strigi/files/patch-config.h.cmake
@@ -0,0 +1,11 @@
+--- ./config.h.cmake.orig	2009-01-13 00:50:22.000000000 +0300
++++ ./config.h.cmake	2009-03-21 00:02:27.000000000 +0300
+@@ -40,7 +40,7 @@
+ //thread stuff
+ //////////////////////////////
+ #cmakedefine CMAKE_USE_WIN32_THREADS_INIT 1
+-#cmakedefine CMAKE_HAVE_PTHREAD_CREATE 1
++#cmakedefine CMAKE_HAVE_PTHREAD_H 1
+ 
+ //////////////////////////////
+ //types
diff --git a/deskutils/strigi/files/patch-src__streams__strigi__strigi_thread.h b/deskutils/strigi/files/patch-src__streams__strigi__strigi_thread.h
new file mode 100644
index 000000000000..941077a46cdd
--- /dev/null
+++ b/deskutils/strigi/files/patch-src__streams__strigi__strigi_thread.h
@@ -0,0 +1,11 @@
+--- ./src/streams/strigi/strigi_thread.h.orig	2009-01-13 00:50:17.000000000 +0300
++++ ./src/streams/strigi/strigi_thread.h	2009-03-21 00:01:51.000000000 +0300
+@@ -23,7 +23,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(CMAKE_HAVE_PTHREAD_CREATE)
++#if defined(CMAKE_HAVE_PTHREAD_H)
+     #include <pthread.h>
+     #define STRIGI_MUTEX_DEFINE(x) pthread_mutex_t x
+     #define STRIGI_MUTEX_INIT(x) pthread_mutex_init(x, 0)
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index e505ddef879f..e5d9625dc9fb 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	cmake
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lofi
+MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	A cross-platform make
@@ -21,6 +19,12 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--docdir=${DOCSDIR:S|^${PREFIX}||}
 CONFIGURE_ENV=	MAKE=make
 
+MAKE_JOBS_SAFE=	yes
+
+.if !defined(WITH_DEBUG)
+INSTALL_TARGET=install/strip
+.endif
+
 MAN1=		ccmake.1 \
 		cmake.1 \
 		cmakecommands.1 \
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 61421e73b8a5..58c3f1dbacde 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (cmake-2.6.2.tar.gz) = 9e82aa3beb991aa8e5797cf330618d42
-SHA256 (cmake-2.6.2.tar.gz) = b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9
-SIZE (cmake-2.6.2.tar.gz) = 3543548
+MD5 (cmake-2.6.3.tar.gz) = 5ba47a94ce276f326abca1fd72a7e7c6
+SHA256 (cmake-2.6.3.tar.gz) = 3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450
+SIZE (cmake-2.6.3.tar.gz) = 3594959
diff --git a/devel/cmake/files/patch-Modules_FindLua50.cmake b/devel/cmake/files/patch-Modules_FindLua50.cmake
deleted file mode 100644
index 557a1694123f..000000000000
--- a/devel/cmake/files/patch-Modules_FindLua50.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- Modules/FindLua50.cmake.orig	2008-08-01 18:34:50.000000000 +0300
-+++ Modules/FindLua50.cmake	2009-01-22 09:26:29.000000000 +0200
-@@ -28,7 +28,7 @@
- )
- 
- FIND_LIBRARY(LUA_LIBRARY_lua 
--  NAMES lua50 lua5.0 lua5 lua
-+  NAMES lua50 lua5.0 lua-5.0 lua5 lua
-   HINTS
-   $ENV{LUA_DIR}
-   PATH_SUFFIXES lib64 lib
diff --git a/devel/cmake/files/patch-Modules_FindLua51.cmake b/devel/cmake/files/patch-Modules_FindLua51.cmake
deleted file mode 100644
index 5b44295e4b4c..000000000000
--- a/devel/cmake/files/patch-Modules_FindLua51.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- Modules/FindLua51.cmake.orig	2008-08-01 18:34:50.000000000 +0300
-+++ Modules/FindLua51.cmake	2009-01-22 09:26:29.000000000 +0200
-@@ -28,7 +28,7 @@
- )
- 
- FIND_LIBRARY(LUA_LIBRARY 
--  NAMES lua51 lua5.1 lua
-+  NAMES lua51 lua5.1 lua-5.1 lua
-   HINTS
-   $ENV{LUA_DIR}
-   PATH_SUFFIXES lib64 lib
diff --git a/devel/cmake/files/patch-Modules_FindPythonInterp.cmake b/devel/cmake/files/patch-Modules_FindPythonInterp.cmake
new file mode 100644
index 000000000000..c67cffbdfe78
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_FindPythonInterp.cmake
@@ -0,0 +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 @@
+ #
+ 
+ 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 ${DEFAULT_PYTHON_EXECUTABLE} python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+   PATHS
+   [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_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake
index 27a5aaeff783..13f6a82f03ca 100644
--- a/devel/cmake/files/patch-Modules_FindQt4.cmake
+++ b/devel/cmake/files/patch-Modules_FindQt4.cmake
@@ -1,6 +1,6 @@
---- ./Modules/FindQt4.cmake.orig	2008-05-05 22:25:53.000000000 +0400
-+++ ./Modules/FindQt4.cmake	2008-07-21 02:37:16.000000000 +0400
-@@ -293,7 +293,7 @@
+--- ./Modules/FindQt4.cmake.orig	2009-02-21 23:36:50.000000000 +0300
++++ ./Modules/FindQt4.cmake	2009-03-20 13:20:18.000000000 +0300
+@@ -319,7 +319,7 @@
  
  GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
  # check for qmake
@@ -9,19 +9,7 @@
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
-@@ -915,9 +915,9 @@
-     "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
- 
-   SET(QT_MOC_EXECUTABLE 
--    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
-+    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
-   SET(QT_UIC_EXECUTABLE 
--    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
-+    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
- 
-   FIND_PROGRAM(QT_UIC3_EXECUTABLE
-     NAMES uic3
-@@ -944,13 +944,13 @@
+@@ -855,13 +855,13 @@
      )
  
    FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 6428a4bf369d..5933385e9366 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -8,6 +8,7 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake
 %%DATADIR%%/Modules/CMakeASMCompiler.cmake.in
 %%DATADIR%%/Modules/CMakeASMInformation.cmake
+%%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake
 %%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake
 %%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake
 %%DATADIR%%/Modules/CMakeBorlandFindMake.cmake
@@ -26,6 +27,7 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeDependentOption.cmake
 %%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeDetermineASM_MASMCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake
 %%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake
@@ -58,6 +60,7 @@ bin/ctest
 %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake
 %%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestASMCompiler.cmake
+%%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestCCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake
 %%DATADIR%%/Modules/CMakeTestForFreeVC.cxx
@@ -128,11 +131,14 @@ bin/ctest
 %%DATADIR%%/Modules/FindCABLE.cmake
 %%DATADIR%%/Modules/FindCURL.cmake
 %%DATADIR%%/Modules/FindCVS.cmake
+%%DATADIR%%/Modules/FindCoin3D.cmake
 %%DATADIR%%/Modules/FindCups.cmake
 %%DATADIR%%/Modules/FindCurses.cmake
+%%DATADIR%%/Modules/FindCxxTest.cmake
 %%DATADIR%%/Modules/FindCygwin.cmake
 %%DATADIR%%/Modules/FindDCMTK.cmake
 %%DATADIR%%/Modules/FindDart.cmake
+%%DATADIR%%/Modules/FindDevIL.cmake
 %%DATADIR%%/Modules/FindDoxygen.cmake
 %%DATADIR%%/Modules/FindEXPAT.cmake
 %%DATADIR%%/Modules/FindFLTK.cmake
@@ -170,7 +176,9 @@ bin/ctest
 %%DATADIR%%/Modules/FindMotif.cmake
 %%DATADIR%%/Modules/FindOpenAL.cmake
 %%DATADIR%%/Modules/FindOpenGL.cmake
+%%DATADIR%%/Modules/FindOpenMP.cmake
 %%DATADIR%%/Modules/FindOpenSSL.cmake
+%%DATADIR%%/Modules/FindOpenSceneGraph.cmake
 %%DATADIR%%/Modules/FindOpenThreads.cmake
 %%DATADIR%%/Modules/FindPHP4.cmake
 %%DATADIR%%/Modules/FindPNG.cmake
@@ -188,6 +196,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindQt3.cmake
 %%DATADIR%%/Modules/FindQt4.cmake
 %%DATADIR%%/Modules/FindQuickTime.cmake
+%%DATADIR%%/Modules/FindRTI.cmake
 %%DATADIR%%/Modules/FindRuby.cmake
 %%DATADIR%%/Modules/FindSDL.cmake
 %%DATADIR%%/Modules/FindSDL_image.cmake
@@ -197,6 +206,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindSDL_ttf.cmake
 %%DATADIR%%/Modules/FindSWIG.cmake
 %%DATADIR%%/Modules/FindSelfPackers.cmake
+%%DATADIR%%/Modules/FindSquish.cmake
 %%DATADIR%%/Modules/FindSubversion.cmake
 %%DATADIR%%/Modules/FindTCL.cmake
 %%DATADIR%%/Modules/FindTIFF.cmake
@@ -211,6 +221,7 @@ bin/ctest
 %%DATADIR%%/Modules/FindXMLRPC.cmake
 %%DATADIR%%/Modules/FindZLIB.cmake
 %%DATADIR%%/Modules/Findosg.cmake
+%%DATADIR%%/Modules/FindosgAnimation.cmake
 %%DATADIR%%/Modules/FindosgDB.cmake
 %%DATADIR%%/Modules/FindosgFX.cmake
 %%DATADIR%%/Modules/FindosgGA.cmake
@@ -224,8 +235,13 @@ bin/ctest
 %%DATADIR%%/Modules/FindosgText.cmake
 %%DATADIR%%/Modules/FindosgUtil.cmake
 %%DATADIR%%/Modules/FindosgViewer.cmake
+%%DATADIR%%/Modules/FindosgVolume.cmake
+%%DATADIR%%/Modules/FindosgWidget.cmake
+%%DATADIR%%/Modules/Findosg_functions.cmake
 %%DATADIR%%/Modules/FindwxWidgets.cmake
 %%DATADIR%%/Modules/FindwxWindows.cmake
+%%DATADIR%%/Modules/FortranCInterface.cmake
+%%DATADIR%%/Modules/FortranCInterface.h.in
 %%DATADIR%%/Modules/GetPrerequisites.cmake
 %%DATADIR%%/Modules/ITKCompatibility.cmake
 %%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake
@@ -257,6 +273,7 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake
 %%DATADIR%%/Modules/Platform/Generic.cmake
 %%DATADIR%%/Modules/Platform/HP-UX.cmake
+%%DATADIR%%/Modules/Platform/Haiku.cmake
 %%DATADIR%%/Modules/Platform/IRIX.cmake
 %%DATADIR%%/Modules/Platform/IRIX64.cmake
 %%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake
@@ -311,6 +328,7 @@ bin/ctest
 %%DATADIR%%/Modules/Platform/kFreeBSD.cmake
 %%DATADIR%%/Modules/Platform/syllable.cmake
 %%DATADIR%%/Modules/Platform/xlf.cmake
+%%DATADIR%%/Modules/SquishTestScript.cmake
 %%DATADIR%%/Modules/SystemInformation.cmake
 %%DATADIR%%/Modules/SystemInformation.in
 %%DATADIR%%/Modules/TestBigEndian.cmake
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 892efb1a649d..d572fa377905 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -35,13 +36,7 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		qmake_build moc_build rcc_build uic_build
 USE_OPENLDAP=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-CMAKE_USE_PTHREAD+= yes
-.endif
-
 post-extract:
 	${MKDIR} ${WRKSRC}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index f5b5d6fb4c54..3b3384f95715 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
index 3c4408efa3bf..5a4f9757769c 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
@@ -1,6 +1,15 @@
---- ../cmake/modules/FindKDE4Internal.cmake.orig	2008-12-04 11:35:54.000000000 +0300
-+++ ../cmake/modules/FindKDE4Internal.cmake	2008-12-15 02:56:07.000000000 +0300
-@@ -743,8 +743,8 @@
+--- ../cmake/modules/FindKDE4Internal.cmake.orig	2009-02-26 17:18:26.000000000 +0300
++++ ../cmake/modules/FindKDE4Internal.cmake	2009-03-22 14:42:53.000000000 +0300
+@@ -550,7 +550,7 @@
+ # whether to install a CMake FooConfig.cmake into lib/foo/cmake/ or /lib/cmake/foo/
+ # (with 2.6.3 and above also lib/cmake/foo/ is supported):
+ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
+-   option(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead to lib/<package>/cmake" TRUE)
++   option(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead to lib/<package>/cmake" FALSE)
+ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
+    set(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR  FALSE)
+ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
+@@ -694,8 +694,8 @@
     _set_fancy(XDG_MIME_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/mime/packages"  "The install dir for the xdg mimetypes")
  
     _set_fancy(SYSCONF_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/etc"            "The kde sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)")