Changeset 80349

Timestamp:

07/10/11 01:57:28 (4 years ago)

Author:

takeshi@…

Message:

emos: reverted to r80345. dependency to emos from grib_api was removed in r80348

File:

• trunk/dports/science/emos/Portfile (modified) (4 diffs)

trunk/dports/science/emos/Portfile

@@ -6 +6 @@
 name                emos
 version             000382
-revision            1
+revision            2
 platforms           darwin
 maintainers         takeshi
@@ -21 +21 @@
     The Interpolation library (EMOSLIB) includes Interpolation software \
     and GRIB, BUFR, CREX encoding/decoding routines.
+
+depends_build       port:grib_api
 
 post-patch {
@@ -49 +51 @@
     file copy -force ${worksrcpath}/Makefile.in ${worksrcpath}/Makefile
     reinplace "s:reals:R64:" ${worksrcpath}/Makefile
-# skip grib_api_merging (grib_api and emos depend upon each other)
-    reinplace "s:glue::" ${worksrcpath}/Makefile
-    foreach d {gribex pbio bufrdc bufrtables crexdc interpolation fft} {
+    reinplace "s:glue:grib_api_merging:" ${worksrcpath}/Makefile
+    foreach d {gribex pbio bufrdc bufrtables crexdc interpolation fft grib_api_merging} {
         file copy -force ${worksrcpath}/${d}/Makefile.in ${worksrcpath}/${d}/Makefile
         reinplace "s:reals:R64:" ${worksrcpath}/${d}/Makefile
@@ -58 +59 @@
         reinplace "s:\$(ARCH)\$(CNAME)\$(R64)\$(A64):site:" ${worksrcpath}/${d}/Makefile
     }
+    reinplace "s:I\$(GRIB_API_PATH):I${prefix}:" ${worksrcpath}/grib_api_merging/Makefile
     reinplace "s:`cat -s .r64`:R64:" ${worksrcpath}/install
     reinplace "s:`cat -s .emos`:${destroot}${prefix}/lib/${name}:" ${worksrcpath}/install