cmake-2.8.11

classic Classic list List threaded Threaded
10 messages Options
Reply | Threaded
Open this post in threaded view
|

cmake-2.8.11

David Coppa

Hi all!

Here's the update to cmake-2.8.11.

A bulk-build test would be cool...

Cheers,
David

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.81
diff -u -p -u -p -r1.81 Makefile
--- Makefile 30 May 2013 08:34:32 -0000 1.81
+++ Makefile 30 May 2013 12:26:00 -0000
@@ -11,8 +11,7 @@ CFLAGS += -O1 -fno-stack-protector
 HOMEPAGE = http://www.cmake.org/
 CATEGORIES = devel
 COMMENT = portable build system
-DISTNAME = cmake-2.8.10.2
-REVISION = 6
+DISTNAME = cmake-2.8.11
 MASTER_SITES = ${HOMEPAGE}files/v2.8/
 
 MAINTAINER = David Coppa <[hidden email]>
@@ -47,17 +46,14 @@ MAKE_FLAGS += VERBOSE=1
 pre-configure:
  cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
  ${SUBST_CMD} ${WRKSRC}/Modules/CMakeDetermineJavaCompiler.cmake \
- ${WRKSRC}/Modules/FindFreetype.cmake \
  ${WRKSRC}/Modules/FindJNI.cmake \
  ${WRKSRC}/Modules/FindJava.cmake \
  ${WRKSRC}/Modules/FindLuaLibs.cmake \
  ${WRKSRC}/Modules/FindMPEG.cmake \
  ${WRKSRC}/Modules/FindMPEG2.cmake \
  ${WRKSRC}/Modules/FindQt.cmake \
- ${WRKSRC}/Modules/FindQt3.cmake \
  ${WRKSRC}/Modules/FindQt4.cmake \
- ${WRKSRC}/Modules/FindSDL.cmake \
- ${WRKSRC}/Modules/FindTCL.cmake
+ ${WRKSRC}/Modules/FindSDL.cmake
 
 post-install:
  rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- distinfo 5 Dec 2012 11:32:04 -0000 1.19
+++ distinfo 30 May 2013 12:26:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-2.8.10.2.tar.gz) = zlJPs52gbubUdTS7zsbgtQQi4Ytiq8R4GkunLqKRDrE=
-SIZE (cmake-2.8.10.2.tar.gz) = 5768373
+SHA256 (cmake-2.8.11.tar.gz) = INDTZheX+oLBnnp1xzFcZA4AHLMjgzHKFwuw+uJ/7uU=
+SIZE (cmake-2.8.11.tar.gz) = 5883643
Index: files/FindLCMS.cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/files/FindLCMS.cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 FindLCMS.cmake
--- files/FindLCMS.cmake 13 Mar 2011 18:23:02 -0000 1.1
+++ files/FindLCMS.cmake 30 May 2013 12:26:00 -0000
@@ -39,7 +39,7 @@ find_library(LCMS_LIBRARIES NAMES lcms l
    PATH_SUFFIXES lcms
 )
 
-# Store the LCMS version number in the cache, so we don't have to search everytime again
+# Store the LCMS version number in the cache, so we don't have to search every time again
 if(LCMS_INCLUDE_DIR  AND NOT  LCMS_VERSION)
    file(READ ${LCMS_INCLUDE_DIR}/lcms.h LCMS_VERSION_CONTENT)
    string(REGEX MATCH "#define LCMS_VERSION[ ]*[0-9]*\n" LCMS_VERSION_MATCH ${LCMS_VERSION_CONTENT})
Index: patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_CMakeDetermineJavaCompiler_cmake
--- patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 5 Dec 2012 11:32:04 -0000 1.6
+++ patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 30 May 2013 12:26:00 -0000
@@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
  if(NOT CMAKE_Java_COMPILER)
    # prefer the environment variable CC
    if($ENV{JAVA_COMPILER} MATCHES ".+")
-@@ -42,28 +44,43 @@ if(NOT CMAKE_Java_COMPILER)
+@@ -42,30 +44,43 @@ if(NOT CMAKE_Java_COMPILER)
      endif()
    endif()
 
@@ -35,6 +35,8 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
 -    /usr/java/j2sdk1.4.2_09/bin
 -    /usr/lib/j2sdk1.5-sun/bin
 -    /opt/sun-jdk-1.5.0.04/bin
+-    /usr/local/jdk-1.7.0/bin
+-    /usr/local/jdk-1.6.0/bin
 -    )
 +  if(MODJAVA_VER)
 +    if(MODJAVA_VER MATCHES "^1\\.6$")
@@ -69,8 +71,8 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
 +      /usr/java/j2sdk1.4.2_09/bin
 +      /usr/lib/j2sdk1.5-sun/bin
 +      /opt/sun-jdk-1.5.0.04/bin
-+      ${LOCALBASE}/jdk-1.7.0/bin
-+      ${LOCALBASE}/jdk-1.6.0/bin
++      /usr/local/jdk-1.7.0/bin
++      /usr/local/jdk-1.6.0/bin
 +      )
 +  endif(MODJAVA_VER)
    # if no compiler has been specified yet, then look for one
