[96548] trunk/dports/science/molmol

[dports at macports.org]

Revision: 96548
          https://trac.macports.org/changeset/96548
Author:   dports at macports.org
Date:     2012-08-13 17:22:18 -0700 (Mon, 13 Aug 2012)
Log Message:
-----------
molmol: 
 * work around build failures on 10.8 by using 10.7 SDK
 * fix -Wmissing-braces warnings from clang
 * add gcc45, gcc46, gcc47 variants
(#34452)

Modified Paths:
--------------
    trunk/dports/science/molmol/Portfile
    trunk/dports/science/molmol/files/molmol-warnings.diff

Modified: trunk/dports/science/molmol/Portfile
===================================================================
--- trunk/dports/science/molmol/Portfile	2012-08-13 23:30:24 UTC (rev 96547)
+++ trunk/dports/science/molmol/Portfile	2012-08-14 00:22:18 UTC (rev 96548)
@@ -5,7 +5,7 @@
 
 name                molmol
 version             2k.2.0
-revision            4
+revision            5
 categories          science
 maintainers         bromo.med.uc.edu:howarth
 description         Molecular graphics display program
@@ -42,6 +42,9 @@
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/makedef \
                                         ${worksrcpath}/molmol
     reinplace  "s|@CC@|${configure.cc}|g" ${worksrcpath}/makedef
+    if {${os.major} == 12} {
+      reinplace  "s|SYSLIB = |SYSLIB = -isysroot `xcode-select --print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk |g" ${worksrcpath}/makedef
+    }
 }
 destroot {
     # prune installed files
@@ -61,3 +64,15 @@
     ln -s ${prefix}/share/${name}/COPYING ${destroot}${prefix}/share/doc/${name}/COPYING
     ln -s ${prefix}/share/${name}/man ${destroot}${prefix}/share/doc/${name}/man
 }
+variant gcc45 description conflicts gcc46 gcc47 description {build using macports-gcc-4.5} {
+    depends_lib-append  port:gcc45
+    configure.compiler  macports-gcc-4.5
+}
+variant gcc46 description conflicts gcc45 gcc47 description {build using macports-gcc-4.6} {
+    depends_lib-append  port:gcc46
+    configure.compiler  macports-gcc-4.6
+}
+variant gcc47 description conflicts gcc45 gcc46 description {build using macports-gcc-4.7} {
+    depends_lib-append  port:gcc47
+    configure.compiler  macports-gcc-4.7
+}

Modified: trunk/dports/science/molmol/files/molmol-warnings.diff
===================================================================
--- trunk/dports/science/molmol/files/molmol-warnings.diff	2012-08-13 23:30:24 UTC (rev 96547)
+++ trunk/dports/science/molmol/files/molmol-warnings.diff	2012-08-14 00:22:18 UTC (rev 96548)
@@ -248,8 +248,38 @@
      return;
  
    switch (fieldChoice) {
---- tools/src/IsoSurface.c.orig	2001-07-04 19:26:21.000000000 -0400
-+++ tools/src/IsoSurface.c	2012-05-12 12:24:17.000000000 -0400
+--- tools/src/IsoSurface.c.orig	2012-05-14 13:55:51.000000000 -0400
++++ tools/src/IsoSurface.c	2012-05-14 14:01:49.000000000 -0400
+@@ -104,19 +104,19 @@
+ } Strip;
+ 
+ static CubeDesc CubeEven = {
+-  0, 3, 5, 6, {{D_0, 1}, {D_0,  2}, {D_0,  3}, {D_0,  4}},
+-  3, 0, 5, 1, {{D_0, 0}, {D_MZ, 4}, {D_MY, 1}, {D_PX, 2}},
+-  0, 3, 6, 2, {{D_0, 0}, {D_MZ, 3}, {D_PY, 2}, {D_MX, 1}},
+-  3, 5, 6, 7, {{D_0, 0}, {D_PX, 3}, {D_PZ, 1}, {D_PY, 4}},
+-  5, 0, 6, 4, {{D_0, 0}, {D_MY, 3}, {D_MX, 4}, {D_PZ, 2}}
++  {{0, 3, 5, 6, {{D_0, 1}, {D_0,  2}, {D_0,  3}, {D_0,  4}}},
++  {3, 0, 5, 1, {{D_0, 0}, {D_MZ, 4}, {D_MY, 1}, {D_PX, 2}}},
++  {0, 3, 6, 2, {{D_0, 0}, {D_MZ, 3}, {D_PY, 2}, {D_MX, 1}}},
++  {3, 5, 6, 7, {{D_0, 0}, {D_PX, 3}, {D_PZ, 1}, {D_PY, 4}}},
++  {5, 0, 6, 4, {{D_0, 0}, {D_MY, 3}, {D_MX, 4}, {D_PZ, 2}}}}
+ };
+ 
+ static CubeDesc CubeOdd = {
+-  1, 2, 7, 4, {{D_0, 1}, {D_0,  2}, {D_0,  3}, {D_0,  4}},
+-  2, 1, 7, 3, {{D_0, 0}, {D_MZ, 3}, {D_PX, 2}, {D_PY, 1}},
+-  1, 2, 4, 0, {{D_0, 0}, {D_MZ, 4}, {D_MX, 1}, {D_MY, 2}},
+-  2, 7, 4, 6, {{D_0, 0}, {D_PY, 4}, {D_PZ, 2}, {D_MX, 3}},
+-  7, 1, 4, 5, {{D_0, 0}, {D_PX, 4}, {D_MY, 3}, {D_PZ, 1}}
++  {{1, 2, 7, 4, {{D_0, 1}, {D_0,  2}, {D_0,  3}, {D_0,  4}}},
++  {2, 1, 7, 3, {{D_0, 0}, {D_MZ, 3}, {D_PX, 2}, {D_PY, 1}}},
++  {1, 2, 4, 0, {{D_0, 0}, {D_MZ, 4}, {D_MX, 1}, {D_MY, 2}}},
++  {2, 7, 4, 6, {{D_0, 0}, {D_PY, 4}, {D_PZ, 2}, {D_MX, 3}}},
++  {7, 1, 4, 5, {{D_0, 0}, {D_PX, 4}, {D_MY, 3}, {D_PZ, 1}}}}
+ };
+ 
+ static BOOL Initialized = FALSE;
 @@ -158,7 +158,7 @@
  static BOOL
  equalPair(int i00, int i01, int i10, int i11)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120813/109ae6e4/attachment.html>