[148974] trunk/dports/math/qrupdate

[dstrubbe at macports.org]

Revision: 148974
          https://trac.macports.org/changeset/148974
Author:   dstrubbe at macports.org
Date:     2016-05-23 18:57:49 -0700 (Mon, 23 May 2016)
Log Message:
-----------
qrupdate: Fix test phase with +g95 (needed to modify test/Makefile too). Remove useless partch. Consolidate blocks.

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

Removed Paths:
-------------
    trunk/dports/math/qrupdate/files/

Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile	2016-05-24 01:49:14 UTC (rev 148973)
+++ trunk/dports/math/qrupdate/Portfile	2016-05-24 01:57:49 UTC (rev 148974)
@@ -33,14 +33,20 @@
 destroot.args       PREFIX=${prefix} LAPACK=""
 test.args           PREFIX=${prefix} LAPACK=""
 
-patchfiles          patch-Makefile.diff
-
-post-patch {
+post-extract {
     # Mac install program does not support -D flag.
     reinplace "s|install -D|install|"  ${worksrcpath}/src/Makefile
 
     # Running ranlib on static libraries make universal builds a little more complicated.
     reinplace "s|ar -cr |libtool -o |"  ${worksrcpath}/src/Makefile
+
+    if {[variant_isset g95]} {
+        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
+        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile
+        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/test/Makefile
+    } else {
+        reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf
+    }
 }
 
 # Fortran compilers cannot cross-compile
@@ -72,15 +78,4 @@
     test.args-append        BLAS="${linalglib}"
 }
 
-if {[variant_isset g95]} {
-    post-patch {
-        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
-        reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/src/Makefile
-    }
-} else {
-    post-patch {
-        reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf
-    }
-}
-
 test.run    yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160523/49a2f642/attachment.html>