Index: patches/patch-Modules_FindFreetype_cmake
===================================================================
RCS file: patches/patch-Modules_FindFreetype_cmake
diff -N patches/patch-Modules_FindFreetype_cmake
--- patches/patch-Modules_FindFreetype_cmake 15 Nov 2012 08:43:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-Modules_FindFreetype_cmake,v 1.2 2012/11/15 08:43:25 dcoppa Exp $
-
-Unbreak
-
---- Modules/FindFreetype.cmake.orig Tue Nov  6 20:41:36 2012
-+++ Modules/FindFreetype.cmake Mon Nov 12 13:59:46 2012
-@@ -46,6 +46,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
-   HINTS
-     ENV FREETYPE_DIR
-   PATHS
-+    ${X11BASE}
-     /usr/local/X11R6
-     /usr/local/X11
-     /usr/freeware
-@@ -56,6 +57,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/conf
-   HINTS
-     ENV FREETYPE_DIR
-   PATHS
-+    ${X11BASE}
-     /usr/local/X11R6
-     /usr/local/X11
-     /usr/freeware
-@@ -68,6 +70,7 @@ find_library(FREETYPE_LIBRARY
-     ENV FREETYPE_DIR
-   PATH_SUFFIXES lib
-   PATHS
-+  ${X11BASE}
-   /usr/local/X11R6
-   /usr/local/X11
-   /usr/freeware
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 5 Dec 2012 11:32:04 -0000 1.8
+++ patches/patch-Modules_FindJNI_cmake 30 May 2013 12:26:01 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Modules_FindJNI_cmake,v 1.8 2012/12/05 11:32:04 dcoppa Exp $
---- Modules/FindJNI.cmake.orig Tue Nov 27 14:26:32 2012
-+++ Modules/FindJNI.cmake Wed Dec  5 10:18:21 2012
+--- Modules/FindJNI.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindJNI.cmake Tue May 28 20:02:18 2013
 @@ -26,6 +26,8 @@
  # (To distribute this file outside of CMake, substitute the full
  #  License text for the above reference.)
@@ -23,7 +23,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
      endif()
 
      # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -88,39 +92,64 @@ endmacro()
+@@ -88,44 +92,64 @@ endmacro()
  get_filename_component(java_install_version
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
 
@@ -59,6 +59,11 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
 -  /usr/lib/jvm/default-java/jre/lib/{libarch}
 -  /usr/lib/jvm/default-java/jre/lib
 -  /usr/lib/jvm/default-java/lib
+-  # OpenBSD specific paths for default JVM
+-  /usr/local/jdk-1.7.0/jre/lib/{libarch}
+-  /usr/local/jre-1.7.0/lib/{libarch}
+-  /usr/local/jdk-1.6.0/jre/lib/{libarch}
+-  /usr/local/jre-1.6.0/lib/{libarch}
 -  )
 +if(MODJAVA_VER)
 +  if(MODJAVA_VER MATCHES "^1\\.6$")
@@ -110,19 +115,44 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
 +    /usr/lib/jvm/default-java/jre/lib
 +    /usr/lib/jvm/default-java/lib
 +    # OpenBSD specific paths for default JVM
-+    ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
-+    ${LOCALBASE}/jre-1.7.0/lib/{libarch}
-+    ${LOCALBASE}/jdk-1.6.0/jre/lib/{libarch}
-+    ${LOCALBASE}/jre-1.6.0/lib/{libarch}
++    /usr/local/jdk-1.7.0/jre/lib/{libarch}
++    /usr/local/jre-1.7.0/lib/{libarch}
++    /usr/local/jdk-1.6.0/jre/lib/{libarch}
++    /usr/local/jre-1.6.0/lib/{libarch}
 +    )
 +endif(MODJAVA_VER)
 
  set(JAVA_JVM_LIBRARY_DIRECTORIES)
  foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -132,29 +161,48 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+@@ -137,31 +161,47 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
      )
  endforeach()
 
+-
+-set(JAVA_AWT_INCLUDE_DIRECTORIES
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+-  ${_JAVA_HOME}/include
+-  /usr/include
+-  /usr/local/include
+-  /usr/lib/java/include
+-  /usr/local/lib/java/include
+-  /usr/lib/jvm/java/include
+-  /usr/lib/jvm/java-6-sun/include
+-  /usr/lib/jvm/java-1.5.0-sun/include
+-  /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
+-  /usr/lib/jvm/java-6-openjdk/include
+-  /usr/local/share/java/include
+-  /usr/lib/j2sdk1.4-sun/include
+-  /usr/lib/j2sdk1.5-sun/include
+-  /opt/sun-jdk-1.5.0.04/include
+-  # Debian specific path for default JVM
+-  /usr/lib/jvm/default-java/include
+-  # OpenBSD specific path for default JVM
+-  /usr/local/jdk-1.7.0/include
+-  /usr/local/jdk-1.6.0/include
+-  )
 +if(MODJAVA_VER)
 +  if(MODJAVA_VER MATCHES "^1\\.6$")
 +    set(JAVA_AWT_INCLUDE_DIRECTORIES
@@ -160,41 +190,10 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
 +    # Debian specific path for default JVM
 +    /usr/lib/jvm/default-java/include
 +    # OpenBSD specific path for default JVM
-+    ${LOCALBASE}/jdk-1.7.0/include
-+    ${LOCALBASE}/jdk-1.6.0/include
++    /usr/local/jdk-1.7.0/include
++    /usr/local/jdk-1.6.0/include
 +    )
 +endif(MODJAVA_VER)
 
--set(JAVA_AWT_INCLUDE_DIRECTORIES
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
--  ${_JAVA_HOME}/include
--  /usr/include
--  /usr/local/include
--  /usr/lib/java/include
--  /usr/local/lib/java/include
--  /usr/lib/jvm/java/include
--  /usr/lib/jvm/java-6-sun/include
--  /usr/lib/jvm/java-1.5.0-sun/include
--  /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
--  /usr/lib/jvm/java-6-openjdk/include
--  /usr/local/share/java/include
--  /usr/lib/j2sdk1.4-sun/include
--  /usr/lib/j2sdk1.5-sun/include
--  /opt/sun-jdk-1.5.0.04/include
--  # Debian specific path for default JVM
--  /usr/lib/jvm/default-java/include
--  )
--
  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)
