Changeset 82401

Timestamp:

08/12/11 20:37:54 (4 years ago)

Author:

ryandesign@…

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

File:

• trunk/dports/science/root/Portfile (modified) (6 diffs)

trunk/dports/science/root/Portfile

@@ -6 +6 @@
 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 \
@@ -37 +37 @@
                     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
@@ -47 +43 @@
     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
@@ -56 +60 @@
 }
 
-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 \
@@ -86 +87 @@
                     --with-xpm-libdir=${prefix}/lib
 
+pre-build {
+    build.args      CC=${configure.cc} \
+                    CXX=${configure.cxx} \
+                    F77=${configure.f77}
+}
+
 use_parallel_build  no
 
@@ -248 +255 @@
 }
 
-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