Ticket #40471: Portfile.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                ccpnmr
-version             2.3.0
+version             2.3.1r2
 set branch          [join [lrange [split $version .] 0 1] .]
 categories          science python
 maintainers         bromo.med.uc.edu:howarth
@@ -19 +19 @@
 homepage            http://www.ccpn.ac.uk/ccpn/software/ccpnmr-suite
 master_sites        http://www2.ccpn.ac.uk/download/ccpnmr/
 distname            analysis${version}
-checksums           rmd160  1124fa7d38fb6e709bbd078b630f6619bc433bd9 \
-                    sha256  b36ed5b773ca6b0d7a09ff705cf98256cbc093f57d51f6945ac021c5d2a380f1
+checksums           rmd160  f695780f5bce5f0c1e84080b8364b5bfaba2a0e9 \
+                    sha256  a9e47a24d84f7b8261c6c23a8607af5a6ba2f2db9e161a7f873794c1ba8663ef
 worksrcdir          ${name}
 depends_lib         port:py27-scipy port:mesa port:freeglut port:tk port:py27-tkinter
 patchfiles          ccpnmr.patch
@@ -77 +77 @@
     system "${python.bin} -O ${python.libdir}/compileall.py -d ${python.pkgd}/${name}/${name}${branch} ${destroot}${python.pkgd}/${name}/${name}${branch}"
 }
 
-variant gcc45 conflicts gcc46 gcc47 description {Build with GCC 4.5} {
+variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49  description {Build with GCC 4.5} {
     configure.compiler  macports-gcc-4.5
     set lib ${prefix}/lib/gcc45
 }
-variant gcc46 conflicts gcc45 gcc47 description {Build with GCC 4.6} {
+variant gcc46 conflicts gcc45 gcc47 gcc48 gcc49 description {Build with GCC 4.6} {
     configure.compiler  macports-gcc-4.6
     set lib ${prefix}/lib/gcc46
 }
-variant gcc47 conflicts gcc45 gcc46 description {Build with GCC 4.7} {
+variant gcc47 conflicts gcc45 gcc46 gcc48 gcc49 description {Build with GCC 4.7} {
     configure.compiler  macports-gcc-4.7
     set lib ${prefix}/lib/gcc47
 }
+variant gcc48 conflicts gcc45 gcc46 gcc47 gcc49 description {Build with GCC 4.7} {
+    configure.compiler  macports-gcc-4.8
+    set lib ${prefix}/lib/gcc48
+}
+variant gcc49 conflicts gcc45 gcc46 gcc47 gcc48 description {Build with GCC 4.7} {
+    configure.compiler  macports-gcc-4.9
+    set lib ${prefix}/lib/gcc49
+}
 
-if {![variant_isset gcc45] && ![variant_isset gcc46]} {
-    default_variants    +gcc47
+if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc49]} {
+    default_variants    +gcc48
 }