[104107] trunk/dports/science/ccpnmr

[larryv at macports.org]

Revision: 104107
          https://trac.macports.org/changeset/104107
Author:   larryv at macports.org
Date:     2013-03-15 21:19:10 -0700 (Fri, 15 Mar 2013)
Log Message:
-----------
ccpnmr: Add gcc* variants (maintainer timeout, #38261).

Modified Paths:
--------------
    trunk/dports/science/ccpnmr/Portfile
    trunk/dports/science/ccpnmr/files/ccpnmr.patch

Modified: trunk/dports/science/ccpnmr/Portfile
===================================================================
--- trunk/dports/science/ccpnmr/Portfile	2013-03-16 03:45:49 UTC (rev 104106)
+++ trunk/dports/science/ccpnmr/Portfile	2013-03-16 04:19:10 UTC (rev 104107)
@@ -5,7 +5,7 @@
 
 name                ccpnmr
 version             2.2.2
-revision            1
+revision            2
 set branch          [join [lrange [split $version .] 0 1] .]
 categories          science python
 maintainers         bromo.med.uc.edu:howarth
@@ -23,7 +23,7 @@
 checksums           md5     a3ede39ed484d261eb82137055dc66a1 \
                     sha1    825ad7487ef6191baac0e5aa3d0ec6a6ed94a04f
 worksrcdir          ${name}
-depends_lib         port:py27-scipy port:mesa port:freeglut port:tk port:py27-tkinter port:gcc45
+depends_lib         port:py27-scipy port:mesa port:freeglut port:tk port:py27-tkinter
 patchfiles          ccpnmr.patch
 use_configure       no
 
@@ -34,6 +34,8 @@
 set python.libdir ${python.prefix}/lib/python${python.branch}
 set python.include	${python.prefix}/include/python${python.branch}
 
+set lib ""
+
 post-patch {
     reinplace  "s|@PYTHON_BIN@|${python.bin}|g"   ${worksrcpath}/bin/analysis \
                                                   ${worksrcpath}/bin/formatConverter \
@@ -51,12 +53,13 @@
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt
     reinplace  "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt
     reinplace  "s|@PYTHON_INCL@|${python.include}|g" ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt
+    reinplace  "s|@CC@|${configure.cc}|g" ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt
+    reinplace  "s|@GCCLIB@|${lib}|g" ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt
 }
 pre-build {
     copy ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt ${worksrcpath}/ccpnmr${branch}/c/environment.txt
 }
 
-configure.compiler  macports-gcc-4.5
 build.args      CC=${configure.cc} ARCHFLAGS="${configure.cc_archflags}"
 build.dir       ${worksrcpath}/ccpnmr${branch}/c
 build.target    all links
@@ -74,3 +77,23 @@
 post-destroot {
     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} {
+    configure.compiler  macports-gcc-4.5
+    depends_lib-append  port:gcc45
+    set lib ${prefix}/lib/gcc45
+}
+variant gcc46 conflicts gcc45 gcc47 description {Build with GCC 4.6} {
+    configure.compiler  macports-gcc-4.6
+    depends_lib-append  port:gcc46
+    set lib ${prefix}/lib/gcc46
+}
+variant gcc47 conflicts gcc45 gcc46 description {Build with GCC 4.7} {
+    configure.compiler  macports-gcc-4.7
+    depends_lib-append  port:gcc47
+    set lib ${prefix}/lib/gcc47
+}
+
+if {![variant_isset gcc46] && ![variant_isset gcc47]} {
+    default_variants    +gcc45
+}

Modified: trunk/dports/science/ccpnmr/files/ccpnmr.patch
===================================================================
--- trunk/dports/science/ccpnmr/files/ccpnmr.patch	2013-03-16 03:45:49 UTC (rev 104106)
+++ trunk/dports/science/ccpnmr/files/ccpnmr.patch	2013-03-16 04:19:10 UTC (rev 104107)
@@ -127,7 +127,7 @@
 @@ -0,0 +1,56 @@
 +#Environment file for use with fink to build ccpnmr suite - environment.txt
 +
-+CC = gcc-mp-4.5
++CC = @CC@
 +LINK = $(CC)
 +MAKE = make
 +CO_NAME = -c $<
@@ -146,7 +146,7 @@
 +COPY_LIBRARIES = sh copySharedObjs
 +
 +OPENMP_FLAGS = -fopenmp
-+OPENMP_LIB  = -L at PREFIX@/lib/gcc45 -lgomp
++OPENMP_LIB  = -L at GCCLIB@ -lgomp
 +
 +GL_FLAG = -DUSE_GL_TRUE
 +
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130315/96d98971/attachment.html>