[114625] trunk/dports/science/mapm3

[ryandesign at macports.org]

Revision: 114625
          https://trac.macports.org/changeset/114625
Author:   ryandesign at macports.org
Date:     2013-12-11 20:49:40 -0800 (Wed, 11 Dec 2013)
Log Message:
-----------
mapm3: fix build with clang (#41772)

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

Added Paths:
-----------
    trunk/dports/science/mapm3/files/patch-reader.c.diff

Modified: trunk/dports/science/mapm3/Portfile
===================================================================
--- trunk/dports/science/mapm3/Portfile	2013-12-12 04:33:46 UTC (rev 114624)
+++ trunk/dports/science/mapm3/Portfile	2013-12-12 04:49:40 UTC (rev 114625)
@@ -29,20 +29,18 @@
 patchfiles              patch-iolib.h \
                         patch-xmapmaker \
                         patch-Makefile \
+                        patch-reader.c.diff \
                         patch-system.h \
                         patch-xqtl
 
 use_configure           no
 
-# error: non-void function 'add_to_seg_dist' should return a value [-Wreturn-type]
-compiler.blacklist      *clang*
-
 build.args              DIR=${prefix}/bin \
                         COMPILE="${configure.cc} [get_canonical_archflags cc] -fwritable-strings" \
                         LINKALL="${configure.cc} [get_canonical_archflags cc]" \
                         LINKLIB="ld [get_canonical_archflags ld] -r"
 
-destroot.args           DIR=${destroot}${prefix}/bin
+destroot.destdir        DIR=${destroot}${prefix}/bin
 
 post-destroot {
     xinstall -d ${destroot}${prefix}/libexec/${name}

Added: trunk/dports/science/mapm3/files/patch-reader.c.diff
===================================================================
--- trunk/dports/science/mapm3/files/patch-reader.c.diff	                        (rev 0)
+++ trunk/dports/science/mapm3/files/patch-reader.c.diff	2013-12-12 04:49:40 UTC (rev 114625)
@@ -0,0 +1,19 @@
+--- mapm/reader.c.orig	1993-02-09 10:35:05.000000000 -0600
++++ mapm/reader.c	2013-12-11 22:45:33.000000000 -0600
+@@ -48,6 +48,8 @@
+ void read_raw_trait();
+ void write_traits();
+ 
++void add_to_seg_dist();
++
+ bool uppercase_genotypes; /* set by read_raw_header() for read_raw_f2_locus()*/
+ 
+ real **trait=NULL;
+@@ -881,6 +883,7 @@
+ 
+ 
+ 
++void
+ add_to_seg_dist(c,locus)
+ char c;
+ int locus;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131211/052e2a90/attachment.html>