[119963] trunk/dports/devel/libdynd

[stromnov at macports.org]

Revision: 119963
          https://trac.macports.org/changeset/119963
Author:   stromnov at macports.org
Date:     2014-05-12 02:58:36 -0700 (Mon, 12 May 2014)
Log Message:
-----------
libdynd: update to version 0.6.2

Modified Paths:
--------------
    trunk/dports/devel/libdynd/Portfile
    trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/devel/libdynd/Portfile
===================================================================
--- trunk/dports/devel/libdynd/Portfile	2014-05-12 09:45:49 UTC (rev 119962)
+++ trunk/dports/devel/libdynd/Portfile	2014-05-12 09:58:36 UTC (rev 119963)
@@ -4,10 +4,12 @@
 PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           cmake 1.0
+PortGroup           conflicts_build 1.0
 
-set git_sha1        45cc122170df91f937a4b13c0ffe41b8bb1d7485
-github.setup        ContinuumIO libdynd 0.6.1 v
+set git_sha1        d230bee7000da1c2b1ab171389df70050fa76e71
 
+github.setup        ContinuumIO libdynd 0.6.2 v
+
 categories          devel math
 platforms           darwin
 license             BSD
@@ -17,8 +19,8 @@
 description         LibDyND is a C++ library for dynamic, multidimensional arrays.
 long_description    ${description}
 
-checksums           rmd160  43838dba61dce76407eaf0aaf218bdad49c28849 \
-                    sha256  bf84534ce6bfccd1df318c35a3340c5f71735483461ada41f3e1ac67a2fb53b6
+checksums           rmd160  ba527c3f0ae11778e3738cc1cd88782816cbb696 \
+                    sha256  cfa381811ab2ee4980fd61bfe72f5e56c2610b31c2475dbaba132ab2118b1507
 
 patchfiles          patch-CMakeLists.txt.diff
 
@@ -27,6 +29,8 @@
     reinplace "s|@@DYND_VERSION_STRING@@|v${version}|g" ${worksrcpath}/CMakeLists.txt
 }
 
+conflicts_build     ${name}
+
 configure.dir       ${worksrcpath}/build
 build.dir           ${configure.dir}
 pre-configure {
@@ -35,6 +39,7 @@
 
 configure.args-append \
                     ../ \
+                    -DDYND_CUDA=OFF \
                     -DDYND_SHARED_LIB=ON \
                     -DDYND_INSTALL_LIB=ON \
                     -DUSE_RELATIVE_RPATH=OFF \

Modified: trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff	2014-05-12 09:45:49 UTC (rev 119962)
+++ trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff	2014-05-12 09:58:36 UTC (rev 119963)
@@ -1,15 +1,24 @@
---- CMakeLists.txt.orig	2013-09-01 22:25:28.000000000 +0400
-+++ CMakeLists.txt	2013-09-02 00:17:28.000000000 +0400
-@@ -86,9 +86,9 @@
+--- CMakeLists.txt.orig	2014-05-01 20:43:13.000000000 +0400
++++ CMakeLists.txt	2014-05-12 13:56:55.000000000 +0400
+@@ -80,7 +80,7 @@
+         endif ()
+     endif()
+ else()
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra -Werror -Wno-missing-field-initializers")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra -Wno-missing-field-initializers")
+     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+         # The '-fmax-errors' flag was first supported in gcc 4.6
+         if (NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.6")
+@@ -112,9 +112,9 @@
  endif()
  
  # Get the git revision
 -include(GetGitRevisionDescriptionDyND)
 -get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1)
--git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING --dirty --match "v[0-9]*")
-+
+-git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING --dirty --always --match "v*")
 +SET(DYND_GIT_SHA1 "@@DYND_GIT_SHA1@@")
 +SET(DYND_VERSION_STRING "@@DYND_VERSION_STRING@@")
++
  message(STATUS "DyND version: ${DYND_VERSION_STRING}")
  configure_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140512/33ca92b1/attachment-0001.html>