[149931] trunk/dports/science/gnuradio

[michaelld at macports.org]

Revision: 149931
          https://trac.macports.org/changeset/149931
Author:   michaelld at macports.org
Date:     2016-07-05 16:48:47 -0700 (Tue, 05 Jul 2016)
Log Message:
-----------
gnuradio: remove integrated patch; addresses ticket #51776.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile

Removed Paths:
-------------
    trunk/dports/science/gnuradio/files/patch-cmake_Modules_GrVersion.cmake.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2016-07-05 22:15:34 UTC (rev 149930)
+++ trunk/dports/science/gnuradio/Portfile	2016-07-05 23:48:47 UTC (rev 149931)
@@ -97,10 +97,6 @@
     patchfiles-append \
         patch-cmake-expand.release.diff
 
-    # temporary patch to allow us to set version info here.
-    # remove with next release
-    patchfiles-append   patch-cmake_Modules_GrVersion.cmake.diff
-
 } else {
 
     # patches for devel and next (which are kept aligned for now)

Deleted: trunk/dports/science/gnuradio/files/patch-cmake_Modules_GrVersion.cmake.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake_Modules_GrVersion.cmake.diff	2016-07-05 22:15:34 UTC (rev 149930)
+++ trunk/dports/science/gnuradio/files/patch-cmake_Modules_GrVersion.cmake.diff	2016-07-05 23:48:47 UTC (rev 149931)
@@ -1,17 +0,0 @@
---- cmake/Modules/GrVersion.cmake.orig
-+++ cmake/Modules/GrVersion.cmake
-@@ -41,7 +41,13 @@ if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
-         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-     )
- else()
--    set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown")
-+    if(NOT GR_GIT_COUNT)
-+        set(GR_GIT_COUNT "compat-xxx")
-+    endif()
-+    if(NOT GR_GIT_HASH)
-+        set(GR_GIT_HASH "xunknown")
-+    endif()
-+    set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}-${GR_GIT_COUNT}-${GR_GIT_HASH}")
- endif()
- 
- ########################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160705/58cad884/attachment.html>