[153999] trunk/dports/science/LORENE

[thibaut at macports.org]

Revision: 153999
          https://trac.macports.org/changeset/153999
Author:   thibaut at macports.org
Date:     2016-10-17 12:47:51 -0700 (Mon, 17 Oct 2016)
Log Message:
-----------
LORENE: use linear algebra port, deactivate the universal variant and pass the architecture flags, minor fixes.

Modified Paths:
--------------
    trunk/dports/science/LORENE/Portfile
    trunk/dports/science/LORENE/files/local_settings

Modified: trunk/dports/science/LORENE/Portfile
===================================================================
--- trunk/dports/science/LORENE/Portfile	2016-10-17 19:37:32 UTC (rev 153998)
+++ trunk/dports/science/LORENE/Portfile	2016-10-17 19:47:51 UTC (rev 153999)
@@ -1,17 +1,19 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem      1.0
-PortGroup       compilers 1.0
+PortSystem          1.0
+PortGroup           compilers 1.0
+PortGroup           linear_algebra 1.0
 
-cvs.date	    20160908
+cvs.date   	        20160908
 
-name		        LORENE
-version		        0.0.0~cvs${cvs.date}
+name                LORENE
+version	            0.0.0~cvs${cvs.date}
+revision            1
 
-categories	        science
-maintainers	        thibaut openmaintainer
-description	        Langage Objet pour la RElativité NumériquE
+categories          science
+maintainers         thibaut openmaintainer
+description         Langage Objet pour la RElativité NumériquE
 long_description    LORENE is a set of C++ classes to solve various problems \
                     arising in numerical relativity, and more generally in \
                     computational astrophysics. It provides tools to solve \
@@ -19,41 +21,41 @@
                     spectral methods.
 
 license             gpl-2+
-platforms	        darwin
+platforms           darwin
 
-homepage	        http://www.lorene.obspm.fr/
-master_sites	    https://people.debian.org/~thibaut/debian/pool/main/l/lorene/
-distname	        lorene
-distfiles	        ${distname}_${version}+dfsg.orig.tar.xz
+homepage            http://www.lorene.obspm.fr/
+master_sites        https://people.debian.org/~thibaut/debian/pool/main/l/lorene/
+distname            lorene
+distfiles           ${distname}_${version}+dfsg.orig.tar.xz
+use_xz              yes
 checksums           rmd160  36346f8d7a50acee20a5b81051af2e7fe5f188c1 \
                     sha256  ef797abc51ed8ae27c200f5b71fd0a3824d1fa310392dac57067de2e423222ed
-worksrcdir	        ${distname}-${version}+dfsg
+worksrcdir          ${distname}-${version}+dfsg
 
-depends_lib	        port:OpenBLAS \
-                    port:lapack \
-                    port:gsl \
+depends_lib         port:gsl \
                     port:fftw-3 \
-                    port:pgplot \
-                    port:xorg-libX11
+                    port:pgplot
 
 compilers.choose    cxx f77
 compilers.setup     require_fortran
+universal_variant   no
 
-configure	    {
+configure {
     file copy ${filespath}/local_settings ${worksrcpath}/
     reinplace -W ${worksrcpath} "s|@CXX@|${configure.cxx}|g" local_settings
-    reinplace -W ${worksrcpath} "s|@F77@| ${configure.f77} |g" local_settings
-    reinplace -W ${worksrcpath} "s|@CXXFLAGS@|${configure.cxxflags}|g" local_settings
-    reinplace -W ${worksrcpath} "s|@FFLAGS@|${configure.fflags}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@F77@|${configure.f77}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@CXXFLAGS@|${configure.cxxflags} ${configure.cxx_archflags}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@FFLAGS@|${configure.fflags} ${configure.f90_archflags}|g" local_settings
     reinplace -W ${worksrcpath} "s|@LDFLAGS@|${configure.ldflags}|g" local_settings
     reinplace -W ${worksrcpath} "s|@LIB_FORTRAN@|${compilers.libfortran}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@LIB_LAPACK@|${linalglib}|g" local_settings
 }
 
 build.env-append    HOME_LORENE=${worksrcpath}
 build.target        cpp fortran export
 use_parallel_build  no
 
-destroot            {
+destroot {
     xinstall -d ${destroot}${prefix}/lib/lorene/Lib
     xinstall {*}[glob ${worksrcpath}/Lib/*.a] ${destroot}${prefix}/lib/lorene/Lib/
     xinstall -d ${destroot}${prefix}/lib/lorene/C++/Include
@@ -63,5 +65,6 @@
     xinstall ${worksrcpath}/local_settings ${destroot}${prefix}/lib/lorene/
     xinstall -d ${destroot}${prefix}/lib/lorene/Devel
     xinstall {*}[glob ${worksrcpath}/Devel/*] ${destroot}${prefix}/lib/lorene/Devel/
-    exec cp -a ${worksrcpath}/Codes ${destroot}${prefix}/lib/lorene/
+    copy ${worksrcpath}/Codes ${destroot}${prefix}/lib/lorene/
 }
+

Modified: trunk/dports/science/LORENE/files/local_settings
===================================================================
--- trunk/dports/science/LORENE/files/local_settings	2016-10-17 19:37:32 UTC (rev 153998)
+++ trunk/dports/science/LORENE/files/local_settings	2016-10-17 19:47:51 UTC (rev 153999)
@@ -1,4 +1,4 @@
-	###############################################################
+###############################################################
 #
 #  Edit the following lines according to your implementation.
 #
@@ -66,15 +66,11 @@
 
 # C, C++ library, mathematical library and Fortran library
 # ---------------------------------------------------------
-ifeq ($(FFT_DIR),FFTW3)
 LIB_CXX = @LDFLAGS@ -lfftw3 @LIB_FORTRAN@ -lstdc++ -lm
-else 
-LIB_CXX = @LDFLAGS -lgfortran -lstdc++ -lm
-endif
 
 # Linear Algebra Package (LAPACK) library
 # ---------------------------------------
-LIB_LAPACK = -llapack -lblas
+LIB_LAPACK = @LIB_LAPACK@
 
 # Graphical libraries: PGPLOT, PNG and X11
 # ----------------------------------------
@@ -84,6 +80,3 @@
 # -----------------------------------
 LIB_GSL = -lgsl -lgslcblas
 
-
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161017/2251f99a/attachment-0002.html>