6 files changed, 55 insertions, 22 deletions

diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index 439ce18b719f..025f2f914f42 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	grads
-PORTVERSION=	1.9b3
-PORTREVISION=	3
+PORTVERSION=	1.9b4
 CATEGORIES=	graphics science math
 MASTER_SITES=	ftp://grads.iges.org/grads/1.9/:src \
 		ftp://grads.iges.org/grads/:other
 DISTNAME=	${PORTNAME}-${PORTVERSION}
-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}:src \
+DISTFILES=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}:src \
 		example.tar.gz:other
-EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The Grid Analysis and Display System
diff --git a/graphics/grads/distinfo b/graphics/grads/distinfo
index 750b288c3690..07eb6c80e2f3 100644
--- a/graphics/grads/distinfo
+++ b/graphics/grads/distinfo
@@ -1,6 +1,6 @@
-MD5 (grads-1.9b3-src.tar.gz) = e09427e20cddecd3e57ee9540856ced8
-SHA256 (grads-1.9b3-src.tar.gz) = 53fbb361a03d80ed942932850c7d8e132f4052819f086883e75bb0495c45e6ba
-SIZE (grads-1.9b3-src.tar.gz) = 2761953
+MD5 (grads-src-1.9b4.tar.gz) = 7f77f10a456921bc16f2e0605ae129b6
+SHA256 (grads-src-1.9b4.tar.gz) = d7dde5bec1e9d0223073043a948faeb02c1b1f8ab4274294cc40419274811933
+SIZE (grads-src-1.9b4.tar.gz) = 2844584
 MD5 (example.tar.gz) = 1e152c120a1781debdddfdf90435089e
 SHA256 (example.tar.gz) = c14427b22911c20aae3c3fca8e52796f61c7a0e2d0071614b56bbc6c307e345c
 SIZE (example.tar.gz) = 1647527
diff --git a/graphics/grads/files/patch-configure b/graphics/grads/files/patch-configure
index 53b6c2613375..eaf5eddb5f48 100644
--- a/graphics/grads/files/patch-configure
+++ b/graphics/grads/files/patch-configure
@@ -1,35 +1,35 @@
 $FreeBSD$
 
---- configure.orig	2004-03-12 08:24:26.000000000 -0800
-+++ configure	2009-01-19 23:01:33.000000000 -0800
-@@ -5123,7 +5123,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line 5124 "configure"
- #include "confdefs.h"
+--- configure.orig	2005-05-23 08:04:40.000000000 -0700
++++ configure	2009-01-20 21:01:00.000000000 -0800
+@@ -6835,7 +6835,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 -#include <freq.h>
 +#include <X11/libsx/freq.h>
  _ACEOF
- if { (eval echo "$as_me:5128: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -7216,7 +7216,7 @@
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -9866,7 +9866,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldf  $LIBS"
 +LIBS="-ldf -ljpeg -lsz -lz  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 7221 "configure"
- #include "confdefs.h"
-@@ -7261,7 +7261,7 @@
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -9917,7 +9917,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lmfhdf  $LIBS"
 +LIBS="-lmfhdf -ldf -ljpeg -lsz -lz $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 7266 "configure"
- #include "confdefs.h"
-@@ -9031,7 +9031,7 @@
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -11916,7 +11916,7 @@
       ga_lib_suffix='.a'
    fi
  
diff --git a/graphics/grads/files/patch-src_bufrscan.c b/graphics/grads/files/patch-src_bufrscan.c
new file mode 100644
index 000000000000..86a0ef24b31e
--- /dev/null
+++ b/graphics/grads/files/patch-src_bufrscan.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+
+--- src/bufrscan.c.orig	2009-01-20 21:16:09.000000000 -0800
++++ src/bufrscan.c	2009-01-20 21:16:20.000000000 -0800
+@@ -5,6 +5,7 @@
+ 
+ /* bufrscan.c written by Joe Wielgosz */
+ 
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/graphics/grads/files/patch-src_grads.h b/graphics/grads/files/patch-src_grads.h
new file mode 100644
index 000000000000..be4b2ac3a14e
--- /dev/null
+++ b/graphics/grads/files/patch-src_grads.h
@@ -0,0 +1,12 @@
+$FreeBSD$
+
+--- src/grads.h.orig	2009-01-20 21:06:54.000000000 -0800
++++ src/grads.h	2009-01-20 21:07:06.000000000 -0800
+@@ -11,6 +11,7 @@
+ 
+ /* kk 020624 --- change for 64bit seek K.Komine mf */
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <gabufr.h>
diff --git a/graphics/grads/files/patch-src_wgrib.c b/graphics/grads/files/patch-src_wgrib.c
new file mode 100644
index 000000000000..d4335bbb35e5
--- /dev/null
+++ b/graphics/grads/files/patch-src_wgrib.c
@@ -0,0 +1,10 @@
+--- src/wgrib.c.orig	2009-01-20 21:11:09.000000000 -0800
++++ src/wgrib.c	2009-01-20 21:11:28.000000000 -0800
+@@ -6,6 +6,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>