[116048] trunk/dports/science/libbiosig

[mojca at macports.org]

Revision: 116048
          https://trac.macports.org/changeset/116048
Author:   mojca at macports.org
Date:     2014-01-16 15:26:40 -0800 (Thu, 16 Jan 2014)
Log Message:
-----------
libbiosig: another attempt of fixing getline build problem on 10.6 (#42152)

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

Added Paths:
-----------
    trunk/dports/science/libbiosig/files/patch-getline.diff

Removed Paths:
-------------
    trunk/dports/science/libbiosig/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/science/libbiosig/Portfile
===================================================================
--- trunk/dports/science/libbiosig/Portfile	2014-01-16 23:09:30 UTC (rev 116047)
+++ trunk/dports/science/libbiosig/Portfile	2014-01-16 23:26:40 UTC (rev 116048)
@@ -21,7 +21,7 @@
 master_sites.mirror_subdir \
                     /BioSig%20for%20C_C++/src
 distname            biosig4c++-${version}.src
-patchfiles          patch-CMakeLists.txt.diff
+patchfiles          patch-getline.diff
 worksrcdir          biosig4c++-${version}
 checksums           rmd160  2cd5b3c431fe8bd2cc3128fee3c378097f25fcd0 \
                     sha256  53472928c0ae409de6b4e9a6006f33f3bcdfb72462b1661bf8f42a7eef98877c \

Deleted: trunk/dports/science/libbiosig/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/libbiosig/files/patch-CMakeLists.txt.diff	2014-01-16 23:09:30 UTC (rev 116047)
+++ trunk/dports/science/libbiosig/files/patch-CMakeLists.txt.diff	2014-01-16 23:26:40 UTC (rev 116048)
@@ -1,49 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -23,6 +23,12 @@
-   DEPENDS units.awk extern/units.csv
- )
- 
-+add_custom_target (annexb
-+  COMMAND ${GAWK} -f annotatedECG.awk extern/11073-10102-AnnexB.txt > "11073-10102-AnnexB.i"
-+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-+  DEPENDS annotatedECG.awk extern/11073-10102-AnnexB.txt
-+)
-+
- set (headers
-   t210/abfheadr.h
-   XMLParser/tinyxml.h
-@@ -48,6 +54,9 @@
-   XMLParser/tinyxml.cpp
-   XMLParser/tinyxmlerror.cpp
-   XMLParser/tinyxmlparser.cpp 
-+  win32/getdelim.c
-+  win32/getline.c
-+  win32/getlogin.c
-   biosig.c
-   gdftime.c
-   physicalunits.c
-@@ -55,9 +64,9 @@
- 
- if (WIN32)
-   list (APPEND sources
--    win32/getdelim.c
--    win32/getline.c
--    win32/getlogin.c
-+    # win32/getdelim.c
-+    # win32/getline.c
-+    # win32/getlogin.c
-   )
- endif ()
- 
-@@ -80,8 +89,8 @@
-      )
- endif ()
- 
--add_dependencies (biosigstatic eventcodes units)
--add_dependencies (biosigshared eventcodes units)
-+add_dependencies (biosigstatic eventcodes units annexb)
-+add_dependencies (biosigshared eventcodes units annexb)
- 
- if (USE_ZLIB)
-   add_definitions (-D=WITH_ZLIB)

Copied: trunk/dports/science/libbiosig/files/patch-getline.diff (from rev 116041, trunk/dports/science/libbiosig/files/patch-CMakeLists.txt.diff)
===================================================================
--- trunk/dports/science/libbiosig/files/patch-getline.diff	                        (rev 0)
+++ trunk/dports/science/libbiosig/files/patch-getline.diff	2014-01-16 23:26:40 UTC (rev 116048)
@@ -0,0 +1,74 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # Version number
+ set (libbiosig_VERSION_MAJOR 1)
+ set (libbiosig_VERSION_MINOR 5)
+-set (libbiosig_VERSION_PATCH 0)
++set (libbiosig_VERSION_PATCH 10)
+ 
+ find_program (GAWK NAMES gawk)
+ 
+@@ -23,6 +23,12 @@
+   DEPENDS units.awk extern/units.csv
+ )
+ 
++add_custom_target (annexb
++  COMMAND ${GAWK} -f annotatedECG.awk extern/11073-10102-AnnexB.txt > "11073-10102-AnnexB.i"
++  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
++  DEPENDS annotatedECG.awk extern/11073-10102-AnnexB.txt
++)
++
+ set (headers
+   t210/abfheadr.h
+   XMLParser/tinyxml.h
+@@ -61,6 +67,14 @@
+   )
+ endif ()
+ 
++if (APPLE)
++  list (APPEND sources
++    win32/getdelim.c
++    win32/getline.c
++    win32/getlogin.c
++  )
++endif ()
++
+ # Cannot have same name for static and shared library, 
+ # so we'll correct that later on
+ add_library (biosigstatic STATIC
+@@ -80,8 +94,8 @@
+      )
+ endif ()
+ 
+-add_dependencies (biosigstatic eventcodes units)
+-add_dependencies (biosigshared eventcodes units)
++add_dependencies (biosigstatic eventcodes units annexb)
++add_dependencies (biosigshared eventcodes units annexb)
+ 
+ if (USE_ZLIB)
+   add_definitions (-D=WITH_ZLIB)
+--- win32/getdelim.c.orig
++++ win32/getdelim.c
+@@ -27,6 +27,9 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#ifdef MACPORTS
++#include <unistd.h>
++#endif
+ 
+ #ifndef SSIZE_MAX
+ # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+--- win32/getline.c.orig
++++ win32/getline.c
+@@ -17,6 +17,9 @@
+ /* Written by Simon Josefsson. */
+ 
+ #include <stdio.h>
++#ifdef MACPORTS
++#include <unistd.h>
++#endif
+ 
+ ssize_t
+ getline (char **lineptr, size_t *n, FILE *stream)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140116/02ab2cc8/attachment-0001.html>