ncl/patch

   1 diff -Naur ncl_ncarg-5.2.1_old//ncarg2d/src/libncarg/ezmap/mapngb.c ncl_ncarg-5.2.1_new//ncarg2d/src/libncarg/ezmap/mapngb.c
   2 --- ncl_ncarg-5.2.1_old//ncarg2d/src/libncarg/ezmap/mapngb.c    2010-11-18 09:33:33.000000000 -0500
   3 +++ ncl_ncarg-5.2.1_new//ncarg2d/src/libncarg/ezmap/mapngb.c    2010-11-18 09:33:33.000000000 -0500
   4 @@ -1,6 +1,7 @@
   5  /*
   6   * C routines needed to read a PNG file.
   7   */
   8 +#define int_p_NULL (int*)NULL
   9
  10  #include <math.h>
  11  #include <ncarg/c.h>
  12
  13 diff -Naur ncl_ncarg-5.2.1_old//ncarview/src/lib/libncarg_ras/hdf.c ncl_ncarg-5.2.1_new//ncarview/src/lib/libncarg_ras/hdf.c
  14 --- ncl_ncarg-5.2.1_old//ncarview/src/lib/libncarg_ras/hdf.c    2010-07-24 14:55:56.000000000 -0500
  15 +++ ncl_ncarg-5.2.1_new//ncarview/src/lib/libncarg_ras/hdf.c    2010-10-18 17:47:41.000000000 -0500
  16 @@ -51,9 +51,9 @@
  17  #include <fcntl.h>
  18  #include <string.h>
  19  #include <ncarg/c.h>
  20 -#include <hdf/hdf.h>
  21 -#include <hdf/df.h>
  22 -#include <hdf/dfgr.h>
  23 +#include <hdf.h>
  24 +#include <df.h>
  25 +#include <dfgr.h>
  26  #include "ncarg_ras.h"
  27  #include "hdfP.h"
  28  #include "options.h"
  29 diff -Naur ncl_ncarg-5.2.1_old//ni/src/ncl/NclHDF.c ncl_ncarg-5.2.1_new//ni/src/ncl/NclHDF.c
  30 --- ncl_ncarg-5.2.1_old//ni/src/ncl/NclHDF.c    2010-07-24 14:55:12.000000000 -0500
  31 +++ ncl_ncarg-5.2.1_new//ni/src/ncl/NclHDF.c    2010-10-18 17:46:45.000000000 -0500
  32 @@ -29,7 +29,7 @@
  33  #endif
  34  #include "defs.h"
  35  #define HAVE_NETCDF
  36 -#include <hdf/mfhdf.h>
  37 +#include <mfhdf.h>
  38  #include "NclData.h"
  39  #include "NclFileInterfaces.h"
  40  #include <math.h>
  41 diff -Naur ncl_ncarg-5.2.1_old//ni/src/ncl/NclHDFEOS.c ncl_ncarg-5.2.1_new//ni/src/ncl/NclHDFEOS.c
  42 --- ncl_ncarg-5.2.1_old//ni/src/ncl/NclHDFEOS.c 2010-07-24 14:55:12.000000000 -0500
  43 +++ ncl_ncarg-5.2.1_new//ni/src/ncl/NclHDFEOS.c 2010-10-18 17:46:25.000000000 -0500
  44 @@ -28,7 +28,7 @@
  45  #endif
  46  #include "defs.h"
  47  #define HAVE_NETCDF
  48 -#include <hdf/mfhdf.h>
  49 +#include <mfhdf.h>
  50  #include "NclDataDefs.h"
  51  #include "NclFileInterfaces.h"
  52  #include "NclData.h"
  53 diff -Naur ncl_ncarg-5.2.1_old//ni/src/ncl/NclHDFEOS5.c ncl_ncarg-5.2.1_new//ni/src/ncl/NclHDFEOS5.c
  54 --- ncl_ncarg-5.2.1_old//ni/src/ncl/NclHDFEOS5.c        2010-07-24 14:55:12.000000000 -0500
  55 +++ ncl_ncarg-5.2.1_new//ni/src/ncl/NclHDFEOS5.c        2010-10-18 17:47:00.000000000 -0500
  56 @@ -28,7 +28,7 @@
  57  #endif
  58  #include "defs.h"
  59  #define HAVE_NETCDF
  60 -#include <hdf/mfhdf.h>
  61 +#include <mfhdf.h>
  62  #include "NclDataDefs.h"
  63  #include "NclData.h"
  64  #include "NclFileInterfaces.h"
  65 diff -Naur ncl_ncarg-6.0.0_old//common/src/fontcap/yMakefile ncl_ncarg-6.0.0//common/src/fontcap/yMakefile
  66 --- ncl_ncarg-6.0.0_old//common/src/fontcap/yMakefile   2011-05-27 13:52:46.000000000 -0500
  67 +++ ncl_ncarg-6.0.0//common/src/fontcap/yMakefile   2011-06-06 19:48:20.899527909 -0500
  68 @@ -43,7 +43,7 @@
  69  # Rule for processing fontcaps
  70  .SUFFIXES: .fc
  71
  72 -.fc:
  73 +.fc: $(FONTC)
  74     @echo " Processing fontcap $@"
  75     @$(FONTC) $< $@
  76
  77 diff -Naur ncl_ncarg-6.0.0_old//ni/src/ncl/yMakefile ncl_ncarg-6.0.0//ni/src/ncl/yMakefile
  78 --- ncl_ncarg-6.0.0_old//ni/src/ncl/yMakefile   2011-05-27 13:53:25.000000000 -0500
  79 +++ ncl_ncarg-6.0.0//ni/src/ncl/yMakefile   2011-06-06 19:49:12.542860565 -0500
  80 @@ -141,7 +141,7 @@
  81  #elif defined(Darwin)
  82  DODS_LIBS  = -lnc-dap -ldap -ldapclient -lcurl -lxml2 -lpthread -lssl
  83  #elif defined(linux)
  84 -DODS_LIBS  = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lidn -ldl
  85 +DODS_LIBS  = -lcurl -lpthread
  86  #else
  87  DODS_LIBS  = -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lssl
  88  #endif