-@@ -227,6 +275,7 @@ find_path(JAVA_INCLUDE_PATH2 jni_md.h
-   ${JAVA_INCLUDE_PATH}/win32
-   ${JAVA_INCLUDE_PATH}/linux
-   ${JAVA_INCLUDE_PATH}/freebsd
-+  ${JAVA_INCLUDE_PATH}/openbsd
-   ${JAVA_INCLUDE_PATH}/solaris
-   ${JAVA_INCLUDE_PATH}/hp-ux
-   ${JAVA_INCLUDE_PATH}/alpha
Index: patches/patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Modules_FindJava_cmake
--- patches/patch-Modules_FindJava_cmake 5 Dec 2012 11:32:04 -0000 1.10
+++ patches/patch-Modules_FindJava_cmake 30 May 2013 12:26:01 -0000
@@ -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"
-@@ -70,17 +72,32 @@ set(_JAVA_HINTS
+@@ -70,19 +72,32 @@ set(_JAVA_HINTS
    )
  # Hard-coded guesses should still go in PATHS. This ensures that the user
  # environment can always override hard guesses.
@@ -24,6 +24,8 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
 -  /usr/java/j2sdk1.4.2_09/bin
 -  /usr/lib/j2sdk1.5-sun/bin
 -  /opt/sun-jdk-1.5.0.04/bin
+-  /usr/local/jdk-1.7.0/bin
+-  /usr/local/jdk-1.6.0/bin
 -  )
 +if(MODJAVA_VER)
 +  if(MODJAVA_VER MATCHES "^1\\.6$")
@@ -47,29 +49,10 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
 +    /usr/java/j2sdk1.4.2_09/bin
 +    /usr/lib/j2sdk1.5-sun/bin
 +    /opt/sun-jdk-1.5.0.04/bin
-+    ${LOCALBASE}/jdk-1.7.0/bin
-+    ${LOCALBASE}/jdk-1.6.0/bin
++    /usr/local/jdk-1.7.0/bin
++    /usr/local/jdk-1.6.0/bin
 +    )
 +endif(MODJAVA_VER)
  find_program(Java_JAVA_EXECUTABLE
    NAMES java
    HINTS ${_JAVA_HINTS}
-@@ -107,6 +124,7 @@ if(Java_JAVA_EXECUTABLE)
-       # 2. OpenJDK 1.6
-       # 3. GCJ 1.5
-       # 4. Kaffe 1.4.2
-+      # 5. OpenJDK 1.7.x on OpenBSD
-       if(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
-         # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
-         string( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\".*"
-@@ -114,6 +132,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_]+).*"
-+                "\\1" Java_VERSION_STRING "${var}" )
-+      elseif(var MATCHES "openjdk version \"[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
-+        # OpenJDK ver 1.7.x on OpenBSD
-+        string( REGEX REPLACE "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+).*"
-                 "\\1" Java_VERSION_STRING "${var}" )
-       else()
-         if(NOT Java_FIND_QUIETLY)
Index: patches/patch-Modules_FindLua51_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindLua51_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_FindLua51_cmake
--- patches/patch-Modules_FindLua51_cmake 30 May 2013 08:34:32 -0000 1.5
+++ patches/patch-Modules_FindLua51_cmake 30 May 2013 12:26:01 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-Modules_FindLua51_cmake,
  find_path(LUA_INCLUDE_DIR lua.h
    HINTS
      ENV LUA_DIR
--  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
+-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
 +  PATH_SUFFIXES include/lua-5.1 include/lua51 include/lua5.1 include/lua include
    PATHS
    ~/Library/Frameworks
Index: patches/patch-Modules_FindPackageHandleStandardArgs_cmake
===================================================================
RCS file: patches/patch-Modules_FindPackageHandleStandardArgs_cmake
diff -N patches/patch-Modules_FindPackageHandleStandardArgs_cmake
--- patches/patch-Modules_FindPackageHandleStandardArgs_cmake 5 Dec 2012 11:32:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Modules_FindPackageHandleStandardArgs_cmake,v 1.1 2012/12/05 11:32:04 dcoppa Exp $
-
-FPHSA: don't succeed if only checking for XX_FOUND.
-
-FPHSA(XX DEFAULT_MSG XX_FOUND) always succeeded due to the way how
-the XX_FOUND variable was set.
-It was preset to TRUE, and then reset to FALSE if something was
-missing (which had the effect that XX_FOUND itself was already
-preset when FPHSA checked whether XX_FOUND is set).
-Now XX_FOUND is unset first, and only later on set to TRUE.
-
-From upstream git commit 4809cadfe82316b648de50471169b4da9ef101e2
-
---- Modules/FindPackageHandleStandardArgs.cmake.orig Wed Dec  5 10:24:42 2012
-+++ Modules/FindPackageHandleStandardArgs.cmake Wed Dec  5 10:29:50 2012
-@@ -187,8 +187,8 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRS
-   # user knows better what went wrong (#6375)
-   set(MISSING_VARS "")
-   set(DETAILS "")
--  set(${_NAME_UPPER}_FOUND TRUE)
-   # check if all passed variables are valid
-+  unset(${_NAME_UPPER}_FOUND)
-   foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
-     if(NOT ${_CURRENT_VAR})
-       set(${_NAME_UPPER}_FOUND FALSE)
-@@ -197,6 +197,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRS
-       set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
-     endif()
-   endforeach()
-+  if(NOT "${${_NAME_UPPER}_FOUND}" STREQUAL "FALSE")
-+    set(${_NAME_UPPER}_FOUND TRUE)
-+  endif()
-
-   # component handling
-   unset(FOUND_COMPONENTS_MSG)
Index: patches/patch-Modules_FindPythonLibs_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_FindPythonLibs_cmake
--- patches/patch-Modules_FindPythonLibs_cmake 11 Nov 2012 17:13:31 -0000 1.7
+++ patches/patch-Modules_FindPythonLibs_cmake 30 May 2013 12:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.7 2012/11/11 17:13:31 dcoppa Exp $
---- Modules/FindPythonLibs.cmake.orig Fri Nov  2 10:56:12 2012
-+++ Modules/FindPythonLibs.cmake Fri Nov  2 11:04:28 2012
-@@ -36,6 +36,9 @@ include(CMakeFindFrameworks)
+--- Modules/FindPythonLibs.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindPythonLibs.cmake Tue May 28 20:02:18 2013
+@@ -36,6 +36,9 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
  # Search for the python framework on Apple.
  CMAKE_FIND_FRAMEWORKS(Python)
 
Index: patches/patch-Modules_FindQt3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt3_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 6 Dec 2012 15:11:07 -0000 1.5
+++ patches/patch-Modules_FindQt3_cmake 30 May 2013 12:26:01 -0000
@@ -1,36 +1,20 @@
 $OpenBSD: patch-Modules_FindQt3_cmake,v 1.5 2012/12/06 15:11:07 dcoppa Exp $
---- Modules/FindQt3.cmake.orig Tue Nov 27 14:26:32 2012
-+++ Modules/FindQt3.cmake Thu Dec  6 16:45:54 2012
-@@ -64,6 +64,7 @@ find_path(QT_INCLUDE_DIR qt.h
-   /usr/share/qt3/include
-   C:/Progra~1/qt/include
-   /usr/include/qt3
-+  ${LOCALBASE}/include/X11/qt3
-   )
-
- # if qglobal.h is not in the qt_include_dir then set
-@@ -146,7 +147,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
+--- Modules/FindQt3.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindQt3.cmake Wed May 29 08:01:17 2013
+@@ -147,7 +147,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
 
  # Qt 3 should prefer QTDIR over the PATH
  find_program(QT_MOC_EXECUTABLE
--  NAMES moc-qt3 moc
+-  NAMES moc-qt3 moc moc3 moc3-mt
 +  NAMES moc3 moc3-mt moc-qt3 moc
    HINTS
      ENV QTDIR
    PATHS
-@@ -154,6 +155,7 @@ find_program(QT_MOC_EXECUTABLE
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
-   ${GLOB_PATHS_BIN}
-+    ${LOCALBASE}/lib/qt3
-     /usr/local/qt
-     /usr/lib/qt
-     /usr/lib/qt3
-@@ -170,7 +172,7 @@ endif()
+@@ -172,7 +172,7 @@ endif()
 
  # Qt 3 should prefer QTDIR over the PATH
  find_program(QT_UIC_EXECUTABLE
--  NAMES uic-qt3 uic
+-  NAMES uic-qt3 uic uic3 uic3-mt
 +  NAMES uic3 uic3-mt uic-qt3 uic
    HINTS
      ENV QTDIR
Index: patches/patch-Modules_FindQt4_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 30 May 2013 08:34:32 -0000 1.18
+++ patches/patch-Modules_FindQt4_cmake 30 May 2013 12:26:01 -0000
@@ -1,88 +1,73 @@
 $OpenBSD: patch-Modules_FindQt4_cmake,v 1.18 2013/05/30 08:34:32 dcoppa Exp $
---- Modules/FindQt4.cmake.orig Tue Nov 27 14:26:32 2012
-+++ Modules/FindQt4.cmake Wed May 29 13:42:26 2013
-@@ -497,13 +497,22 @@ get_filename_component(qt_install_version "[HKEY_CURRE
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
--  PATHS
--    ENV QTDIR
--    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
--  PATH_SUFFIXES bin
--  DOC "The qmake executable for the Qt installation to use"
--)
+--- Modules/FindQt4.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindQt4.cmake Thu May 30 12:15:49 2013
+@@ -569,7 +569,12 @@ endfunction()
+
+ set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
+
+-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
 +if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+  find_program(QT_QMAKE_EXECUTABLE NAMES qmake4
-+    PATHS
-+      ENV QTDIR
-+    PATH_SUFFIXES bin
-+    DOC "The qmake executable for the Qt installation to use"
-+  )
++  set(_QT4_QMAKE_NAMES qmake4)
 +else()
-+  find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
-+    PATHS
-+      ENV QTDIR
-+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
-+    PATH_SUFFIXES bin
-+    DOC "The qmake executable for the Qt installation to use"
-+  )
++  set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
 +endif()
++
+ _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
 
- # double check that it was a Qt4 qmake, if not, re-find with different names
- if (QT_QMAKE_EXECUTABLE)
-@@ -678,6 +687,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+@@ -727,6 +732,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
    # Set QT_INCLUDES
    set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
++  # Help QtOpenGL find GL/gl.h
 +  list(APPEND QT_INCLUDES "${X11BASE}/include")
 
 
    # ask qmake for the documentation directory
-@@ -982,13 +992,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+@@ -1139,13 +1146,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
    endif()
 
    find_program(QT_MOC_EXECUTABLE
--    NAMES moc-qt4 moc
+-    NAMES moc-qt4 moc moc4
 +    NAMES moc4 moc-qt4 moc
      PATHS ${QT_BINARY_DIR}
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
 
    find_program(QT_UIC_EXECUTABLE
--    NAMES uic-qt4 uic
+-    NAMES uic-qt4 uic uic4
 +    NAMES uic4 uic-qt4 uic
      PATHS ${QT_BINARY_DIR}
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
-@@ -1018,13 +1028,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+@@ -1175,13 +1182,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
      )
 
    find_program(QT_LUPDATE_EXECUTABLE
--    NAMES lupdate-qt4 lupdate
+-    NAMES lupdate-qt4 lupdate lupdate4
 +    NAMES lupdate4 lupdate-qt4 lupdate
      PATHS ${QT_BINARY_DIR}
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
 
    find_program(QT_LRELEASE_EXECUTABLE
--    NAMES lrelease-qt4 lrelease
+-    NAMES lrelease-qt4 lrelease lrelease4
 +    NAMES lrelease4 lrelease-qt4 lrelease
      PATHS ${QT_BINARY_DIR}
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
-@@ -1036,13 +1046,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+@@ -1193,13 +1200,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
      )
 
    find_program(QT_DESIGNER_EXECUTABLE
--    NAMES designer-qt4 designer
+-    NAMES designer-qt4 designer designer4
 +    NAMES designer4 designer-qt4 designer
      PATHS ${QT_BINARY_DIR}
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
      )
 
    find_program(QT_LINGUIST_EXECUTABLE
--    NAMES linguist-qt4 linguist
+-    NAMES linguist-qt4 linguist linguist4
 +    NAMES linguist4 linguist-qt4 linguist
      PATHS ${QT_BINARY_DIR}
      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
Index: patches/patch-Modules_FindQt_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Modules_FindQt_cmake
--- patches/patch-Modules_FindQt_cmake 15 Nov 2012 08:43:25 -0000 1.3
+++ patches/patch-Modules_FindQt_cmake 30 May 2013 12:26:01 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Modules_FindQt_cmake,v 1.3 2012/11/15 08:43:25 dcoppa Exp $
---- Modules/FindQt.cmake.orig Tue Nov  6 20:41:36 2012
-+++ Modules/FindQt.cmake Mon Nov 12 14:03:53 2012
+--- Modules/FindQt.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindQt.cmake Tue May 28 21:05:47 2013
 @@ -31,6 +31,12 @@
  #  License text for the above reference.)
 
@@ -11,10 +11,10 @@ $OpenBSD: patch-Modules_FindQt_cmake,v 1
 +endif()
 +set(GLOB_TEMP_VAR)
 +
- file(GLOB GLOB_TEMP_VAR /usr/lib/qt-3*/bin/qmake)
+ file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake)
  if(GLOB_TEMP_VAR)
    set(QT3_INSTALLED TRUE)
-@@ -44,6 +50,12 @@ endif()
+@@ -50,6 +56,12 @@ endif()
  set(GLOB_TEMP_VAR)
 
  # look for qt4 installations
@@ -27,19 +27,3 @@ $OpenBSD: patch-Modules_FindQt_cmake,v 1
  file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake)
  if(GLOB_TEMP_VAR)
    set(QT4_INSTALLED TRUE)
-@@ -82,6 +94,7 @@ find_file( QT4_QGLOBAL_H_FILE qglobal.h
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
-   ${qt_headers}/Qt
-   $ENV{QTDIR}/include/Qt
-+  ${LOCALBASE}/include/X11/qt4/Qt
-   /usr/local/qt/include/Qt
-   /usr/local/include/Qt
-   /usr/lib/qt/include/Qt
-@@ -100,6 +113,7 @@ find_file( QT3_QGLOBAL_H_FILE qglobal.h
-   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
-   C:/Qt/3.3.3Educational/include
-   $ENV{QTDIR}/include
-+  ${LOCALBASE}/include/X11/qt3
-   /usr/include/qt3/Qt
-   /usr/local/qt/include
-   /usr/local/include
Index: patches/patch-Modules_FindRuby_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindRuby_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindRuby_cmake
--- patches/patch-Modules_FindRuby_cmake 22 Apr 2013 13:13:56 -0000 1.6
+++ patches/patch-Modules_FindRuby_cmake 30 May 2013 12:26:01 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-Modules_FindRuby_cmake,v 1.6 2013/04/22 13:13:56 zhuk Exp $
 Add support for rubyarchhdrdir and rubyarchlibdir, with fallback to "defaults"
 on systems that have such directories but RbConfig doesn't have such options.
---- Modules/FindRuby.cmake.orig Sun Feb 10 13:39:18 2013
-+++ Modules/FindRuby.cmake Sun Feb 10 14:15:07 2013
-@@ -92,6 +92,16 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
+--- Modules/FindRuby.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindRuby.cmake Tue May 28 20:02:18 2013
+@@ -101,6 +101,16 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
     _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
     _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
 
@@ -20,7 +20,7 @@ on systems that have such directories bu
     # vendor_ruby available ?
     execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
        OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
-@@ -112,6 +122,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
+@@ -121,6 +131,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
     set(RUBY_SITEARCH_DIR     ${RUBY_SITEARCH_DIR}     CACHE PATH "The Ruby site arch dir" FORCE)
     set(RUBY_SITELIB_DIR      ${RUBY_SITELIB_DIR}      CACHE PATH "The Ruby site lib dir" FORCE)
     set(RUBY_HAS_VENDOR_RUBY  ${RUBY_HAS_VENDOR_RUBY}  CACHE BOOL "Vendor Ruby is available" FORCE)
@@ -29,7 +29,7 @@ on systems that have such directories bu
     set(RUBY_VENDORARCH_DIR   ${RUBY_VENDORARCH_DIR}   CACHE PATH "The Ruby vendor arch dir" FORCE)
     set(RUBY_VENDORLIB_DIR    ${RUBY_VENDORLIB_DIR}    CACHE PATH "The Ruby vendor lib dir" FORCE)
 
-@@ -124,6 +136,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
+@@ -133,6 +145,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
       RUBY_SITEARCH_DIR
       RUBY_SITELIB_DIR
       RUBY_HAS_VENDOR_RUBY
@@ -38,7 +38,7 @@ on systems that have such directories bu
       RUBY_VENDORARCH_DIR
       RUBY_VENDORLIB_DIR
       RUBY_VERSION_MAJOR
-@@ -157,6 +171,7 @@ find_path(RUBY_INCLUDE_DIR
+@@ -166,6 +180,7 @@ find_path(RUBY_INCLUDE_DIR
     NAMES ruby.h
     HINTS
     ${RUBY_HDR_DIR}
@@ -46,7 +46,7 @@ on systems that have such directories bu
     ${RUBY_ARCH_DIR}
     /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
 
-@@ -167,6 +182,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18  OR
+@@ -176,6 +191,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18  OR
     find_path(RUBY_CONFIG_INCLUDE_DIR
       NAMES ruby/config.h  config.h
       HINTS
Index: patches/patch-Modules_FindTCL_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTCL_cmake,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Modules_FindTCL_cmake
--- patches/patch-Modules_FindTCL_cmake 30 May 2013 08:34:32 -0000 1.8
+++ patches/patch-Modules_FindTCL_cmake 30 May 2013 12:26:01 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-Modules_FindTCL_cmake,v 1.8 2013/05/30 08:34:32 dcoppa Exp $
---- Modules/FindTCL.cmake.orig Tue Nov 27 14:26:32 2012
-+++ Modules/FindTCL.cmake Wed May 29 13:16:33 2013
-@@ -48,19 +48,36 @@ include(CMakeFindFrameworks)
- include(FindTclsh)
- include(FindWish)
+--- Modules/FindTCL.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindTCL.cmake Wed May 29 09:29:16 2013
+@@ -48,19 +48,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
+ include(${CMAKE_CURRENT_LIST_DIR}/FindTclsh.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/FindWish.cmake)
 
 +set(MODTCL_VERSION $ENV{MODTCL_VERSION})
 +set(MODTK_VERSION $ENV{MODTK_VERSION})
@@ -42,7 +42,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
 
  get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
  get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -75,15 +92,35 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -75,19 +92,35 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
  string(REGEX REPLACE
    "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
 
@@ -53,6 +53,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
 -  "${TK_LIBRARY_PATH}"
 -  "${TCL_TCLSH_PATH_PARENT}/lib"
 -  "${TK_WISH_PATH_PARENT}/lib"
+-  /usr/local/lib/tcl/tcl8.5
+-  /usr/local/lib/tcl/tk8.5
+-  /usr/local/lib/tcl/tcl8.4
+-  /usr/local/lib/tcl/tk8.4
 -  )
 +set(TCLTK_OPENBSD_LIB_PATHS)
 
@@ -76,17 +80,17 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
 +    "${TK_LIBRARY_PATH}"
 +    "${TCL_TCLSH_PATH_PARENT}/lib"
 +    "${TK_WISH_PATH_PARENT}/lib"
-+    ${LOCALBASE}/lib/tcl/tcl8.5
-+    ${LOCALBASE}/lib/tcl/tk8.5
-+    ${LOCALBASE}/lib/tcl/tcl8.4
-+    ${LOCALBASE}/lib/tcl/tk8.4
++    /usr/local/lib/tcl/tcl8.5
++    /usr/local/lib/tcl/tk8.5
++    /usr/local/lib/tcl/tcl8.4
++    /usr/local/lib/tcl/tk8.4
 +    )
 +endif()
 +
  if(WIN32)
    get_filename_component(
      ActiveTcl_CurrentVersion
-@@ -103,31 +140,47 @@ if(WIN32)
+@@ -107,31 +140,47 @@ if(WIN32)
      )
  endif()
 
@@ -158,7 +162,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
 
  CMAKE_FIND_FRAMEWORKS(Tcl)
  CMAKE_FIND_FRAMEWORKS(Tk)
-@@ -151,24 +204,44 @@ if(Tk_FRAMEWORKS)
+@@ -155,28 +204,44 @@ if(Tk_FRAMEWORKS)
    endif()
  endif()
 
@@ -179,6 +183,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
 -  /usr/include/tcl8.3
 -  /usr/include/tcl8.2
 -  /usr/include/tcl8.0
+-  /usr/local/include/tcl8.5
+-  /usr/local/include/tk8.5
+-  /usr/local/include/tcl8.4
+-  /usr/local/include/tk8.4
 -  )
 +set(TCLTK_OPENBSD_INCLUDE_PATHS)
 +
@@ -212,10 +220,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
 +    /usr/include/tcl8.3
 +    /usr/include/tcl8.2
 +    /usr/include/tcl8.0
-+    ${LOCALBASE}/include/tcl8.5
-+    ${LOCALBASE}/include/tk8.5
-+    ${LOCALBASE}/include/tcl8.4
-+    ${LOCALBASE}/include/tk8.4
++    /usr/local/include/tcl8.5
++    /usr/local/include/tk8.5
++    /usr/local/include/tcl8.4
++    /usr/local/include/tk8.4
 +    )
 +endif()
 
Index: patches/patch-Modules_FindTclStub_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTclStub_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Modules_FindTclStub_cmake
--- patches/patch-Modules_FindTclStub_cmake 11 Nov 2012 17:13:32 -0000 1.3
+++ patches/patch-Modules_FindTclStub_cmake 30 May 2013 12:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Modules_FindTclStub_cmake,v 1.3 2012/11/11 17:13:32 dcoppa Exp $
---- Modules/FindTclStub.cmake.orig Fri Nov  2 14:05:49 2012
-+++ Modules/FindTclStub.cmake Fri Nov  2 14:10:45 2012
-@@ -38,13 +38,21 @@ include(FindTCL)
+--- Modules/FindTclStub.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/FindTclStub.cmake Tue May 28 20:02:18 2013
+@@ -38,13 +38,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
 
  get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
  get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
Index: patches/patch-Modules_Platform_OpenBSD_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Modules_Platform_OpenBSD_cmake
--- patches/patch-Modules_Platform_OpenBSD_cmake 30 May 2013 08:34:32 -0000 1.10
+++ patches/patch-Modules_Platform_OpenBSD_cmake 30 May 2013 12:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.10 2013/05/30 08:34:32 dcoppa Exp $
---- Modules/Platform/OpenBSD.cmake.orig Tue Nov 27 14:26:32 2012
-+++ Modules/Platform/OpenBSD.cmake Wed May 29 14:39:43 2013
-@@ -1,5 +1,16 @@
+--- Modules/Platform/OpenBSD.cmake.orig Wed May 15 19:38:12 2013
++++ Modules/Platform/OpenBSD.cmake Thu May 30 11:06:11 2013
+@@ -1,4 +1,15 @@
 -include(Platform/NetBSD)
 +set(CMAKE_DL_LIBS "")
 +set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
@@ -13,17 +13,8 @@ $OpenBSD: patch-Modules_Platform_OpenBSD
 +set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
 +set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
 +set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-
-+include(Platform/UnixPaths)
 +
++include(Platform/UnixPaths)
+
  # On OpenBSD, the compile time linker does not share it's configuration with
  # the runtime linker.  This will extract the library search paths from the
- # system's ld.so.hints file which will allow CMake to set the appropriate
-@@ -16,3 +27,7 @@ if(NOT CMAKE_PLATFORM_RUNTIME_PATH)
- endif()
-
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_OPENBSD_VERSIONING 1)
-+
-+# OpenBSD policy requires that shared libraries be installed without
-+# executable permission.
-+set(CMAKE_INSTALL_SO_NO_EXE 1)
Index: patches/patch-Source_CPack_cmCPackGenerator_cxx
===================================================================
RCS file: patches/patch-Source_CPack_cmCPackGenerator_cxx
diff -N patches/patch-Source_CPack_cmCPackGenerator_cxx
--- patches/patch-Source_CPack_cmCPackGenerator_cxx 15 Nov 2012 12:29:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-Source_CPack_cmCPackGenerator_cxx,v 1.1 2012/11/15 12:29:08 dcoppa Exp $
-
-Fix typo
-(upstream git commit 572d9e1e057e64ae9eccda5db8b08c3164a34bc4)
-
---- Source/CPack/cmCPackGenerator.cxx.orig Thu Nov 15 13:02:31 2012
-+++ Source/CPack/cmCPackGenerator.cxx Thu Nov 15 13:03:11 2012
-@@ -208,7 +208,7 @@ int cmCPackGenerator::InstallProject()
-     {
-     cmCPackLogger(cmCPackLog::LOG_ERROR,
-       "Problem creating temporary directory: "
--                  << (tempInstallDirectory ? tempInstallDirectory : "(NULL}")
-+                  << (tempInstallDirectory ? tempInstallDirectory : "(NULL)")
-                   << std::endl);
-     return 0;
-     }
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Source_cmComputeLinkInformation_cxx
--- patches/patch-Source_cmComputeLinkInformation_cxx 8 Oct 2012 07:23:09 -0000 1.5
+++ patches/patch-Source_cmComputeLinkInformation_cxx 30 May 2013 12:26:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.5 2012/10/08 07:23:09 dcoppa Exp $
---- Source/cmComputeLinkInformation.cxx.orig Thu Aug  9 20:15:19 2012
-+++ Source/cmComputeLinkInformation.cxx Wed Sep 26 11:45:53 2012
-@@ -1059,12 +1059,21 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+--- Source/cmComputeLinkInformation.cxx.orig Wed May 15 19:38:13 2013
++++ Source/cmComputeLinkInformation.cxx Thu May 30 11:08:06 2013
+@@ -1070,12 +1070,21 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
      this->SharedLibrariesLinked.insert(target);
      }
 
Index: patches/patch-Source_cmGeneratorExpressionEvaluator_cxx
===================================================================
RCS file: patches/patch-Source_cmGeneratorExpressionEvaluator_cxx
diff -N patches/patch-Source_cmGeneratorExpressionEvaluator_cxx
--- patches/patch-Source_cmGeneratorExpressionEvaluator_cxx 18 Jan 2013 22:17:06 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-Source_cmGeneratorExpressionEvaluator_cxx,v 1.1 2013/01/18 22:17:06 dcoppa Exp $
-
-Bugfix: don't crash when a target is expected but is not available
-(upstream git commit e767ffcda58ab73cf2c4394202eec7ae1f6035b5)
-
---- Source/cmGeneratorExpressionEvaluator.cxx.orig Tue Nov 27 14:26:33 2012
-+++ Source/cmGeneratorExpressionEvaluator.cxx Fri Jan 18 16:13:03 2013
-@@ -18,6 +18,8 @@
-
- #include <cmsys/String.h>
-
-+#include <assert.h>
-+
- //----------------------------------------------------------------------------
- #if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x510
- static
-@@ -289,6 +291,17 @@ static const struct TargetPropertyNode : public cmGene
-
-     cmGeneratorTarget* target = context->Target;
-     std::string propertyName = *parameters.begin();
-+
-+    if (!target && parameters.size() == 1)
-+      {
-+      reportError(context, content->GetOriginalExpression(),
-+          "$<TARGET_PROPERTY:prop> may only be used with targets.  It may not "
-+          "be used with add_custom_command.  Specify the target to read a "
-+          "property from using the $<TARGET_PROPERTY:tgt,prop> signature "
-+          "instead.");
-+      return std::string();
-+      }
-+
-     if (parameters.size() == 2)
-       {
-       if (parameters.begin()->empty() && parameters[1].empty())
-@@ -348,6 +361,8 @@ static const struct TargetPropertyNode : public cmGene
-                     "Property name not supported.");
-       return std::string();
-       }
-+
-+    assert(target);
-
-     cmGeneratorExpressionDAGChecker dagChecker(context->Backtrace,
-                                                target->GetName(),
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx 13 May 2013 15:02:26 -0000 1.17
+++ patches/patch-Source_cmTarget_cxx 30 May 2013 12:26:02 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Source_cmTarget_cxx,v 1.17 2013/05/13 15:02:26 dcoppa Exp $
---- Source/cmTarget.cxx.orig Tue Nov 27 14:26:33 2012
-+++ Source/cmTarget.cxx Mon May 13 16:45:49 2013
-@@ -3097,12 +3097,16 @@ std::string cmTarget::GetPDBName(const char* config)
+--- Source/cmTarget.cxx.orig Wed May 15 19:38:13 2013
++++ Source/cmTarget.cxx Tue May 28 17:15:30 2013
+@@ -3772,6 +3772,7 @@ std::string cmTarget::GetPDBName(const char* config)
  //----------------------------------------------------------------------------
  bool cmTarget::HasSOName(const char* config)
  {
@@ -9,16 +9,17 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
    // soname is supported only for shared libraries and modules,
    // and then only when the platform supports an soname flag.
    return ((this->GetType() == cmTarget::SHARED_LIBRARY ||
-            this->GetType() == cmTarget::MODULE_LIBRARY) &&
+@@ -3779,6 +3780,9 @@ bool cmTarget::HasSOName(const char* config)
            !this->GetPropertyAsBool("NO_SONAME") &&
-           this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
+           this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config,
+                                                                 this)));
 +#else
 +  return false;
 +#endif
  }
 
  //----------------------------------------------------------------------------
-@@ -3426,8 +3430,13 @@ void cmTarget::GetLibraryNames(std::string& name,
+@@ -4102,8 +4106,13 @@ void cmTarget::GetLibraryNames(std::string& name,
    // Check for library version properties.
    const char* version = this->GetProperty("VERSION");
    const char* soversion = this->GetProperty("SOVERSION");
@@ -32,7 +33,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
      {
      // Versioning is supported only for shared libraries and modules,
      // and then only when the platform supports an soname flag.
-@@ -3455,9 +3464,43 @@ void cmTarget::GetLibraryNames(std::string& name,
+@@ -4131,9 +4140,43 @@ void cmTarget::GetLibraryNames(std::string& name,
    // The library name.
    name = prefix+base+suffix;
 
@@ -76,7 +77,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
 
    // The library's real name on disk.
    this->ComputeVersionedName(realName, prefix, base, suffix,
-@@ -3490,7 +3533,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
+@@ -4166,7 +4209,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
    if(version)
      {
      vName += ".";
Index: patches/patch-Source_cmake_cxx
===================================================================
RCS file: patches/patch-Source_cmake_cxx
diff -N patches/patch-Source_cmake_cxx
--- patches/patch-Source_cmake_cxx 18 Jan 2013 22:17:06 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-Source_cmake_cxx,v 1.8 2013/01/18 22:17:06 dcoppa Exp $
-
-Bugfix: don't crash if the link.txt file contains empty lines
-(upstream git commit 8ff1d4714fb7cd42eb3cd8db041b529e433eb7c8)
-
---- Source/cmake.cxx.orig Tue Nov 27 14:26:33 2012
-+++ Source/cmake.cxx Fri Jan 18 16:18:31 2013
-@@ -3299,6 +3299,12 @@ int cmake::ExecuteLinkScript(std::vector<std::string>&
-   int result = 0;
-   while(result == 0 && cmSystemTools::GetLineFromStream(fin, command))
-     {
-+    // Skip empty command lines.
-+    if(command.find_first_not_of(" \t") == command.npos)
-+      {
-+      continue;
-+      }
-+
-     // Setup this command line.
-     const char* cmd[2] = {command.c_str(), 0};
-     cmsysProcess_SetCommand(cp, cmd);
Index: patches/patch-Source_kwsys_SystemTools_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Source_kwsys_SystemTools_cxx
--- patches/patch-Source_kwsys_SystemTools_cxx 31 Aug 2012 12:28:31 -0000 1.11
+++ patches/patch-Source_kwsys_SystemTools_cxx 30 May 2013 12:26:02 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Source_kwsys_SystemTools
 
 Don't spam systrace by attempting to create dirs which already exist.
 
---- Source/kwsys/SystemTools.cxx.orig Thu Aug  9 20:15:19 2012
-+++ Source/kwsys/SystemTools.cxx Thu Aug 23 11:25:48 2012
-@@ -233,11 +233,13 @@ inline void Realpath(const char *path, kwsys_stl::stri
+--- Source/kwsys/SystemTools.cxx.orig Wed May 15 19:38:13 2013
++++ Source/kwsys/SystemTools.cxx Tue May 28 20:02:19 2013
+@@ -231,11 +231,13 @@ inline void Realpath(const char *path, kwsys_stl::stri
  }
  #else
  #include <sys/types.h>
Index: patches/patch-Tests_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Tests_CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Tests_CMakeLists_txt
--- patches/patch-Tests_CMakeLists_txt 15 Nov 2012 08:43:25 -0000 1.4
+++ patches/patch-Tests_CMakeLists_txt 30 May 2013 12:26:02 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Tests_CMakeLists_txt,v 1
 
 Disable CTestTestUpload test because it requires Internet access.
 
---- Tests/CMakeLists.txt.orig Tue Nov 13 14:03:57 2012
-+++ Tests/CMakeLists.txt Tue Nov 13 14:04:56 2012
-@@ -1707,17 +1707,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CM
+--- Tests/CMakeLists.txt.orig Wed May 15 19:38:13 2013
++++ Tests/CMakeLists.txt Tue May 28 20:02:19 2013
+@@ -1781,17 +1781,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CM
      FAIL_REGULAR_EXPRESSION "SegFault")
 
    configure_file(
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 PLIST
--- pkg/PLIST 21 Mar 2013 10:21:49 -0000 1.23
+++ pkg/PLIST 30 May 2013 12:26:02 -0000
@@ -144,6 +144,7 @@ share/cmake/Modules/CPackDeb.cmake
 share/cmake/Modules/CPackNSIS.cmake
 share/cmake/Modules/CPackPackageMaker.cmake
 share/cmake/Modules/CPackRPM.cmake
+share/cmake/Modules/CPackWIX.cmake
 share/cmake/Modules/CPackZIP.cmake
 share/cmake/Modules/CTest.cmake
 share/cmake/Modules/CTestScriptMode.cmake
@@ -220,6 +221,9 @@ share/cmake/Modules/Compiler/SunPro-ASM.
 share/cmake/Modules/Compiler/SunPro-C.cmake
 share/cmake/Modules/Compiler/SunPro-CXX.cmake
 share/cmake/Modules/Compiler/SunPro-Fortran.cmake
+share/cmake/Modules/Compiler/TI-ASM.cmake
+share/cmake/Modules/Compiler/TI-C.cmake
+share/cmake/Modules/Compiler/TI-CXX.cmake
 share/cmake/Modules/Compiler/TinyCC-C.cmake
 share/cmake/Modules/Compiler/VisualAge-C.cmake
 share/cmake/Modules/Compiler/VisualAge-CXX.cmake
@@ -241,6 +245,8 @@ share/cmake/Modules/DartConfiguration.tc
 share/cmake/Modules/DeployQt4.cmake
 share/cmake/Modules/Documentation.cmake
 share/cmake/Modules/DummyCXXFile.cxx
+share/cmake/Modules/ExternalData.cmake
+share/cmake/Modules/ExternalData_config.cmake.in
 share/cmake/Modules/ExternalProject.cmake
 share/cmake/Modules/FLTKCompatibility.cmake
 share/cmake/Modules/FeatureSummary.cmake
@@ -295,6 +301,7 @@ share/cmake/Modules/FindHTMLHelp.cmake
 share/cmake/Modules/FindHg.cmake
 share/cmake/Modules/FindITK.cmake
 share/cmake/Modules/FindIconv.cmake
+share/cmake/Modules/FindIcotool.cmake
 share/cmake/Modules/FindImageMagick.cmake
 share/cmake/Modules/FindJNI.cmake
 share/cmake/Modules/FindJPEG.cmake
@@ -602,6 +609,8 @@ share/cmake/Modules/Qt4ConfigDependentSe
 share/cmake/Modules/Qt4Macros.cmake
 share/cmake/Modules/RepositoryInfo.txt.in
 share/cmake/Modules/SelectLibraryConfigurations.cmake
+share/cmake/Modules/Squish4RunTestCase.bat
+share/cmake/Modules/Squish4RunTestCase.sh
 share/cmake/Modules/SquishRunTestCase.bat
 share/cmake/Modules/SquishRunTestCase.sh
 share/cmake/Modules/SquishTestScript.cmake
@@ -631,6 +640,7 @@ share/cmake/Modules/UseVTKConfig40.cmake
 share/cmake/Modules/Use_wxWindows.cmake
 share/cmake/Modules/UsewxWidgets.cmake
 share/cmake/Modules/VTKCompatibility.cmake
+share/cmake/Modules/WIX.template.in
 share/cmake/Modules/WriteBasicConfigVersionFile.cmake
 share/cmake/Modules/ecos_clean.cmake
 share/cmake/Modules/exportheader.cmake.in

cmake-2.8.11.diff.gz (15K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

Rafael Sadowski
On Friday 31 May 2013 14:25:09 David Coppa wrote:
> Hi all!
>
> Here's the update to cmake-2.8.11.
>
> A bulk-build test would be cool...
>

Nice workd David; 2.9.11 comes with some patches from Amit Kulkarni
(reported).:

OpenBSD: Install shared libraries without executable permission
OpenBSD: Add paths for Java 1.6.0/1.7.0 JRE/JDK
OpenBSD: Add path for Freetype under X.org
OpenBSD: Add paths for Tcl/Tk 8.4/8.5
OpenBSD: Add path for Lua 5.1
OpenBSD: Add paths for Qt3/Qt4

>  +  if(MODJAVA_VER)
>  +    if(MODJAVA_VER MATCHES "^1\\.6$")
> @@ -69,8 +71,8 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
>  +      /usr/java/j2sdk1.4.2_09/bin
>  +      /usr/lib/j2sdk1.5-sun/bin
>  +      /opt/sun-jdk-1.5.0.04/bin
> -+      ${LOCALBASE}/jdk-1.7.0/bin
> -+      ${LOCALBASE}/jdk-1.6.0/bin
> ++      /usr/local/jdk-1.7.0/bin
> ++      /usr/local/jdk-1.6.0/bin

No longer ${LOCALBASE}?

Cheers Rafael

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

Amit Kulkarni-5
On Fri, May 31, 2013 at 5:10 PM, Rafael Sadowski <[hidden email]>wrote:

> On Friday 31 May 2013 14:25:09 David Coppa wrote:
> > Hi all!
> >
> > Here's the update to cmake-2.8.11.
> >
> > A bulk-build test would be cool...
> >
>
> Nice workd David; 2.9.11 comes with some patches from Amit Kulkarni
> (reported).:
>


He knows, since he is the one who sent to me to feed upstream. So, it is
his patches really :-)
Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

David Coppa
In reply to this post by Rafael Sadowski
On Sat, Jun 1, 2013 at 12:10 AM, Rafael Sadowski <[hidden email]> wrote:

> No longer ${LOCALBASE}?

Imho it does not make sense anymore... You should patch and apply
${SUBST_CMD} to, probably, every file under Modules/

cheers,
David

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

Landry Breuil-5
In reply to this post by David Coppa
On Fri, May 31, 2013 at 02:25:09PM +0200, David Coppa wrote:
>
> Hi all!
>
> Here's the update to cmake-2.8.11.
>
> A bulk-build test would be cool...

The bulk is not over, but so far x11/ogre seems to be the only fallout :

CMakeFiles/SampleBrowser.dir/src/FileSystemLayerImpl_Unix.cpp.o(.text+0x52):
In function `__static_initialization_and_destructi on_0(int, int)':
: undefined reference to `boost::system::system_category()'
/usr/obj/mfs/ogre_src_v1-7-4/build-amd64/lib/libOgreMain.so.0.0:
undefined reference to
`boost::this_thread::disable_interruption::disable_interruption()'

etc etc

Landry

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

Stuart Henderson-6
In reply to this post by David Coppa
On 2013/06/01 14:40, David Coppa wrote:

> On Sat, Jun 1, 2013 at 12:10 AM, Rafael Sadowski <[hidden email]> wrote:
>
> > No longer ${LOCALBASE}?
>
> Imho it does not make sense anymore... You should patch and apply
> ${SUBST_CMD} to, probably, every file under Modules/
>
> cheers,
> David
>

or just s,/usr/local,${LOCALBASE},g

(I still don't recall coming across anyone who actually builds
and uses packages against a different LOCALBASE themselves though,
iirc the closest I got was "<someone> used to do this", and that was
quite a while ago...)

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

Marc Espie-2
On Sat, Jun 01, 2013 at 02:05:29PM +0100, Stuart Henderson wrote:

> On 2013/06/01 14:40, David Coppa wrote:
> > On Sat, Jun 1, 2013 at 12:10 AM, Rafael Sadowski <[hidden email]> wrote:
> >
> > > No longer ${LOCALBASE}?
> >
> > Imho it does not make sense anymore... You should patch and apply
> > ${SUBST_CMD} to, probably, every file under Modules/
> >
> > cheers,
> > David
> >
>
> or just s,/usr/local,${LOCALBASE},g
>
> (I still don't recall coming across anyone who actually builds
> and uses packages against a different LOCALBASE themselves though,
> iirc the closest I got was "<someone> used to do this", and that was
> quite a while ago...)

I very much would like us to move away from /usr/local at some point.
There are HUGE benefits to doing that. For starters, most autoconf stuff
hardcodes /usr/local detection, so it would make detection of most things
explicit.

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

David Coppa
In reply to this post by Stuart Henderson-6
On Sat, Jun 1, 2013 at 3:05 PM, Stuart Henderson <[hidden email]> wrote:

> On 2013/06/01 14:40, David Coppa wrote:
>> On Sat, Jun 1, 2013 at 12:10 AM, Rafael Sadowski <[hidden email]> wrote:
>>
>> > No longer ${LOCALBASE}?
>>
>> Imho it does not make sense anymore... You should patch and apply
>> ${SUBST_CMD} to, probably, every file under Modules/
>>
>> cheers,
>> David
>>
>
> or just s,/usr/local,${LOCALBASE},g
>
> (I still don't recall coming across anyone who actually builds
> and uses packages against a different LOCALBASE themselves though,
> iirc the closest I got was "<someone> used to do this", and that was
> quite a while ago...)
>

For CMake, I've now choosen to adopt this policy: if it's code I've
added use ${LOCALBASE} and ${SUBST_CMD}, if it's stuff coming from
upstream leave it as-is :)

ciao,
David

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

Landry Breuil-5
In reply to this post by Landry Breuil-5
On Sat, Jun 01, 2013 at 03:00:32PM +0200, Landry Breuil wrote:
> On Fri, May 31, 2013 at 02:25:09PM +0200, David Coppa wrote:
> >
> > Hi all!
> >
> > Here's the update to cmake-2.8.11.
> >
> > A bulk-build test would be cool...
>
> The bulk is not over, but so far x11/ogre seems to be the only fallout :

No other known fallout, besides the one which might have been hidden by
the other unrelated failures..

Landry

Reply | Threaded
Open this post in threaded view
|

Re: cmake-2.8.11

David Coppa
On Sat, Jun 1, 2013 at 6:09 PM, Landry Breuil <[hidden email]> wrote:

> On Sat, Jun 01, 2013 at 03:00:32PM +0200, Landry Breuil wrote:
>> On Fri, May 31, 2013 at 02:25:09PM +0200, David Coppa wrote:
>> >
>> > Hi all!
>> >
>> > Here's the update to cmake-2.8.11.
>> >
>> > A bulk-build test would be cool...
>>
>> The bulk is not over, but so far x11/ogre seems to be the only fallout :
>
> No other known fallout, besides the one which might have been hidden by
> the other unrelated failures..

I will have a look at x11/ogre.

> Landry

Thanks a lot for the bulk!

Ciao,
David