[141069] trunk/dports/science/ldas-tools

[ryandesign at macports.org]

Revision: 141069
          https://trac.macports.org/changeset/141069
Author:   ryandesign at macports.org
Date:     2015-10-09 07:55:44 -0700 (Fri, 09 Oct 2015)
Log Message:
-----------
ldas-tools: update to 2.4.2 and enable python27 variant by default (#48991; maintainer)

Modified Paths:
--------------
    trunk/dports/science/ldas-tools/Portfile

Added Paths:
-----------
    trunk/dports/science/ldas-tools/files/
    trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff
    trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff

Modified: trunk/dports/science/ldas-tools/Portfile
===================================================================
--- trunk/dports/science/ldas-tools/Portfile	2015-10-09 14:25:55 UTC (rev 141068)
+++ trunk/dports/science/ldas-tools/Portfile	2015-10-09 14:55:44 UTC (rev 141069)
@@ -4,7 +4,7 @@
 PortGroup     compiler_blacklist_versions 1.0
 
 name          ldas-tools
-version       2.4.0
+version       2.4.2
 categories    science
 platforms     darwin
 maintainers   ligo.org:ed.maros
@@ -15,9 +15,12 @@
 homepage      http://www.ldas-sw.ligo.caltech.edu
 master_sites  http://software.ligo.org/lscsoft/source/
 
-checksums     rmd160 9b250e836b502379ff24124d1bf67e2c3e164feb \
-              sha256 d49438554a9628ff320e889e55fb3a60a6596c4ab581eb089b4356e9e5e51b86
+checksums     rmd160  54dec09d6d9d3e55c881af7574226f2d640a5e96 \
+              sha256  17b9514c8aa2092f70f7d8c7315a7d46008a285d47b730ad2d7a8eb2c89e9a36
 
+patchfiles    patch-libraries-ldastoolsal-src-AtExit.cc.diff \
+              patch-libraries-ldastoolsal-src-TaskThread.cc.diff
+
 configure.args --disable-silent-rules \
                --with-optimization=high \
                --disable-tcl \
@@ -50,14 +53,14 @@
 #------------------------------------------------------------------------
 # Python variants
 #------------------------------------------------------------------------
-set pythons_suffixes {27 34}
+set pythons_versions     { 27 34 }
 
 set pythons_ports {}
-foreach s ${pythons_suffixes} {
+foreach s ${pythons_versions} {
     lappend pythons_ports python${s}
 }
 
-foreach s ${pythons_suffixes} {
+foreach s ${pythons_versions} {
     set p python${s}
     set v [string index ${s} 0].[string index ${s} 1]
     set i [lsearch -exact ${pythons_ports} ${p}]
@@ -68,13 +71,18 @@
 
             depends_build-append    port:swig-python
             depends_lib-append      port:${p} port:py${s}-numpy
-            configure.args-strsed   s/--disable-python/--enable-python/
+            configure.python        ${prefix}/bin/python${v}
+            configure.args-replace  --disable-python --enable-python
             destroot.args-append    pythondir="${d}" pyexecdir="${d}"
 
         }
     }]
 }
 
+if {![variant_isset python34]} {
+    default_variants +python27
+}
+
 livecheck.type   regex
 livecheck.url    ${master_sites}
 livecheck.regex  {ldas-tools-(\d+(?:\.\d+)*).tar.gz}

Added: trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff
===================================================================
--- trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff	                        (rev 0)
+++ trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-AtExit.cc.diff	2015-10-09 14:55:44 UTC (rev 141069)
@@ -0,0 +1,20 @@
+--- libraries/ldastoolsal/src/AtExit.cc.orig
++++ libraries/ldastoolsal/src/AtExit.cc
+@@ -10,6 +10,11 @@
+ #include "ldastoolsal/mutexlock.hh"
+ #include "ldastoolsal/ReadWriteLock.hh"
+ 
++#pragma clang diagnostic push 
++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
++#pragma GCC diagnostic push 
++#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++
+ namespace anonymous
+ {
+   void exit_handler( );
+@@ -322,3 +327,5 @@ namespace LDASTools
+     }
+   } // namespace - AL
+ } // namespace - LDASTools
++#pragma GCC diagnostic pop
++#pragma clang diagnostic pop

Added: trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff
===================================================================
--- trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff	                        (rev 0)
+++ trunk/dports/science/ldas-tools/files/patch-libraries-ldastoolsal-src-TaskThread.cc.diff	2015-10-09 14:55:44 UTC (rev 141069)
@@ -0,0 +1,12 @@
+--- libraries/ldastoolsal/src/TaskThread.cc.orig
++++ libraries/ldastoolsal/src/TaskThread.cc
+@@ -266,7 +266,8 @@ namespace LDASTools
+ 	{
+ 	  m_cancel_method = t->CancelMethod( );
+ 	  m_cancel_signal = t->CancelSignal( );
+-	  m_task_type_name = typeid( *t ).name( );
++	  const Task& tname = *t;
++	  m_task_type_name = typeid( tname ).name( );
+ 	}
+ 
+ 	sigset_t	old_signal_set;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151009/483685a4/attachment.html>