[82401] trunk/dports/science/root/Portfile

[ryandesign at macports.org]

Revision: 82401
          http://trac.macports.org/changeset/82401
Author:   ryandesign at macports.org
Date:     2011-08-12 20:37:54 -0700 (Fri, 12 Aug 2011)
Log Message:
-----------
root: fix value of --with-cxx in gcc variants; move common code out of the gcc variants; set build args in pre-build, not pre-configure; do reinplacing in post-patch, not pre-configure; fix license

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

Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile	2011-08-13 01:19:18 UTC (rev 82400)
+++ trunk/dports/science/root/Portfile	2011-08-13 03:37:54 UTC (rev 82401)
@@ -5,10 +5,10 @@
 
 name                root
 version             5.30.00
-revision            1
+revision            2
 categories          science
 maintainers         gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
-license             LGPLv2.1
+license             LGPL-2.1+
 description         Root cern data analysis framework
 long_description    The ROOT system provides a set of frameworks with all \
                     the functionality needed to handle and analyze large amounts \
@@ -36,17 +36,21 @@
                     port:libpng \
                     port:tiff
 
-pre-configure {
-    build.args      CC=${configure.cc} \
-                    CXX=${configure.cxx} \
-                    F77=${configure.f77}
-
+post-patch {
     reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
     reinplace "s|\"/usr/include\"|\"${prefix}/include/\" \"/usr/include\"|g" ${worksrcpath}/configure
     reinplace "s|/usr/lib |${prefix}/lib /usr/lib |g" ${worksrcpath}/configure
     reinplace "s|/usr/include |${prefix}/include /usr/include |g" ${worksrcpath}/configure
     reinplace "s|\"/usr/lib\"|\"${prefix}/lib/\" \"/usr/lib\"g|" ${worksrcpath}/configure
+}
 
+pre-configure {
+    configure.args-append \
+                    --with-cc=${configure.cc} \
+                    --with-cxx=${configure.cxx} \
+                    --with-ld=${configure.cxx} \
+                    --with-f77=${configure.f77}
+
     # the build type (32 or 64 bit) -must- be for first argument
     if {${build_arch} == "i386" || ${build_arch} == "ppc"} {
        configure.pre_args macosx --prefix=${prefix}
@@ -55,10 +59,7 @@
     }
 }
 
-configure.args      --with-cc=${configure.cc} \
-                    --with-f77=${configure.f77} \
-                    --with-cxx=${configure.cxx} \
-                    --docdir=${prefix}/share/doc/${name} \
+configure.args      --docdir=${prefix}/share/doc/${name} \
                     --libdir=${prefix}/lib/root \
                     --testdir=${prefix}/share/root/test \
                     --tutdir=${prefix}/share/root/tutorials \
@@ -85,6 +86,12 @@
                     --with-x11-libdir=${prefix}/lib \
                     --with-xpm-libdir=${prefix}/lib
 
+pre-build {
+    build.args      CC=${configure.cc} \
+                    CXX=${configure.cxx} \
+                    F77=${configure.f77}
+}
+
 use_parallel_build  no
 
 universal_variant   no
@@ -247,29 +254,17 @@
     depends_lib-append      port:pythia
 }
 
-variant gcc44 conflicts gcc45 description {Enables compilation using MacPorts gcc 4.4 compiler} {
-    configure.args-append   --with-cc=gcc-mp-4.4
-    configure.args-append   --with-cxx=cpp-mp-4.4
-    configure.args-append   --with-f77=gfortran-mp-4.4
-    configure.args-append   --with-ld=g++-mp-4.4
+variant gcc44 conflicts gcc45 description {Compile using MacPorts gcc 4.4} {
     configure.compiler      macports-gcc-4.4
     depends_lib-append      port:gcc44
 }
 
-variant gcc45 conflicts gcc44 description {Enables compilation using MacPorts gcc 4.5 compiler} {
-    configure.args-append   --with-cc=gcc-mp-4.5
-    configure.args-append   --with-cxx=cpp-mp-4.5
-    configure.args-append   --with-f77=gfortran-mp-4.5
-    configure.args-append   --with-ld=g++-mp-4.5
+variant gcc45 conflicts gcc44 description {Compile using MacPorts gcc 4.5} {
     configure.compiler      macports-gcc-4.5
     depends_lib-append      port:gcc45
 }
 
-#variant gcc46 conflicts gcc44 gcc45 description {Enables compilation using MacPorts gcc 4.6 compiler} {
-#    configure.args-append   --with-cc=gcc-mp-4.6
-#    configure.args-append   --with-cxx=cpp-mp-4.6
-#    configure.args-append   --with-f77=gfortran-mp-4.6
-#    configure.args-append   --with-ld=g++-mp-4.6
+#variant gcc46 conflicts gcc44 gcc45 description {Compile using MacPorts gcc 4.6} {
 #    configure.compiler      macports-gcc-4.6
 #    depends_lib-append      port:gcc46
 #}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110812/c7618c7d/attachment.html>