Changeset 80257

Timestamp:

07/07/11 15:43:30 (4 years ago)

Author:

takeshi@…

Message:

ncarg: updated for 6.0.0

Location:

trunk/dports/science/ncarg

Files:

• Portfile (modified) (6 diffs)
• files/patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff (deleted)

trunk/dports/science/ncarg/Portfile

@@ -5 +5 @@
 
 name                        ncarg
-version                     5.2.1
-revision                    1
+version                     6.0.0
 categories                  science
 maintainers                 takeshi
@@ -20 +19 @@
 homepage                    http://www.ncl.ucar.edu/
 platforms                   darwin
-master_sites                http://www.earthsystemgrid.org/
+master_sites                http://www.earthsystemgrid.org/:ncl
+master_sites                http://www.ncl.ucar.edu/Download/files/:g2clib
 
-distname                    ncl_${name}_src-${version}
+distname                    ncl_${name}-${version}
 worksrcdir                  ncl_${name}-${version}
-checksums           md5     c7ba4847961f38bbbac30ac042eab43a \
-                    sha1    069d3c2a20b58358c6547a70bdb9e65bc9de6881 \
-                    rmd160  ed16827e4a4d3588f23f8ac9d2e48429d06e05f8
+set ncl_src             ${distname}${extract.suffix}
+set g2clib_version      1.2.1
+set g2clib_src          g2clib_with_changes-${g2clib_version}${extract.suffix}
+set g2clib_worksrcdir   g2clib-${g2clib_version}-patches
+distfiles           ${ncl_src}:ncl \
+                    ${g2clib_src}:g2clib
+checksums   ${ncl_src} \
+                    md5     0afca904b8f51abdd3efada4c0dbaa42 \
+                    sha1    949dc8fc823256c1a036aa06a3e68805a4099009 \
+                    rmd160  e5214051eb23e8cc58e0d579a382c80476d570d7 \
+            ${g2clib_src} \
+                    md5     253327b963bf054c69f70df227e83cfb \
+                    sha1    a0ae0849da6c2aba427cf4384c88433e67cc8f77 \
+                    rmd160  0bea38746c9fb4eeeedb4546a5cb8b1a3936f7ee
 
-depends_lib                 port:jpeg6b     \
-                            path:lib/pkgconfig/cairo.pc:cairo \
+
+depends_lib                 path:lib/pkgconfig/cairo.pc:cairo \
                             port:proj       \
                             port:gdal       \
@@ -46 +57 @@
 universal_variant           no
 
-fetch {
-    if {![file exists ${distpath}/${distfiles}]} {
+pre-fetch {
+    if {![file exists ${distpath}/${distname}${extract.suffix}]} {
         xinstall -d ${distpath}
-        ui_error "Download ${distfiles} manually and place it in ${distpath}.\n \
+        ui_error "Download ${distname}${extract.suffix} manually and place it in ${distpath}.\n \
             See instructions on ${homepage}/Download/index.shtml"
     }
@@ -56 +67 @@
 set usedap y
 
-patchfiles  patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff
 if {$build_arch eq "x86_64"} {
     patchfiles-append           patch-config-ymake.diff
 }
 post-patch {
+    reinplace "s|INC=-I/usr/include|INC=${configure.cppflags} ${configure.cflags}|" ${workpath}/${g2clib_worksrcdir}/makefile
+    reinplace "s|CC=gcc -fPIC|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile
+    if {$build_arch eq "x86_64" || $build_arc eq "ppc64"} {
+        reinplace "s|-DUSE_PNG$|-DUSE_PNG -D__64BIT__|" ${workpath}/${g2clib_worksrcdir}/makefile
+    }
     foreach f {Darwin Darwin_Intel} {
         if {[variant_isset g95]} {
@@ -104 +119 @@
 
 pre-configure {
+    system "cd ${workpath}/${g2clib_worksrcdir}; make all"
+    file copy ${workpath}/${g2clib_worksrcdir}/libgrib2c.a ${worksrcpath}
     system "cd ${worksrcpath}/config; \
         make -f Makefile.ini; \
@@ -128 +145 @@
 y
 y
-${prefix}/lib/jpeg6b/lib ${prefix}/lib/ ${prefix}/lib/hdfeos5/lib ${prefix}/lib
-${prefix}/include/freetype2 ${prefix}/include/udunits2 ${prefix}/lib/jpeg6b/include ${prefix}/lib/hdfeos5/include ${prefix}/include
+y
+y
+y
+${worksrcpath} ${prefix}/lib ${prefix}/lib/hdfeos5/lib ${prefix}/lib
+${prefix}/include/freetype2 ${prefix}/include/udunits2 ${prefix}/lib/hdfeos5/include ${prefix}/include