diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index 448607ff119..38325a56c2d 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2002/03/21 21:25:53 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2002/07/21 01:48:42 naddy Exp $
 
 COMMENT=	"approximate grep (fast approximate pattern-matching tool)"
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 
-MAKE_FLAGS=	CFLAGS='${CFLAGS}'
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 ALL_TARGET=
 
diff --git a/textproc/agrep/patches/patch-agrep_h b/textproc/agrep/patches/patch-agrep_h
new file mode 100644
index 00000000000..b2c01ea7f64
--- /dev/null
+++ b/textproc/agrep/patches/patch-agrep_h
@@ -0,0 +1,16 @@
+$OpenBSD: patch-agrep_h,v 1.1 2002/07/21 01:48:42 naddy Exp $
+--- agrep.h.orig	Fri Jan 17 20:15:13 1992
++++ agrep.h	Sun Jul 21 03:40:26 2002
+@@ -1,10 +1,10 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <math.h>
+ #include <ctype.h>
+ #include "re.h"
+ 
+-extern unsigned char *strcpy(), *strncpy(), *strcat();
+-extern int strlen();
+ #define CHAR	unsigned char
+ #define MAXPAT 128
+ #define MAXPATT 256
diff --git a/textproc/agrep/patches/patch-follow_c b/textproc/agrep/patches/patch-follow_c
new file mode 100644
index 00000000000..769334b37f6
--- /dev/null
+++ b/textproc/agrep/patches/patch-follow_c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-follow_c,v 1.1 2002/07/21 01:48:42 naddy Exp $
+--- follow.c.orig	Sun Jul 21 03:32:22 2002
++++ follow.c	Sun Jul 21 03:33:14 2002
+@@ -3,14 +3,12 @@
+    construction.						*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "re.h"
+ 
+-extern char *strncpy(), *strcat(), *strcpy();
+-extern int  strlen();
+-
+ #define TRUE	1
+ 
+-extern char *malloc();
+ extern Pset pset_union(); 
+ extern int pos_cnt;
+ extern Re_node parse();
diff --git a/textproc/agrep/patches/patch-mgrep_c b/textproc/agrep/patches/patch-mgrep_c
new file mode 100644
index 00000000000..9d6a386c779
--- /dev/null
+++ b/textproc/agrep/patches/patch-mgrep_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-mgrep_c,v 1.1 2002/07/21 01:48:42 naddy Exp $
+--- mgrep.c.orig	Sun Jul 21 03:43:32 2002
++++ mgrep.c	Sun Jul 21 03:43:47 2002
+@@ -1,6 +1,7 @@
+ /* Copyright (c) 1991 Sun Wu and Udi Manber.  All Rights Reserved. */
+ /* multipattern matcher */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #define MAXPAT  256
+ #define MAXLINE 1024
diff --git a/textproc/agrep/patches/patch-parse_c b/textproc/agrep/patches/patch-parse_c
new file mode 100644
index 00000000000..06487aafea2
--- /dev/null
+++ b/textproc/agrep/patches/patch-parse_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-parse_c,v 1.1 2002/07/21 01:48:42 naddy Exp $
+--- parse.c.orig	Sun Jul 21 03:41:39 2002
++++ parse.c	Sun Jul 21 03:41:53 2002
+@@ -3,6 +3,7 @@
+    tree for that regular expression.				*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "re.h"
+ 
+ #define FALSE	0
diff --git a/textproc/agrep/patches/patch-sgrep_c b/textproc/agrep/patches/patch-sgrep_c
new file mode 100644
index 00000000000..2e81dec2ed6
--- /dev/null
+++ b/textproc/agrep/patches/patch-sgrep_c
@@ -0,0 +1,10 @@
+$OpenBSD: patch-sgrep_c,v 1.1 2002/07/21 01:48:42 naddy Exp $
+--- sgrep.c.orig	Sun Jul 21 03:42:51 2002
++++ sgrep.c	Sun Jul 21 03:43:05 2002
+@@ -1,5 +1,6 @@
+ /* Copyright (c) 1991 Sun Wu and Udi Manber.  All Rights Reserved. */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #define MAXSYM  256
+ #define MAXMEMBER 8192
diff --git a/textproc/agrep/patches/patch-utilities_c b/textproc/agrep/patches/patch-utilities_c
new file mode 100644
index 00000000000..aacaf19a610
--- /dev/null
+++ b/textproc/agrep/patches/patch-utilities_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-utilities_c,v 1.1 2002/07/21 01:48:42 naddy Exp $
+--- utilities.c.orig	Sun Jul 21 03:44:01 2002
++++ utilities.c	Sun Jul 21 03:44:17 2002
+@@ -2,6 +2,7 @@
+    and manipulating regular expression syntax trees.	*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "re.h"
+ 
+ /************************************************************************/