diff -ru gd-1.8.4/Makefile gd-1.8.4-patched/Makefile
--- gd-1.8.4/Makefile	Thu Feb 22 18:03:43 2001
+++ gd-1.8.4-patched/Makefile	Wed Jun 13 21:54:32 2001
@@ -1,9 +1,11 @@
 #Depending on your system, you will need to modify this makefile.
 
+PREFIX=/usr/local
+
 #If you do not have gcc, change the setting for COMPILER, but you must
 #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
 #compiler; get gcc if you are still using it). 
-COMPILER=gcc
+COMPILER=cc
 
 #If the ar command fails on your system, consult the ar manpage
 #for your system. 
@@ -12,7 +14,8 @@
 #If you don't have FreeType, libjpeg and/or Xpm installed, including the
 #header files, uncomment this (default). You really must install
 #libpng and zlib to get anywhere if you wish to create PNG images.
-CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG
+CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG \
+	-DHAVE_LIBFREETYPE
 
 #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
 #variation of this and comment out the line above. See also LIBS below.
@@ -30,7 +33,7 @@
 #Some systems are very picky about link order. They don't all agree
 #on the right order, either.
 
-LIBS=-lgd -lpng -lz -lm
+LIBS=-lgd -lpng -ljpeg -lz -lfreetype
 
 #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
 #variation of this and comment out the line above. Note that
@@ -45,7 +48,7 @@
 #ensure that the version of gd you are installing is used, and not an 
 #older release in your directory tree somewhere.
 
-INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
+INCLUDEDIRS=-I. -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include/X11 -I$(PREFIX)/include
 
 #Typical install locations for freetype, zlib, xpm and libpng libraries.
 #If yours are somewhere else, other than a standard location
@@ -55,16 +58,16 @@
 #on your system can't cause conflicts while building a new one.
 #This line shouldn't hurt if you don't actually have some of the
 #optional libraries and directories.
-LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
+LIBDIRS=-L. -L$(PREFIX)/lib -L/usr/X11R6/lib
 
 #Location where libgd.a should be installed by "make install".
-INSTALL_LIB=/usr/local/lib
+INSTALL_LIB=$(DESTDIR)$(PREFIX)/lib
 
 #Location where .h files should be installed by "make install".
-INSTALL_INCLUDE=/usr/local/include
+INSTALL_INCLUDE=$(DESTDIR)$(PREFIX)/include
 
 #Location where useful non-test programs should be installed by "make install".
-INSTALL_BIN=/usr/local/bin
+INSTALL_BIN=$(DESTDIR)$(PREFIX)/bin
 
 #
 #
diff -ru gd-1.8.4/gdcache.h gd-1.8.4-patched/gdcache.h
--- gd-1.8.4/gdcache.h	Tue Feb  6 20:44:02 2001
+++ gd-1.8.4-patched/gdcache.h	Wed Jun 13 21:58:15 2001
@@ -40,7 +40,9 @@
 /* header                                                */
 /*********************************************************/
 
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #ifndef NULL
 #define NULL (void *)0
 #endif