Fix build on -CURRENT.

Notified by:	bento

4 files changed, 38 insertions, 14 deletions

diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index dc228011624f..1930aa1c58b1 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -19,6 +19,4 @@ USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 USE_XPM=	yes
 
-NO_MAN=
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/gfe/files/patch-src:auxil.c b/x11-fonts/gfe/files/patch-src:auxil.c
index 92095db87660..0d56dfdc0ff4 100644
--- a/x11-fonts/gfe/files/patch-src:auxil.c
+++ b/x11-fonts/gfe/files/patch-src:auxil.c
@@ -12,18 +12,6 @@ diff -u src.dist/auxil.c src/auxil.c
  
  #include "auxil.h"
 Only in src.dist: auxil.o
-diff -u src.dist/bdf.c src/bdf.c
---- src.dist/bdf.c	Thu Dec 27 06:00:20 2001
-+++ src/bdf.c	Thu Dec 27 06:01:59 2001
-@@ -18,7 +18,7 @@
- #include <gtk/gtk.h>
- 
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "auxil.h"
- #include "bdf.h"
 diff -u src.dist/bitmap.c src/bitmap.c
 --- src.dist/bitmap.c	Thu Dec 27 06:00:20 2001
 +++ src/bitmap.c	Thu Dec 27 06:01:59 2001
diff --git a/x11-fonts/gfe/files/patch-src_bdf.c b/x11-fonts/gfe/files/patch-src_bdf.c
new file mode 100644
index 000000000000..5b41e3abebee
--- /dev/null
+++ b/x11-fonts/gfe/files/patch-src_bdf.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- src/bdf.c.orig	Tue Jun 27 12:36:09 2000
++++ src/bdf.c	Sat Nov 30 02:04:14 2002
+@@ -18,7 +18,8 @@
+ #include <gtk/gtk.h>
+ 
+ #include <ctype.h>
+-#include <malloc.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "auxil.h"
+ #include "bdf.h"
diff --git a/x11-fonts/gfe/files/patch-src_glyph.h b/x11-fonts/gfe/files/patch-src_glyph.h
new file mode 100644
index 000000000000..12dbc9c7cda5
--- /dev/null
+++ b/x11-fonts/gfe/files/patch-src_glyph.h
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/glyph.h.orig	Sat Nov 30 02:01:40 2002
++++ src/glyph.h	Sat Nov 30 02:06:16 2002
+@@ -20,7 +20,7 @@
+ #define __GFE_GLYPH_H__
+ 
+ #include <gtk/gtk.h>
+-#include <values.h>
++#include <limits.h>
+ 
+ /* macro for type casting */
+ #define GFE_GLYPH(glyph) ((GfeGlyph*)(glyph))
+@@ -29,7 +29,7 @@
+ #define GFE_GLYPH_NO_ENCODING (-1)
+ 
+ /* constant used to define undefined status of variables */
+-#define GFE_UNDEFINED         (MAXINT)
++#define GFE_UNDEFINED         (INT_MAX)
+ 
+ /* macro(s) to access member(s) of GfeGlyph structure */
+ #define GFE_GLYPH_TYPE(glyph)     (((glyph)->flags) & 0xFF)