[110530] trunk/dports/devel/cmake

1 Sep 2013

Revision: 110530
          https://trac.macports.org/changeset/110530
Author:   mojca@macports.org
Date:     2013-09-01 12:43:12 -0700 (Sun, 01 Sep 2013)
Log Message:
-----------
cmake: update to 2.8.11.2 (#39608, maintainer timeout)

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile
    trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff

Removed Paths:
-------------
    trunk/dports/devel/cmake/files/patch-Utilities-cmcurl-strequal.h.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================

--- trunk/dports/devel/cmake/Portfile	2013-09-01 19:38:54 UTC (rev 110529)
+++ trunk/dports/devel/cmake/Portfile	2013-09-01 19:43:12 UTC (rev 110530)
@@ -5,8 +5,7 @@
 PortGroup           muniversal 1.0
 
 name                cmake
-version             2.8.10.2
-revision            1
+version             2.8.11.2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             BSD
@@ -21,14 +20,13 @@
 master_sites        http://www.cmake.org/files/v${branch}/
 platforms           darwin freebsd
 
-checksums           rmd160  03274f790edd5dd94a8e1c94eade36864eaf5b2b \
-                    sha256  ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1
+checksums           rmd160  4fe1fe6306cae0d11da53b30266203c846e484d8 \
+                    sha256  b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562
 
 depends_lib-append  port:libidn port:openssl
 
 patchfiles          patch-CMakeFindFrameworks.cmake.diff \
-                    patch-Modules-FindQt4.cmake.diff \
-                    patch-Utilities-cmcurl-strequal.h.diff
+                    patch-Modules-FindQt4.cmake.diff
 
 configure.env-append \
                     CMAKE_PREFIX_PATH=${prefix} \

Modified: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2013-09-01 19:38:54 UTC (rev 110529)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2013-09-01 19:43:12 UTC (rev 110530)
@@ -1,6 +1,6 @@
 --- Modules/FindQt4.cmake.orig	2013-01-03 21:15:16.000000000 -0500
 +++ Modules/FindQt4.cmake	2013-01-03 21:24:55.000000000 -0500
-@@ -550,7 +550,8 @@
+@@ -592,7 +592,8 @@
      set(QT_MKSPECS_DIR NOTFOUND)
      find_path(QT_MKSPECS_DIR NAMES qconfig.pri
        HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
@@ -10,15 +10,15 @@
    endif()
  
    if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -644,6 +645,7 @@
-       find_path(QT_QTCORE_INCLUDE_DIR QtCore
-                 HINTS ${qt_headers} ${QT_LIBRARY_DIR}
-                 PATH_SUFFIXES QtCore qt4/QtCore
-+                NO_DEFAULT_PATH
-         )
+@@ -692,6 +693,7 @@
+         find_path(QT_QTCORE_INCLUDE_DIR QtCore
+                   HINTS ${qt_headers} ${QT_LIBRARY_DIR}
+                   PATH_SUFFIXES QtCore qt4/QtCore
++                  NO_DEFAULT_PATH
+           )
+       endif()
  
-       # Set QT_HEADERS_DIR based on finding QtCore header
-@@ -696,7 +698,8 @@
+@@ -745,7 +747,8 @@
      endforeach()
      find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
        HINTS ${qt_cross_paths} ${qt_plugins_dir}
@@ -28,7 +28,7 @@
    endif ()
  
    # ask qmake for the translations directory
-@@ -716,8 +719,7 @@
+@@ -765,8 +768,7 @@
        find_path(QT_IMPORTS_DIR NAMES Qt
          HINTS ${qt_cross_paths} ${qt_imports_dir}
          DOC "The location of the Qt imports"

Deleted: trunk/dports/devel/cmake/files/patch-Utilities-cmcurl-strequal.h.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Utilities-cmcurl-strequal.h.diff	2013-09-01 19:38:54 UTC (rev 110529)
+++ trunk/dports/devel/cmake/files/patch-Utilities-cmcurl-strequal.h.diff	2013-09-01 19:43:12 UTC (rev 110530)
@@ -1,15 +0,0 @@
---- Utilities/cmcurl/strequal.h.orig	2013-02-08 09:04:39.000000000 -0800
-+++ Utilities/cmcurl/strequal.h	2013-02-08 09:05:41.000000000 -0800
-@@ -35,9 +35,10 @@
- /* case insensitive strstr() */
- char *Curl_strcasestr(const char *haystack, const char *needle);
- 
--#ifndef HAVE_STRLCAT
-+#ifdef HAVE_STRLCAT
-+#include <string.h>
-+#else
- #define strlcat(x,y,z) Curl_strlcat(x,y,z)
- #endif
--size_t strlcat(char *dst, const char *src, size_t siz);
- 
- #endif

    

mojca＠macports.org

tags

participants (1)