[154019] trunk/dports/science/LORENE

thibaut at macports.org thibaut at macports.org
Tue Oct 18 14:01:48 CEST 2016


Revision: 154019
          https://trac.macports.org/changeset/154019
Author:   thibaut at macports.org
Date:     2016-10-18 05:01:47 -0700 (Tue, 18 Oct 2016)
Log Message:
-----------
LORENE: fix archflags in debug builds, remove -lX11 from LIB_PGPLOT, add usagenotes.

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-18 08:05:32 UTC (rev 154018)
+++ trunk/dports/science/LORENE/Portfile	2016-10-18 12:01:47 UTC (rev 154019)
@@ -9,7 +9,7 @@
 
 name                LORENE
 version	            0.0.0~cvs${cvs.date}
-revision            1
+revision            2
 
 categories          science
 maintainers         thibaut openmaintainer
@@ -44,8 +44,10 @@
     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} ${configure.cxx_archflags}|g" local_settings
-    reinplace -W ${worksrcpath} "s|@FFLAGS@|${configure.fflags} ${configure.f90_archflags}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@CXXFLAGS@|${configure.cxxflags}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@CXX_ARCHFLAGS@|${configure.cxx_archflags}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@FFLAGS@|${configure.fflags}|g" local_settings
+    reinplace -W ${worksrcpath} "s|@F90_ARCHFLAGS@|${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
@@ -68,3 +70,11 @@
     copy ${worksrcpath}/Codes ${destroot}${prefix}/lib/lorene/
 }
 
+notes "
++--- LORENE Usage note -----------------------------------------------------
+| To compile LORENE code, you should run:
+|   export HOME_LORENE=${prefix}/lib/lorene
+| Codes are provided in \$HOME_LORENE/Codes. To use them, copy them to some
+| place were your have write access.
++---------------------------------------------------------------------------
+"

Modified: trunk/dports/science/LORENE/files/local_settings
===================================================================
--- trunk/dports/science/LORENE/files/local_settings	2016-10-18 08:05:32 UTC (rev 154018)
+++ trunk/dports/science/LORENE/files/local_settings	2016-10-18 12:01:47 UTC (rev 154019)
@@ -17,11 +17,11 @@
 
 # Options for the C++ compiler to produce the optimized library:
 # -------------------------------------------------------------
-CXXFLAGS = @CXXFLAGS@ -DNDEBUG -fPIC
+CXXFLAGS = @CXX_ARCHFLAGS@ @CXXFLAGS@ -DNDEBUG -fPIC
 
 # Options for the C++ compiler to produce the library for debugging:
 # -----------------------------------------------------------------
-CXXFLAGS_G = -g -fPIC
+CXXFLAGS_G = @CXX_ARCHFLAGS@ -g -fPIC
 
 # Path for the include files:
 # --------------------------
@@ -37,11 +37,11 @@
 
 # Options for the Fortran 77 compiler to produce the optimized library:
 # ---------------------------------------------------------------------
-F77FLAGS =  @FFLAGS@ -ffixed-form -ffixed-line-length-none -fPIC
+F77FLAGS =  @F90_ARCHFLAGS@ @FFLAGS@ -ffixed-form -ffixed-line-length-none -fPIC
 
 # Options for the Fortran 77 compiler to produce the library for debugging:
 # ------------------------------------------------------------------------
-F77FLAGS_G = -ffixed-form -ffixed-line-length-none -g -fPIC
+F77FLAGS_G = @F90_ARCHFLAGS@ -ffixed-form -ffixed-line-length-none -g -fPIC
 
 #===============================#
 #           MAKEDEPEND	        #
@@ -74,7 +74,7 @@
 
 # Graphical libraries: PGPLOT, PNG and X11
 # ----------------------------------------
-LIB_PGPLOT = -lcpgplot -lpgplot -lX11
+LIB_PGPLOT = -lcpgplot -lpgplot
 
 # GNU scientific library
 # -----------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161018/7ce791c6/attachment-0002.html>


More information about the macports-changes mailing list