regen patches, in the hope it helps on Darwin.

4 files changed, 28 insertions, 27 deletions

diff --git a/graphics/gri/distinfo b/graphics/gri/distinfo
index af9f0239c8e..cb612b6f2db 100644
--- a/graphics/gri/distinfo
+++ b/graphics/gri/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 08:45:07 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/01/31 19:54:43 wiz Exp $
 
 SHA1 (gri-2.12.5.tgz) = edd4f4a98eb391a30f084699c4e47ff173e5766b
 RMD160 (gri-2.12.5.tgz) = dc4d2bb530ba6f4c758e01e0fed6cb06ab32e1b6
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = b86bce9c8fd91aac20cabaebec4960f7d9cbfc4c
 SHA1 (patch-ab) = 5302c06072690224b05c3a80162cb7b81e4a43bf
 SHA1 (patch-ac) = b5be8b3b2d9c2ff2ea04fe84cbb2b0d8eea1e164
 SHA1 (patch-ad) = ebcc1fdbc4fe52cdcb0f5788acaa637174be4550
-SHA1 (patch-ae) = b796adf6b5532e64aa105f8cef6afabfc5a15fa5
-SHA1 (patch-af) = aee92b408a7fb6c1ff88fcf29570781ce78d65e6
-SHA1 (patch-ag) = 5e1af320155dc567e00595702157bfd48b9361a0
+SHA1 (patch-ae) = e0fe02ac90f48b159f397a63ab0d3a27181e99ab
+SHA1 (patch-af) = 7269f38bf3388e0a18bab7f9bc44fd225d51a485
+SHA1 (patch-ag) = 0ecfb6c83468c6aaa94525e57fcf93157053d114
diff --git a/graphics/gri/patches/patch-ae b/graphics/gri/patches/patch-ae
index 571fb5a86cc..7906cefd965 100644
--- a/graphics/gri/patches/patch-ae
+++ b/graphics/gri/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+$NetBSD: patch-ae,v 1.2 2006/01/31 19:54:43 wiz Exp $
 
---- startup.msg.orig	Wed May  1 23:22:02 2002
-+++ startup.msg	Wed May  1 23:22:26 2002
-@@ -4,6 +4,6 @@
+--- startup.msg.orig	2003-05-20 21:15:55.000000000 +0200
++++ startup.msg
+@@ -4,7 +4,7 @@
   Type `help' to view list of commands.
   Type `show license' to view license. 
  
@@ -11,3 +11,4 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
 + Examples at:     PREFIX/share/examples/gri
 + Manual at:       PREFIX/share/doc/html/gri/index.html
   Info Manual at:  gri
+  Resources at:    http://gri.sourceforge.net
diff --git a/graphics/gri/patches/patch-af b/graphics/gri/patches/patch-af
index 36b3e402362..4e1585634a5 100644
--- a/graphics/gri/patches/patch-af
+++ b/graphics/gri/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2002/08/11 14:34:16 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2006/01/31 19:54:43 wiz Exp $
 
---- gr.hh.orig	Wed Apr  3 14:09:30 2002
+--- gr.hh.orig	2003-05-20 21:15:54.000000000 +0200
 +++ gr.hh
-@@ -341,7 +341,7 @@ double lapse_rate(double S, double t, do
+@@ -352,7 +352,7 @@ double lapse_rate(double S, double t, do
  #endif
  
  // Time type (time_t, int, or long) varies per machine (ug).
diff --git a/graphics/gri/patches/patch-ag b/graphics/gri/patches/patch-ag
index d6b2114adf4..892be1a03a7 100644
--- a/graphics/gri/patches/patch-ag
+++ b/graphics/gri/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2003/07/10 08:27:39 jtb Exp $
+$NetBSD: patch-ag,v 1.3 2006/01/31 19:54:43 wiz Exp $
 
---- configure.orig
+--- configure.orig	2003-05-20 21:15:55.000000000 +0200
 +++ configure
-@@ -3696,66 +3696,75 @@
+@@ -3696,66 +3696,75 @@ done
  
  
  
@@ -75,6 +75,19 @@ $NetBSD: patch-ag,v 1.2 2003/07/10 08:27:39 jtb Exp $
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_netcdf_nc_open=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_netcdf_nc_open" >&5
++echo "${ECHO_T}$ac_cv_lib_netcdf_nc_open" >&6
++if test $ac_cv_lib_netcdf_nc_open = yes; then
++  HAVE_LIBNETCDF="YES"
++else
++  HAVE_LIBNETCDF=""
++fi
  
 -            echo "yes (in /usr/local/include/netcdf.h and /usr/local/lib/libnetcdf.a)"
 -	else
@@ -89,18 +102,6 @@ $NetBSD: patch-ag,v 1.2 2003/07/10 08:27:39 jtb Exp $
 -                cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBNETCDF 1
 -_ACEOF
-+ac_cv_lib_netcdf_nc_open=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_netcdf_nc_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_netcdf_nc_open" >&6
-+if test $ac_cv_lib_netcdf_nc_open = yes; then
-+  HAVE_LIBNETCDF="YES"
-+else
-+  HAVE_LIBNETCDF=""
-+fi
  
 -                echo "yes (in /usr/include/netcdf.h and /usr/lib/libnetcdf.a)"
 -            else
@@ -111,7 +112,6 @@ $NetBSD: patch-ag,v 1.2 2003/07/10 08:27:39 jtb Exp $
 -			LIBS="$LIBS -lnsl"
 -		    fi
 -                    echo "yes (in /boot/home/netcdf)"
-+
 +if test -n "$HAVE_LIBNETCDF" ; then
  		    cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBNETCDF 1