diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index d811d506e2a9..77dbced78a54 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index fafb51839248..0a9ba962c815 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.4.tar.gz) = d5ab4746c220949d300daeafc00fcdcd
+MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac
index 645f72cfa48b..89e342477f1b 100644
--- a/graphics/gd/files/patch-ac
+++ b/graphics/gd/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Feb  2 05:23:56 2001
-+++ Makefile	Mon Feb 12 18:44:56 2001
+--- Makefile.orig	Thu Feb 22 09:03:43 2001
++++ Makefile	Sat Feb 24 16:25:23 2001
 @@ -3,11 +3,11 @@
  #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
@@ -18,11 +18,11 @@
  
  #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.
--CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
--	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
-+CFLAGS+=-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
+-#CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
+-#	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
++CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
 +.if defined(WITH_X11)
-+CFLAGS+=-DHAVE_LIBXPM
++CFLAGS+=-DHAVE_LIBXPM 
 +.endif
 +
 +.if defined(JISX0208)
@@ -35,14 +35,14 @@
  #Some systems are very picky about link order. They don't all agree
  #on the right order, either.
  
--#LIBS=-lgd -lpng -lz
+-LIBS=-lgd -lpng -lz -lm
 +LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm
  
  #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
  #Xpm requires X11. See also CFLAGS above.
  
--LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
+-#LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
 +.if defined(WITH_X11)
 +LIBS+=-lXpm -lX11
 +.endif
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index d811d506e2a9..77dbced78a54 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
diff --git a/graphics/gd1/distinfo b/graphics/gd1/distinfo
index fafb51839248..0a9ba962c815 100644
--- a/graphics/gd1/distinfo
+++ b/graphics/gd1/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.4.tar.gz) = d5ab4746c220949d300daeafc00fcdcd
+MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac
index 645f72cfa48b..89e342477f1b 100644
--- a/graphics/gd1/files/patch-ac
+++ b/graphics/gd1/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Feb  2 05:23:56 2001
-+++ Makefile	Mon Feb 12 18:44:56 2001
+--- Makefile.orig	Thu Feb 22 09:03:43 2001
++++ Makefile	Sat Feb 24 16:25:23 2001
 @@ -3,11 +3,11 @@
  #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
@@ -18,11 +18,11 @@
  
  #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.
--CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
--	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
-+CFLAGS+=-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
+-#CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
+-#	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
++CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
 +.if defined(WITH_X11)
-+CFLAGS+=-DHAVE_LIBXPM
++CFLAGS+=-DHAVE_LIBXPM 
 +.endif
 +
 +.if defined(JISX0208)
@@ -35,14 +35,14 @@
  #Some systems are very picky about link order. They don't all agree
  #on the right order, either.
  
--#LIBS=-lgd -lpng -lz
+-LIBS=-lgd -lpng -lz -lm
 +LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm
  
  #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
  #Xpm requires X11. See also CFLAGS above.
  
--LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
+-#LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
 +.if defined(WITH_X11)
 +LIBS+=-lXpm -lX11
 +.endif
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index d811d506e2a9..77dbced78a54 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
diff --git a/graphics/gd2/distinfo b/graphics/gd2/distinfo
index fafb51839248..0a9ba962c815 100644
--- a/graphics/gd2/distinfo
+++ b/graphics/gd2/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.4.tar.gz) = d5ab4746c220949d300daeafc00fcdcd
+MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac
index 645f72cfa48b..89e342477f1b 100644
--- a/graphics/gd2/files/patch-ac
+++ b/graphics/gd2/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Feb  2 05:23:56 2001
-+++ Makefile	Mon Feb 12 18:44:56 2001
+--- Makefile.orig	Thu Feb 22 09:03:43 2001
++++ Makefile	Sat Feb 24 16:25:23 2001
 @@ -3,11 +3,11 @@
  #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
@@ -18,11 +18,11 @@
  
  #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.
--CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
--	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
-+CFLAGS+=-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
+-#CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
+-#	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
++CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
 +.if defined(WITH_X11)
-+CFLAGS+=-DHAVE_LIBXPM
++CFLAGS+=-DHAVE_LIBXPM 
 +.endif
 +
 +.if defined(JISX0208)
@@ -35,14 +35,14 @@
  #Some systems are very picky about link order. They don't all agree
  #on the right order, either.
  
--#LIBS=-lgd -lpng -lz
+-LIBS=-lgd -lpng -lz -lm
 +LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm
  
  #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
  #Xpm requires X11. See also CFLAGS above.
  
--LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
+-#LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
 +.if defined(WITH_X11)
 +LIBS+=-lXpm -lX11
 +.endif