[58816] trunk/dports/math/qrupdate/Portfile

[blb at macports.org]

Revision: 58816
          http://trac.macports.org/changeset/58816
Author:   blb at macports.org
Date:     2009-10-05 14:49:24 -0700 (Mon, 05 Oct 2009)
Log Message:
-----------
math/qrupdate - add variant for gcc44 and cleanup things some, ticket #21855

Modified Paths:
--------------
    trunk/dports/math/qrupdate/Portfile

Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile	2009-10-05 21:30:16 UTC (rev 58815)
+++ trunk/dports/math/qrupdate/Portfile	2009-10-05 21:49:24 UTC (rev 58816)
@@ -18,20 +18,6 @@
                     sha1 679aa98ff823332ead25b5c5c9c01210155a510d \
                     md160 d1f120ae97d840bf7b932c7d18abb54360d7d1f6
 
-depends_build       port:gcc43
-
-patch {
-#    foreach f {Makeconf Makeconf.g95} {
-#        reinplace "s|PREFIX=/usr/local|PREFIX=${prefix}|" ${worksrcpath}/${f}
-#    }
-#    reinplace "s|\$\(PREFIX\)|\$(DESTDIR)\$(PREFIX)|g" ${worksrcpath}/src/Makefile
-    reinplace "s|gfortran|gfortran-mp-4.3|" ${worksrcpath}/Makeconf
-    if {[variant_isset g95]} {
-        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
-        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile
-    }
-}
-
 use_configure       no 
 build.target        lib
 destroot {
@@ -39,7 +25,28 @@
     system "ranlib ${destroot}${prefix}/lib/lib${name}.a"
 }
 
-variant g95 description {build with g95} {
-    depends_build-delete    port:gcc43
+variant g95 conflicts gcc43 gcc44 description {build with g95} {
     depends_build-append    port:g95
+    post-patch {
+        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
+        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile
+    }
 }
+
+variant gcc43 conflicts g95 gcc44 description {build with gcc43 fortran} {
+    depends_build-append    port:gcc43
+    post-patch {
+        reinplace "s|gfortran|gfortran-mp-4.3|" ${worksrcpath}/Makeconf
+    }
+}
+variant gcc44 conflicts g95 gcc43 description {build with gcc44 fortran} {
+    depends_build-append    port:gcc44
+    post-patch {
+        reinplace "s|gfortran|gfortran-mp-4.4|" ${worksrcpath}/Makeconf
+    }
+}
+
+if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
+    default_variants +gcc43
+}
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091005/28a6d89a/attachment-0001.html>