Hi, This is an update to cmake-2.8.3, released on 11-03-2010.
I've removed the "GXX 3.3 on OpenBSD is known to cause CPack to Crash." check, because I think it should be ok if compiled with "-O0" on gcc3 archs (like we already do). Maybe it's worth a bulk build... Cheers, David Index: Makefile =================================================================== RCS file: /cvs/ports/devel/cmake/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- Makefile 26 Oct 2010 18:31:18 -0000 1.31 +++ Makefile 12 Nov 2010 10:29:40 -0000 @@ -5,8 +5,7 @@ VMEM_WARNING = Yes HOMEPAGE = http://www.cmake.org/ CATEGORIES = devel COMMENT = portable build system -DISTNAME = cmake-2.8.2 -REVISION = 3 +DISTNAME = cmake-2.8.3 MASTER_SITES = ${HOMEPAGE}files/v2.8/ MAINTAINER = David Coppa <dco...@openbsd.org> @@ -17,9 +16,11 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_PACKAGE_FTP = Yes PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c crypto curl curses expat form m ssl stdc++ z +WANTLIB = archive c crypto curl curses expat form m \ + ssl stdc++ z -LIB_DEPENDS = ::net/curl +LIB_DEPENDS = ::archivers/libarchive \ + ::net/curl CONFIGURE_STYLE = simple CONFIGURE_ARGS = --prefix=${PREFIX} \ @@ -38,6 +39,8 @@ REGRESS_TARGET = test .if ${MACHINE_ARCH} == "arm" CFLAGS += -O0 .endif + +MAKE_FLAGS += VERBOSE=1 pre-configure: @cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/ Index: distinfo =================================================================== RCS file: /cvs/ports/devel/cmake/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 12 Jul 2010 19:19:30 -0000 1.9 +++ distinfo 12 Nov 2010 10:29:40 -0000 @@ -1,5 +1,5 @@ -MD5 (cmake-2.8.2.tar.gz) = jJZ9UmRlenmPIu4jl2/w2Q== -RMD160 (cmake-2.8.2.tar.gz) = B5t8jLOFxZs3E6NhHXqUgveFX+U= -SHA1 (cmake-2.8.2.tar.gz) = JyADwv45KyEc47X4la2E2iymA88= -SHA256 (cmake-2.8.2.tar.gz) = dm/xaa95hZnX3ULkHp9FM9c5QqK7koI1EVQS3OW4FAY= -SIZE (cmake-2.8.2.tar.gz) = 5392016 +MD5 (cmake-2.8.3.tar.gz) = p2pEuTrPXjut2p3hEThZIQ== +RMD160 (cmake-2.8.3.tar.gz) = i8uoitiE4iu630xZSl87C9vy4Sw= +SHA1 (cmake-2.8.3.tar.gz) = 6b++xHs5Ob5vg/+oAGiEKFxofcI= +SHA256 (cmake-2.8.3.tar.gz) = aJ7QJ4a1zvpVFcdxZ4Tugqgujs5r5aPWKaw8wMBfwog= +SIZE (cmake-2.8.3.tar.gz) = 5436543 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v retrieving revision 1.4 diff -u -p -r1.4 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 12 Jul 2010 19:19:30 -0000 1.4 +++ patches/patch-CMakeLists_txt 12 Nov 2010 10:29:40 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 2010/07/12 19:19:30 dcoppa Exp $ ---- CMakeLists.txt.orig Mon Jun 28 17:15:57 2010 -+++ CMakeLists.txt Mon Jul 5 11:23:18 2010 -@@ -206,6 +206,15 @@ MACRO (CMAKE_BUILD_UTILITIES) +--- CMakeLists.txt.orig Wed Nov 3 20:58:27 2010 ++++ CMakeLists.txt Wed Nov 10 09:05:48 2010 +@@ -253,6 +253,15 @@ MACRO (CMAKE_BUILD_UTILITIES) # (a macro defined in this file) CMAKE_HANDLE_SYSTEM_LIBRARIES() @@ -17,7 +17,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 201 #--------------------------------------------------------------------- # Build zlib library for Curl, CMake, and CTest. SET(CMAKE_ZLIB_HEADER "cm_zlib.h") -@@ -325,9 +334,6 @@ MACRO (CMAKE_BUILD_UTILITIES) +@@ -390,26 +399,7 @@ MACRO (CMAKE_BUILD_UTILITIES) ELSE (UNIX) SET(BUILD_CursesDialog 0) ENDIF (UNIX) @@ -25,5 +25,22 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 201 - ADD_SUBDIRECTORY(Source/CursesDialog/form) - ENDIF(BUILD_CursesDialog) ENDMACRO (CMAKE_BUILD_UTILITIES) +- +-#----------------------------------------------------------------------- +-IF(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD") +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} +- ${CMAKE_CXX_COMPILER_ARG1} -dumpversion +- OUTPUT_VARIABLE _GXX_VERSION +- ) +- STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" +- _GXX_VERSION_SHORT ${_GXX_VERSION}) +- IF(_GXX_VERSION_SHORT EQUAL 33) +- MESSAGE(FATAL_ERROR +- "GXX 3.3 on OpenBSD is known to cause CPack to Crash.\n" +- "Please use GXX 4.2 or greater to build CMake on OpenBSD\n" +- "${CMAKE_CXX_COMPILER} version is: ${_GXX_VERSION}") +- ENDIF() +-ENDIF() - + #----------------------------------------------------------------------- + # The main section of the CMakeLists file Index: patches/patch-Modules_CMakeUnixFindMake_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeUnixFindMake_cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules_CMakeUnixFindMake_cmake --- patches/patch-Modules_CMakeUnixFindMake_cmake 28 May 2010 20:21:48 -0000 1.2 +++ patches/patch-Modules_CMakeUnixFindMake_cmake 12 Nov 2010 10:29:40 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Modules_CMakeUnixFindMake_cmake,v 1.2 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/CMakeUnixFindMake.cmake.orig Tue Mar 23 02:17:49 2010 -+++ Modules/CMakeUnixFindMake.cmake Tue Mar 23 02:18:02 2010 +--- Modules/CMakeUnixFindMake.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/CMakeUnixFindMake.cmake Wed Nov 10 09:01:25 2010 @@ -12,5 +12,5 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES gmake make smake) Index: patches/patch-Modules_Compiler_G95-Fortran_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_G95-Fortran_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_Compiler_G95-Fortran_cmake --- patches/patch-Modules_Compiler_G95-Fortran_cmake 26 Oct 2010 18:31:18 -0000 1.1 +++ patches/patch-Modules_Compiler_G95-Fortran_cmake 12 Nov 2010 10:29:40 -0000 @@ -1,12 +1,11 @@ $OpenBSD: patch-Modules_Compiler_G95-Fortran_cmake,v 1.1 2010/10/26 18:31:18 dcoppa Exp $ ---- Modules/Compiler/G95-Fortran.cmake.orig Mon Jun 28 17:15:57 2010 -+++ Modules/Compiler/G95-Fortran.cmake Tue Oct 26 15:20:40 2010 +--- Modules/Compiler/G95-Fortran.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/Compiler/G95-Fortran.cmake Wed Nov 10 10:34:50 2010 @@ -1,7 +1,5 @@ set(CMAKE_Fortran_FLAGS_INIT "") set(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g") -set(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os") -set(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3") --set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") -+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-g") + set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") set(CMAKE_Fortran_VERBOSE_FLAG "-v") Index: patches/patch-Modules_Compiler_GNU_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_Compiler_GNU_cmake --- patches/patch-Modules_Compiler_GNU_cmake 26 Oct 2010 18:31:18 -0000 1.1 +++ patches/patch-Modules_Compiler_GNU_cmake 12 Nov 2010 10:29:40 -0000 @@ -1,16 +1,14 @@ $OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.1 2010/10/26 18:31:18 dcoppa Exp $ ---- Modules/Compiler/GNU.cmake.orig Tue Oct 26 11:06:23 2010 -+++ Modules/Compiler/GNU.cmake Tue Oct 26 11:08:37 2010 -@@ -27,9 +27,9 @@ macro(__compiler_gnu lang) +--- Modules/Compiler/GNU.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/Compiler/GNU.cmake Wed Nov 10 10:35:50 2010 +@@ -27,8 +27,8 @@ macro(__compiler_gnu lang) # Initial configuration flags. set(CMAKE_${lang}_FLAGS_INIT "") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g") - set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") - set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") -- set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") + set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-DNDEBUG") -+ set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-g") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") - if(NOT APPLE) Index: patches/patch-Modules_FindBoost_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindBoost_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindBoost_cmake --- patches/patch-Modules_FindBoost_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindBoost_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Modules_FindBoost_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindBoost.cmake.orig Tue Apr 6 16:45:31 2010 -+++ Modules/FindBoost.cmake Fri Apr 23 15:55:13 2010 -@@ -70,7 +70,9 @@ +--- Modules/FindBoost.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/FindBoost.cmake Wed Nov 10 09:01:25 2010 +@@ -71,7 +71,9 @@ # omit the 3rd version number from include paths if it is 0 although not all # binary Boost releases do so. # Index: patches/patch-Modules_FindJNI_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindJNI_cmake --- patches/patch-Modules_FindJNI_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindJNI_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindJNI.cmake.orig Tue Apr 6 16:45:31 2010 -+++ Modules/FindJNI.cmake Tue May 11 15:42:37 2010 +--- Modules/FindJNI.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/FindJNI.cmake Wed Nov 10 09:01:25 2010 @@ -26,6 +26,8 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +SET(MODJAVA_VER $ENV{MODJAVA_VER}) @@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var} MACRO(java_append_library_directories _var) # Determine java arch-specific library subdir -@@ -71,29 +73,51 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES +@@ -96,29 +98,51 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME) @@ -85,7 +85,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v SET(JAVA_JVM_LIBRARY_DIRECTORIES) FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) -@@ -105,29 +129,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) +@@ -130,29 +154,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) ) ENDFOREACH(dir) @@ -155,7 +155,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}") GET_FILENAME_COMPONENT(jpath "${JAVA_PROG}" PATH) FOREACH(JAVA_INC_PATH ../include ../java/include ../share/java/include) -@@ -200,6 +242,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h +@@ -225,6 +267,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h ${JAVA_INCLUDE_PATH}/win32 ${JAVA_INCLUDE_PATH}/linux ${JAVA_INCLUDE_PATH}/freebsd Index: patches/patch-Modules_FindJava_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules_FindJava_cmake --- patches/patch-Modules_FindJava_cmake 12 Jul 2010 19:19:30 -0000 1.2 +++ patches/patch-Modules_FindJava_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.2 2010/07/12 19:19:30 dcoppa Exp $ ---- Modules/FindJava.cmake.orig Mon Jun 28 17:15:57 2010 -+++ Modules/FindJava.cmake Mon Jul 5 11:23:18 2010 -@@ -51,6 +51,8 @@ - # (To distributed this file outside of CMake, substitute the full +--- Modules/FindJava.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/FindJava.cmake Wed Nov 10 09:01:25 2010 +@@ -54,6 +54,8 @@ + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +SET(MODJAVA_VER $ENV{MODJAVA_VER}) @@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v # The HINTS option should only be used for values computed from the system. SET(_JAVA_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin" -@@ -63,19 +65,29 @@ SET(_JAVA_HINTS +@@ -66,19 +68,29 @@ SET(_JAVA_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" $ENV{JAVA_HOME}/bin ) @@ -53,7 +53,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v FIND_PROGRAM(Java_JAVA_EXECUTABLE NAMES java HINTS ${_JAVA_HINTS} -@@ -103,6 +115,7 @@ IF(Java_JAVA_EXECUTABLE) +@@ -105,6 +117,7 @@ IF(Java_JAVA_EXECUTABLE) # 2. OpenJDK 1.6 # 3. GCJ 1.5 # 4. Kaffe 1.4.2 @@ -61,7 +61,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_]+[oem-]*\".*") # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_]+)[oem-]*\".*" -@@ -110,6 +123,10 @@ IF(Java_JAVA_EXECUTABLE) +@@ -112,6 +125,10 @@ IF(Java_JAVA_EXECUTABLE) ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*") # Kaffe style STRING( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*" Index: patches/patch-Modules_FindMPEG2_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG2_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindMPEG2_cmake --- patches/patch-Modules_FindMPEG2_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindMPEG2_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindMPEG2.cmake.orig Mon Apr 26 11:51:05 2010 -+++ Modules/FindMPEG2.cmake Mon Apr 26 11:52:13 2010 +--- Modules/FindMPEG2.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/FindMPEG2.cmake Wed Nov 10 09:01:25 2010 @@ -21,17 +21,14 @@ # License text for the above reference.) @@ -22,7 +22,7 @@ $OpenBSD: patch-Modules_FindMPEG2_cmake, # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if -@@ -40,8 +37,7 @@ INCLUDE(FindPackageHandleStandardArgs) +@@ -40,8 +37,7 @@ INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleSt FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR) IF(MPEG2_FOUND) Index: patches/patch-Modules_FindMPEG_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG_cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-Modules_FindMPEG_cmake --- patches/patch-Modules_FindMPEG_cmake 12 Jul 2010 19:19:30 -0000 1.2 +++ patches/patch-Modules_FindMPEG_cmake 12 Nov 2010 10:29:41 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindMPEG_cmake,v --- Modules/FindMPEG.cmake.orig Tue Apr 6 16:45:31 2010 +++ Modules/FindMPEG.cmake Mon May 3 11:01:02 2010 @@ -20,25 +20,21 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h @@ -22,7 +22,7 @@ $OpenBSD: patch-Modules_FindMPEG_cmake,v - # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if # all listed variables are TRUE - INCLUDE(FindPackageHandleStandardArgs) + INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY) Index: patches/patch-Modules_FindPythonInterp_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindPythonInterp_cmake --- patches/patch-Modules_FindPythonInterp_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindPythonInterp_cmake 12 Nov 2010 10:29:41 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindPythonInterp --- Modules/FindPythonInterp.cmake.orig Tue Apr 6 16:45:31 2010 +++ Modules/FindPythonInterp.cmake Tue May 11 14:23:03 2010 @@ -19,8 +19,16 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +SET(MODPY_BIN $ENV{MODPY_BIN}) @@ -14,8 +14,8 @@ $OpenBSD: patch-Modules_FindPythonInterp +ENDIF(MODPY_BIN) + 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 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python + NAMES ${_EXECUTABLES} 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] Index: patches/patch-Modules_FindPythonLibs_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindPythonLibs_cmake --- patches/patch-Modules_FindPythonLibs_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindPythonLibs_cmake 12 Nov 2010 10:29:41 -0000 @@ -5,7 +5,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_c # 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) +SET(MODPY_VERSION $ENV{MODPY_VERSION}) +SET(MODPY_INCDIR $ENV{MODPY_INCDIR}) + @@ -19,7 +19,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_c STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) IF(WIN32) FIND_LIBRARY(PYTHON_DEBUG_LIBRARY -@@ -68,14 +77,18 @@ FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1 +@@ -68,14 +77,18 @@ FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2 ENDFOREACH(dir) ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR) Index: patches/patch-Modules_FindQt4_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v retrieving revision 1.8 diff -u -p -r1.8 patch-Modules_FindQt4_cmake --- patches/patch-Modules_FindQt4_cmake 12 Jul 2010 19:19:30 -0000 1.8 +++ patches/patch-Modules_FindQt4_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v 1.8 2010/07/12 19:19:30 dcoppa Exp $ --- Modules/FindQt4.cmake.orig Mon Jun 28 17:15:57 2010 +++ Modules/FindQt4.cmake Mon Jul 5 11:23:18 2010 -@@ -364,13 +364,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE +@@ -461,13 +461,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE # check for qmake # Debian uses qmake-qt4 # macports' Qt uses qmake-mac @@ -29,32 +29,32 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v IF (QT_QMAKE_EXECUTABLE) -@@ -957,6 +964,12 @@ IF (QT4_QMAKE_FOUND) - _QT4_ADJUST_LIB_VARS(QAxServer) +@@ -964,6 +971,12 @@ IF (QT4_QMAKE_FOUND) _QT4_ADJUST_LIB_VARS(QAxContainer) - ENDIF(WIN32) -+ # qt on OpenBSD needs to be linked with -pthread + ENDIF(Q_WS_WIN) + ++ # Qt4 on OpenBSD needs to be linked with -pthread + IF(CMAKE_SYSTEM MATCHES "OpenBSD*") + FIND_PACKAGE(Threads) + SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} + ${CMAKE_THREAD_LIBS_INIT}) + ENDIF(CMAKE_SYSTEM MATCHES "OpenBSD*") - # If Qt is installed as a framework, we need to add QT_QTCORE_LIBRARY here (which - # is the framework directory in that case), since this will make the cmake include_directories() -@@ -991,13 +1004,13 @@ IF (QT4_QMAKE_FOUND) + ####################################### + # +@@ -988,13 +1001,13 @@ IF (QT4_QMAKE_FOUND) ENDIF(QT_QMAKE_CHANGED) FIND_PROGRAM(QT_MOC_EXECUTABLE - NAMES moc-qt4 moc -+ NAMES moc-qt4 moc4 moc ++ NAMES moc4 moc-qt4 moc PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) FIND_PROGRAM(QT_UIC_EXECUTABLE - NAMES uic-qt4 uic -+ NAMES uic-qt4 uic4 uic ++ NAMES uic4 uic-qt4 uic PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) Index: patches/patch-Modules_FindTclsh_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTclsh_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindTclsh_cmake --- patches/patch-Modules_FindTclsh_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindTclsh_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Modules_FindTclsh_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindTclsh.cmake.orig Tue Apr 6 16:45:31 2010 -+++ Modules/FindTclsh.cmake Tue May 11 13:55:06 2010 +--- Modules/FindTclsh.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/FindTclsh.cmake Wed Nov 10 09:01:26 2010 @@ -20,14 +20,21 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +SET(MODTCL_VERSION $ENV{MODTCL_VERSION}) Index: patches/patch-Modules_FindWish_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindWish_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_FindWish_cmake --- patches/patch-Modules_FindWish_cmake 28 May 2010 20:21:48 -0000 1.1 +++ patches/patch-Modules_FindWish_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Modules_FindWish_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $ ---- Modules/FindWish.cmake.orig Tue May 11 13:52:40 2010 -+++ Modules/FindWish.cmake Tue May 11 14:06:27 2010 +--- Modules/FindWish.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/FindWish.cmake Wed Nov 10 09:01:26 2010 @@ -20,14 +20,21 @@ - # (To distributed this file outside of CMake, substitute the full + # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) +SET(MODTCL_VERSION $ENV{MODTCL_VERSION}) Index: patches/patch-Modules_Platform_OpenBSD_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake,v retrieving revision 1.4 diff -u -p -r1.4 patch-Modules_Platform_OpenBSD_cmake --- patches/patch-Modules_Platform_OpenBSD_cmake 12 Jul 2010 19:19:30 -0000 1.4 +++ patches/patch-Modules_Platform_OpenBSD_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.4 2010/07/12 19:19:30 dcoppa Exp $ ---- Modules/Platform/OpenBSD.cmake.orig Mon Jun 28 17:15:57 2010 -+++ Modules/Platform/OpenBSD.cmake Fri Jul 9 16:21:13 2010 +--- Modules/Platform/OpenBSD.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/Platform/OpenBSD.cmake Fri Nov 12 10:04:21 2010 @@ -1,5 +1,24 @@ INCLUDE(Platform/NetBSD) Index: patches/patch-Modules_Qt4Macros_cmake =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Qt4Macros_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-Modules_Qt4Macros_cmake --- patches/patch-Modules_Qt4Macros_cmake 31 May 2010 06:29:28 -0000 1.1 +++ patches/patch-Modules_Qt4Macros_cmake 12 Nov 2010 10:29:41 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-Modules_Qt4Macros_cmake,v 1.1 2010/05/31 06:29:28 dcoppa Exp $ ---- Modules/Qt4Macros.cmake.orig Tue Apr 6 16:45:32 2010 -+++ Modules/Qt4Macros.cmake Sat May 29 14:11:39 2010 -@@ -131,6 +131,8 @@ MACRO (QT4_GENERATE_MOC infile outfile ) - GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE) - QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "") +--- Modules/Qt4Macros.cmake.orig Wed Nov 3 20:58:27 2010 ++++ Modules/Qt4Macros.cmake Wed Nov 10 09:01:26 2010 +@@ -135,6 +135,8 @@ MACRO (QT4_GENERATE_MOC infile outfile ) + ENDIF(NOT IS_ABSOLUTE "${outfile}") + QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "") SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file + + MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile}) ENDMACRO (QT4_GENERATE_MOC) -@@ -210,9 +212,22 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _base +@@ -213,9 +215,22 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _base SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) Index: patches/patch-Source_cmTarget_cxx =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v retrieving revision 1.6 diff -u -p -r1.6 patch-Source_cmTarget_cxx --- patches/patch-Source_cmTarget_cxx 28 Jul 2010 20:34:22 -0000 1.6 +++ patches/patch-Source_cmTarget_cxx 12 Nov 2010 10:29:41 -0000 @@ -1,16 +1,14 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.6 2010/07/28 20:34:22 dcoppa Exp $ ---- Source/cmTarget.cxx.orig Mon Jun 28 17:15:59 2010 -+++ Source/cmTarget.cxx Wed Jul 28 21:12:36 2010 -@@ -3164,6 +3164,36 @@ void cmTarget::GetLibraryNames(std::string& name, +--- Source/cmTarget.cxx.orig Wed Nov 3 20:58:29 2010 ++++ Source/cmTarget.cxx Wed Nov 10 09:01:27 2010 +@@ -3191,6 +3191,34 @@ void cmTarget::GetLibraryNames(std::string& name, std::string suffix; this->GetFullNameInternal(config, false, prefix, base, suffix); +#if defined(__OpenBSD__) + // Override shared library version using LIBxxx_VERSION + // environment variable. Needed for OpenBSD ports system. -+ if(this->GetType() == cmTarget::SHARED_LIBRARY && -+ this->Makefile->GetDefinition(sonameFlag.c_str())) -+ { ++ if(this->GetType() == cmTarget::SHARED_LIBRARY) { + std::string env_name = "LIB" + base + "_VERSION"; + char *env_vers_cstr = getenv(env_name.c_str()); + @@ -38,7 +36,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1. // The library name. name = prefix+base+suffix; -@@ -3191,8 +3221,27 @@ void cmTarget::GetLibraryNames(std::string& name, +@@ -3218,8 +3246,27 @@ void cmTarget::GetLibraryNames(std::string& name, if(version) { realName += "."; Index: patches/patch-Source_kwsys_CMakeLists_txt =================================================================== RCS file: patches/patch-Source_kwsys_CMakeLists_txt diff -N patches/patch-Source_kwsys_CMakeLists_txt --- patches/patch-Source_kwsys_CMakeLists_txt 12 Jul 2010 19:19:30 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-Source_kwsys_CMakeLists_txt,v 1.1 2010/07/12 19:19:30 dcoppa Exp $ ---- Source/kwsys/CMakeLists.txt.orig Mon Jun 28 17:16:00 2010 -+++ Source/kwsys/CMakeLists.txt Mon Jul 5 15:59:27 2010 -@@ -1095,6 +1095,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) - FOREACH(n 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7}) - ADD_TEST(kwsys.testProcess-${n} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n}) - KWSYS_SET_PROPERTY(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST}) -+ SET_TESTS_PROPERTIES(kwsys.testProcess-${n} PROPERTIES TIMEOUT 120) - ENDFOREACH(n) - - # Some Apple compilers produce bad optimizations in this source. -@@ -1122,5 +1123,11 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) - SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES MEASUREMENT "Some Key=Some Value") - MESSAGE(STATUS "GET_TEST_PROPERTY returned: ${wfv}") - ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE) -+ -+ # Suppress known consistent failures on buggy systems. -+ IF(KWSYS_TEST_BOGUS_FAILURES) -+ SET_TESTS_PROPERTIES(${KWSYS_TEST_BOGUS_FAILURES} PROPERTIES WILL_FAIL ON) -+ ENDIF() -+ - ENDIF(BUILD_TESTING) - ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 12 Jul 2010 19:19:31 -0000 1.10 +++ pkg/PLIST 12 Nov 2010 10:29:41 -0000 @@ -72,6 +72,7 @@ share/cmake/Modules/CMakeJavaInformation share/cmake/Modules/CMakeMSYSFindMake.cmake share/cmake/Modules/CMakeMinGWFindMake.cmake share/cmake/Modules/CMakeNMakeFindMake.cmake +share/cmake/Modules/CMakeParseArguments.cmake share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake share/cmake/Modules/CMakePlatformId.h.in share/cmake/Modules/CMakePrintSystemInformation.cmake @@ -242,6 +243,7 @@ share/cmake/Modules/FindKDE3.cmake share/cmake/Modules/FindKDE4.cmake share/cmake/Modules/FindLAPACK.cmake share/cmake/Modules/FindLATEX.cmake +share/cmake/Modules/FindLibArchive.cmake share/cmake/Modules/FindLibIntl.cmake share/cmake/Modules/FindLibXml2.cmake share/cmake/Modules/FindLibXslt.cmake @@ -268,6 +270,7 @@ share/cmake/Modules/FindPerlLibs.cmake share/cmake/Modules/FindPhysFS.cmake share/cmake/Modules/FindPike.cmake share/cmake/Modules/FindPkgConfig.cmake +share/cmake/Modules/FindPostgreSQL.cmake share/cmake/Modules/FindProducer.cmake share/cmake/Modules/FindProtobuf.cmake share/cmake/Modules/FindPythonInterp.cmake @@ -367,6 +370,21 @@ share/cmake/Modules/Platform/AIX.cmake share/cmake/Modules/Platform/BSDOS.cmake share/cmake/Modules/Platform/BeOS.cmake share/cmake/Modules/Platform/BlueGeneL.cmake +share/cmake/Modules/Platform/BlueGeneP-base.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake +share/cmake/Modules/Platform/BlueGeneP-dynamic.cmake +share/cmake/Modules/Platform/BlueGeneP-static-GNU-C.cmake +share/cmake/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake +share/cmake/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake +share/cmake/Modules/Platform/BlueGeneP-static-XL-C.cmake +share/cmake/Modules/Platform/BlueGeneP-static-XL-CXX.cmake +share/cmake/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake +share/cmake/Modules/Platform/BlueGeneP-static.cmake share/cmake/Modules/Platform/CYGWIN-GNU-C.cmake share/cmake/Modules/Platform/CYGWIN-GNU-CXX.cmake share/cmake/Modules/Platform/CYGWIN-GNU-Fortran.cmake
