--- Makefile.PL.orig	Thu Mar 23 03:20:12 2000
+++ Makefile.PL	Sun Apr 23 17:53:41 2000
@@ -4,15 +4,12 @@
 my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
 
 # CHECK AND ADJUST
-my @extrainc    = qw(-I/usr/local/include -I/usr/local/include/gd); 
-my @extrasearch = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
-my @extralibs   = qw(-lgd -lpng -lttf -lz -ljpeg);
+my @extrainc    = qw(-I/usr/local/include -I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11); 
+my @extrasearch = qw(-L/usr/X11R6/lib -L/usr/local/lib );
+my @extralibs;
+push @extralibs, @extrasearch, '-lgd', '-lpng', '-lttf', '-lz', '-ljpeg';
 push @extralibs, '-lm' unless $^O eq 'MSWin32';
-
-# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified 
-if ($^O ne 'freebsd' && $^O ne 'MSWin32') { 
-  push @extralibs,'-lX11','-lXpm'; 
-} 
+push @extralibs, '-lXpm -lX11' unless $^O eq 'MSWin32';
 
 WriteMakefile(
     'NAME'	=> 'GD',