[145263] trunk/dports/science/libemos

30 Jan 2016

Revision: 145263
          https://trac.macports.org/changeset/145263
Author:   takeshi@macports.org
Date:     2016-01-29 22:25:48 -0800 (Fri, 29 Jan 2016)
Log Message:
-----------
emos: update to 4.3.3. add lib dependencies. move bin to lib/libemos/bin

Modified Paths:
--------------
    trunk/dports/science/libemos/Portfile
    trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
    trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff

Added Paths:
-----------
    trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff

Modified: trunk/dports/science/libemos/Portfile
===================================================================

--- trunk/dports/science/libemos/Portfile	2016-01-30 02:10:53 UTC (rev 145262)
+++ trunk/dports/science/libemos/Portfile	2016-01-30 06:25:48 UTC (rev 145263)
@@ -6,8 +6,7 @@
 PortGroup cmake     1.0
 
 name                libemos
-version             4.0.6
-revision            3
+version             4.3.3
 platforms           darwin
 maintainers         takeshi
 license             Apache-2
@@ -16,8 +15,9 @@
 homepage            https://software.ecmwf.int/wiki/display/EMOS
 master_sites        https://software.ecmwf.int/wiki/download/attachments/3473472
 distname            ${name}-${version}-Source
-checksums           sha1    515761fbcdbefd0340028f0ce0ae1862a3917359 \
-                    rmd160  764ed42453b55b8cfa028612fb9e243b2370f3e6
+checksums           rmd160  4db38498e95f46c382f6efc32463b4e52d97e3b9 \
+                    sha256 5b14bae3b13091a19702bdecea97e1be99c4dbad6ca8d5ea4b1d3b62259f5ed1
+
 long_description \
     The Interpolation library (EMOSLIB) includes Interpolation software \
     and BUFR & CREX encoding/decoding routines.
@@ -27,20 +27,35 @@
 cmake.out_of_source yes
 
 patchfiles          patch-libemos-dp-CMakeLists.txt.diff \
-                    patch-libemos-sp-CMakeLists.txt.diff
+                    patch-libemos-sp-CMakeLists.txt.diff \
+                    patch-cmake-contrib-FindFFTW.cmake.diff
 
-depends_build-append \
-                    port:grib_api
+depends_lib         port:fftw-3 \
+                    port:grib_api \
+                    port:jasper \
+                    port:libpng \
+                    port:openjpeg \
+                    port:zlib
 
+compilers.enforce_fortran \
+                    port:fftw-3
+
 if {![fortran_variant_isset]} {
     default_variants    +gcc5
 }
 
+configure.args-append \
+                    -DFFTW_ROOT=${prefix}
+
 post-destroot {
     ln -s ${prefix}/lib/libemos.a ${destroot}${prefix}/lib/libemos.R32.D64.I32.a
     ln -s ${prefix}/lib/libemosR64.a ${destroot}${prefix}/lib/libemos.D64.D64.I32.a
+    file mkdir ${destroot}${prefix}/lib/${name}
+    file rename ${destroot}${prefix}/bin ${destroot}${prefix}/lib/${name}/
 }
 
+notes               "Executables are installed in ${prefix}/lib/${name}/bin."
+
 livecheck.type      regex
 livecheck.url       ${homepage}
 livecheck.regex     {libemos-([0-9]\.[0-9]\.[0-9])-Source.tar.gz}

Added: trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff
===================================================================
--- trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff	                        (rev 0)
+++ trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff	2016-01-30 06:25:48 UTC (rev 145263)
@@ -0,0 +1,93 @@
+--- cmake/contrib/FindFFTW.cmake.orig	2015-03-28 03:54:15.000000000 +0900
++++ cmake/contrib/FindFFTW.cmake	2016-01-30 15:07:01.000000000 +0900
+@@ -83,21 +83,21 @@
+     NO_DEFAULT_PATH
+   )
+ 
+-  find_library(
+-    FFTWF_LIB
+-    NAMES "fftw3f"
+-    PATHS ${FFTW_ROOT}
+-    PATH_SUFFIXES "lib" "lib64"
+-    NO_DEFAULT_PATH
+-  )
+-
+-  find_library(
+-    FFTWL_LIB
+-    NAMES "fftw3l"
+-    PATHS ${FFTW_ROOT}
+-    PATH_SUFFIXES "lib" "lib64"
+-    NO_DEFAULT_PATH
+-  )
++#  find_library(
++#    FFTWF_LIB
++#    NAMES "fftw3f"
++#    PATHS ${FFTW_ROOT}
++#    PATH_SUFFIXES "lib" "lib64"
++#    NO_DEFAULT_PATH
++#  )
++
++#  find_library(
++#    FFTWL_LIB
++#    NAMES "fftw3l"
++#    PATHS ${FFTW_ROOT}
++#    PATH_SUFFIXES "lib" "lib64"
++#    NO_DEFAULT_PATH
++#  )
+ 
+   #find includes
+   find_path(
+@@ -116,18 +116,18 @@
+     PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
+   )
+ 
+-  find_library(
+-    FFTWF_LIB
+-    NAMES "fftw3f"
+-    PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
+-  )
++#  find_library(
++#    FFTWF_LIB
++#    NAMES "fftw3f"
++#    PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
++#  )
+ 
+ 
+-  find_library(
+-    FFTWL_LIB
+-    NAMES "fftw3l"
+-    PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
+-  )
++#  find_library(
++#    FFTWL_LIB
++#    NAMES "fftw3l"
++#    PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
++#  )
+ 
+   find_path(
+     FFTW_INCLUDES
+@@ -137,11 +137,12 @@
+ 
+ endif( FFTW_ROOT )
+ 
+-set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})
++#set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})
++set(FFTW_LIBRARIES ${FFTW_LIB})
+ 
+-if(FFTWL_LIB)
+-  set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})
+-endif()
++#if(FFTWL_LIB)
++#  set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})
++#endif()
+ 
+ set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SAV} )
+ 
+@@ -149,4 +150,5 @@
+ find_package_handle_standard_args(FFTW DEFAULT_MSG
+                                   FFTW_INCLUDES FFTW_LIBRARIES)
+ 
+-mark_as_advanced(FFTW_INCLUDES FFTW_LIBRARIES FFTW_LIB FFTWF_LIB FFTWL_LIB)
+\ No newline at end of file
++#mark_as_advanced(FFTW_INCLUDES FFTW_LIBRARIES FFTW_LIB FFTWF_LIB FFTWL_LIB)
++mark_as_advanced(FFTW_INCLUDES FFTW_LIBRARIES FFTW_LIB)

Modified: trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff	2016-01-30 02:10:53 UTC (rev 145262)
+++ trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff	2016-01-30 06:25:48 UTC (rev 145263)
@@ -1,11 +1,12 @@
---- libemos-dp/CMakeLists.txt.orig	2015-05-11 19:31:46.000000000 +0900
-+++ libemos-dp/CMakeLists.txt	2015-06-21 14:08:22.000000000 +0900
-@@ -24,6 +24,6 @@
- #install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
- #              libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
+--- libemos-dp/CMakeLists.txt.orig	2015-10-27 23:05:24.000000000 +0900
++++ libemos-dp/CMakeLists.txt	2016-01-30 12:49:59.000000000 +0900
+@@ -39,7 +39,7 @@
+ #  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+ #               libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
  #else()
--install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
--              libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
-+#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-+#              libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
+-  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+-               libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
++#  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
++#               libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
  #endif()
+ 

Modified: trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff	2016-01-30 02:10:53 UTC (rev 145262)
+++ trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff	2016-01-30 06:25:48 UTC (rev 145263)
@@ -1,11 +1,12 @@
---- libemos-sp/CMakeLists.txt.orig	2015-05-11 19:31:46.000000000 +0900
-+++ libemos-sp/CMakeLists.txt	2015-06-21 14:08:11.000000000 +0900
-@@ -29,6 +29,6 @@
- #install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
- #             libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
+--- libemos-sp/CMakeLists.txt.orig	2015-10-27 23:03:03.000000000 +0900
++++ libemos-sp/CMakeLists.txt	2016-01-30 12:49:48.000000000 +0900
+@@ -44,7 +44,7 @@
+ #  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+ #               libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
  #else()
--install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
--             libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
-+#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-+#             libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
+-  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+-               libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
++#  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
++#               libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
  #endif()
+

    

takeshi＠macports.org

tags

participants (1)