o Main modification

graphics/gd(based on 1.8.4) -> graphics/gd1 graphics/gd2(based on 2.0.15) -> graphics/gd graphics/p5-GD(based on 1.41) -> graphics/p5-GD1 graphics/p5-GD2(based on 2.07) -> graphics/p5-GD japanese/gd -> japanese/gd1 japanese/gd2 -> japanese/gd o Include some feature WITH_XPM(w/, w/o WITHOUT_X11) o Chase this modification o Fix build error [1] PR: ports/54540 Submitted by: Ports Fury Approved by: maintainer (blanket) Reported by: bento via kris [1]
author: Norikatsu Shigemura <nork@FreeBSD.org> 2003-08-18 16:15:10 +0000
committer: Norikatsu Shigemura <nork@FreeBSD.org> 2003-08-18 16:15:10 +0000
commit: efb928619b234d49b326a13f59a6e2ee354bf902 (patch)
tree: c62bd82140831e81442480b9cefc699e0c08f08d
parent: Update to 5.0.8. As reported by Paul Szabo in (diff)
80 files changed, 289 insertions, 1304 deletions
diff --git a/MOVED b/MOVED
index 76d531c3344d..d0aab5d0c372 100644
--- a/MOVED
+++ b/MOVED
@@ -516,3 +516,6 @@ net/openldap22|net/openldap22-server|2003-08-13|split into -client and -server
 x11-toolkits/gtk-industrial-theme|x11-toolkits/gnome-themes-extras|2003-08-14|gtk-industrial-theme is now included with gnome-themes-extras
 devel/gnomedebug||2003-08-17|remove stale, broken port
 devel/gide|devel/anjuta|2003-08-17|gide was superceded by anjuta
+graphics/gd2|graphics/gd|2003-08-19|Cleanup gd-related ports
+graphics/gd-nox11|graphics/gd|2003-08-19|Cleanup gd-related ports
+graphics/p5-GD2|graphics/p5-GD|2003-08-19|Cleanup gd-related ports
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index 1a8fe01e22b7..cb9d99cbe0ee 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	rmap
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro
 MASTER_SITES=	http://www.reza.net/rmap/
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Generates images of the Earth centered at a particular location
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MAN1=		rmap.1
 USE_GETOPT_LONG=yes
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index f0f1916da216..d68ed70bcb69 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	emboss
 PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.uk.embnet.org/pub/EMBOSS/old/ \
-		ftp://ftp.es.embnet.org/pub/software/emboss/EMBOSS/ \
+		ftp://ftp.es.embnet.org/pub/software/emboss/EMBOSS/old \
 		ftp://ftp.ebi.ac.uk/pub/software/unix/EMBOSS/
 DISTFILES=	${PORTNAME:U}-${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
@@ -19,9 +19,7 @@ EXTRACT_ONLY=	${PORTNAME:U}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	wjv@FreeBSD.org
 COMMENT=	A collection of open source tools for genetic sequence analysis
 
-BROKEN=		Checksum mismatch
-
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
@@ -35,7 +33,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include/gd" \
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 SCRIPTS_ENV+=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		MKDIR="${MKDIR}" RM="${RM}"
diff --git a/biology/genpak/Makefile b/biology/genpak/Makefile
index bbe6849ae57f..c6db35c12bab 100644
--- a/biology/genpak/Makefile
+++ b/biology/genpak/Makefile
@@ -8,16 +8,16 @@
 
 PORTNAME=	genpak
 PORTVERSION=	0.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 MASTER_SITES=	http://www.bioinformatics.org/genpak/download/
 DISTNAME=	gp-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GP is a set of small utilities to manipulate DNA sequences
+COMMENT=	A set of small utilities to manipulate DNA sequences
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_GMAKE=	yes
 MAKE_ENV=	GMAKE="${GMAKE}" MANPREFIX="${MANPREFIX}"
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index f98491bdf244..7c312ea79a94 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hamlib
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,7 +35,7 @@ PLIST_SUB+=	TCL="@comment "
 .endif
 
 .if defined(WITH_RIGMATRIX)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS+=	--with-rigmatrix
 PLIST_SUB+=	RIGMATRIX=""
 .else
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile
index 6fa1f5fffb9b..d7afe6bf4249 100644
--- a/databases/grass-i18n/Makefile
+++ b/databases/grass-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://grass.itc.it/grass5/source/ \
@@ -23,7 +23,7 @@ POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gd.4:${PORTSDIR}/graphics/gd2 \
+		gd.4:${PORTSDIR}/graphics/gd \
 		fftw.2:${PORTSDIR}/math/fftw \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -48,7 +48,6 @@ USE_GMAKE=	yes
 USE_AUTOCONF_VER=	213
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
-		--with-gd-includes=${LOCALBASE}/include/gd \
 		--with-tcltk-includes="${LOCALBASE}/include/tcl8.3 \
 					 ${LOCALBASE}/include/tk8.3" \
 		--with-postgres-includes=${LOCALBASE}/include/postgresql/internal/ \
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 6fa1f5fffb9b..d7afe6bf4249 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://grass.itc.it/grass5/source/ \
@@ -23,7 +23,7 @@ POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gd.4:${PORTSDIR}/graphics/gd2 \
+		gd.4:${PORTSDIR}/graphics/gd \
 		fftw.2:${PORTSDIR}/math/fftw \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -48,7 +48,6 @@ USE_GMAKE=	yes
 USE_AUTOCONF_VER=	213
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
-		--with-gd-includes=${LOCALBASE}/include/gd \
 		--with-tcltk-includes="${LOCALBASE}/include/tcl8.3 \
 					 ${LOCALBASE}/include/tk8.3" \
 		--with-postgres-includes=${LOCALBASE}/include/postgresql/internal/ \
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index bb6dceac4363..5a2dc7dca7d7 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	cvsgraph
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Graph the life story of a file under CVS or RCS
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
@@ -34,7 +34,7 @@ USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-freetype2-inc=${X11BASE}/include/freetype2/freetype \
 		--with-freetype2-lib=${X11BASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include/gd \
+		--with-gd-inc=${LOCALBASE}/include \
 		--with-gd-lib=${LOCALBASE}/lib \
 		--with-jpeg-inc=${LOCALBASE}/include \
 		--with-jpeg-lib=${LOCALBASE}/lib \
diff --git a/devel/veepee/Makefile b/devel/veepee/Makefile
index 53564ae06f67..c7060973f078 100644
--- a/devel/veepee/Makefile
+++ b/devel/veepee/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	veepee
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python gnome
 MASTER_SITES=	http://www.river-bank.demon.co.uk/software/
 DISTNAME=	VeePee-${PORTVERSION}
@@ -15,9 +15,7 @@ DISTNAME=	VeePee-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A user orientated scripting environment for embedding in applications
 
-BROKEN=		"Does not configure"
-
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_GNOME=	gnomelibs
 USE_XLIB=	yes
@@ -25,7 +23,7 @@ USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} ${PYTHON_LIBS}"
-CONFIGURE_ARGS=	--with-gd-includes=${LOCALBASE}/include/gd \
+CONFIGURE_ARGS=	--with-gd-includes=${LOCALBASE}/include \
 		--disable-kde
 .if exists(/usr/lib/libcrypto.a)
 PYTHON_LIBS+=	-lssl -lcrypto
diff --git a/graphics/Makefile b/graphics/Makefile
index 4700d5a9a7a8..8f9f605657e8 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -77,8 +77,7 @@
     SUBDIR += gauche-gl
     SUBDIR += gcolor
     SUBDIR += gd
-    SUBDIR += gd-nox11
-    SUBDIR += gd2
+    SUBDIR += gd1
     SUBDIR += gdal
     SUBDIR += gdchart
     SUBDIR += gdk-pixbuf
@@ -248,7 +247,7 @@
     SUBDIR += p5-GD-Graph
     SUBDIR += p5-GD-Graph3d
     SUBDIR += p5-GD-TextUtil
-    SUBDIR += p5-GD2
+    SUBDIR += p5-GD1
     SUBDIR += p5-GraphViz
     SUBDIR += p5-GraphViz-Data-Structure
     SUBDIR += p5-Graphics-ColorNames
diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile
index 8f64c2671b54..0daa3c6d0507 100644
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	ecg2png
 PORTVERSION=	0.30
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cardiothink.com/downloads/ecg2png/
 
 MAINTAINER=	ports@freebsd.org
 COMMENT=	"Converts scanned 12-lead electrocardiograms into PNGs"
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -22,7 +22,7 @@ USE_REINPLACE=	yes
 USE_QT_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-QTCPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/gd
+QTCPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lqt$$|-lqt-mt ${PTHREAD_LIBS}|g' ${WRKSRC}/ecg2png/Makefile.in
diff --git a/graphics/gd-nox11/Makefile b/graphics/gd-nox11/Makefile
deleted file mode 100644
index 97548c9fc57a..000000000000
--- a/graphics/gd-nox11/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	gnustep-art
-# Date created:		29.Mar.2003
-# Whom:			dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	graphics
-PKGNAMESUFFIX=		-nox11
-
-MAINTAINER=	dinoex@FreeBSD.org
-
-WITHOUT_X11=		yes
-WITHOUT_XPM=		yes
-MASTERDIR?=	${.CURDIR}/../gd2
-
-.if exists(${.CURDIR}/Makefile.local)
-.include "${.CURDIR}/Makefile.local"
-.endif
-
-.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index afc96e0f11ee..eb459fc819fc 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,14 +1,13 @@
 # New ports collection makefile for:	gd
-# Date created:         27 Mar 1998
-# Whom:                 jeff@cetlink.net
+# Date created:				27 Mar 1998
+# Whom:					jeff@cetlink.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gd
-PORTVERSION=	1.8.4
-PORTREVISION=	7
-PORTEPOCH=	1
+PORTVERSION=	2.0.15
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
@@ -22,22 +21,52 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-MAKEFILE=	${FILESDIR}/Makefile.lib
+MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKEFILE=	${FILESDIR}/Makefile.bsd
 INSTALLS_SHLIB=	yes
 
-.if defined(WITH_X11)
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_XPM)
+.if defined(WITHOUT_X11)
+LIB_DEPENDS+=	Xpm:${PORTSDIR}/graphics/xpm
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM -DXPM_NOX
+LDFLAGS+=	-L${X11BASE}/lib -lXpm
+.else
 USE_XPM=	yes
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDFLAGS+=	-L${X11BASE}/lib -lXpm -lX11
+.endif
+.endif
+
+.if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \
+    (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
+CPPFLAGS+=	-DLZW_LICENSED
+.endif
+
+.if defined(GD_FONTS)
+USE_PERL5_BUILD=	yes
+SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
 .endif
 
 pre-everything::
-.if !defined(WITH_X11)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Xpm support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_X11=yes\""
-	@${ECHO_MSG}
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "gd has the following tunables:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITH_XPM=yes			Turns on Xpm support"
+	@${ECHO_MSG} "	WITH_XPM=yes WITHOUT_X11=yes	Turns on X-less Xpm support"
+.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != "YES"
+	@${ECHO_MSG} "	WITH_LZW=yes			Turns on GIF compression support"
 .endif
+	@${ECHO_MSG} ""
 
 post-extract:
-	@${CP} ${FILESDIR}/gd_gif_in.c ${WRKSRC}
+	@${CP} ${FILESDIR}/g* ${WRKSRC}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index ed8787c2bd67..4297649caf8a 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,2 +1 @@
-MD5 (gd-1.8.4.tar.gz) = 2aef76e79f206f9798233f025f5dd28d
-MD5 (gd_gif_in.c.bz2) = 54132aea09471bb997672436dd9a1a96
+MD5 (gd-2.0.15.tar.gz) = 6ededf633b4fd054662ec123c7825fbb
diff --git a/graphics/gd2/files/Makefile.bsd b/graphics/gd/files/Makefile.bsd
index a6530d92a53e..a6530d92a53e 100644
--- a/graphics/gd2/files/Makefile.bsd
+++ b/graphics/gd/files/Makefile.bsd
diff --git a/graphics/gd/files/Makefile.lib b/graphics/gd/files/Makefile.lib
deleted file mode 100644
index 8306444eb839..000000000000
--- a/graphics/gd/files/Makefile.lib
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-PREFIX?=	/usr/local
-SHLIB_VER?=	2
-
-LIB=		gd1
-LIBDIR=		${PREFIX}/lib
-SHLIB_MAJOR=	${SHLIB_VER}
-SHLIB_MINOR=	0
-NOPROFILE=	yes
-NOOBJ=		yes
-
-INCS=		gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
-		gdfonts.h gdfontt.h
-INCSDIR=	${PREFIX}/include/gd
-INCDIR=		${INSCDIR}	# for pre-bsd.incs.mk API
-
-SRCS=		gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_ss.c \
-		gd_io_ss.c gd_png.c gd_jpeg.c gdxpm.c gdfontt.c gdfonts.c \
-		gdfontmb.c gdfontl.c gdfontg.c gdtables.c gdft.c gdttf.c \
-		gdcache.c gdkanji.c wbmp.c gd_wbmp.c gdhelpers.c gd_gif_in.c
-
-CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
-		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
-		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
-LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz
-
-.ifdef WITH_X11
-CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
-LDADD+=		-L${X11BASE}/lib -lXpm -lX11
-.endif
-
-beforeinstall:
-	mkdir -p ${INCSDIR}
-
-.include <bsd.lib.mk>
diff --git a/graphics/gd2/files/gd2togif.c b/graphics/gd/files/gd2togif.c
index d5fbb8921c3a..d5fbb8921c3a 100644
--- a/graphics/gd2/files/gd2togif.c
+++ b/graphics/gd/files/gd2togif.c
diff --git a/graphics/gd2/files/gd_biggif_out.c b/graphics/gd/files/gd_biggif_out.c
index 29ec90f87d56..29ec90f87d56 100644
--- a/graphics/gd2/files/gd_biggif_out.c
+++ b/graphics/gd/files/gd_biggif_out.c
diff --git a/graphics/gd/files/gd_gif_in.c b/graphics/gd/files/gd_gif_in.c
index 6e779c820963..fc1b587cc8b4 100644
--- a/graphics/gd/files/gd_gif_in.c
+++ b/graphics/gd/files/gd_gif_in.c
@@ -76,6 +76,18 @@ static void ReadImage (gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned
 
 int ZeroDataBlock;
 
+gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource)
+{
+        gdIOCtx         *in = gdNewSSCtx(inSource, NULL);
+        gdImagePtr      im;
+
+        im = gdImageCreateFromGifCtx(in);
+
+        in->gd_free(in);
+
+        return im;
+}
+
 gdImagePtr
 gdImageCreateFromGif(FILE *fdFile)
 {
@@ -84,7 +96,7 @@ gdImageCreateFromGif(FILE *fdFile)
 
         im = gdImageCreateFromGifCtx(fd);
 
-        fd->free(fd);
+        fd->gd_free(fd);
 
         return im;
 }
@@ -92,7 +104,7 @@ gdImageCreateFromGif(FILE *fdFile)
 gdImagePtr
 gdImageCreateFromGifCtx(gdIOCtxPtr fd)
 {
-       int imageNumber;
+/* 1.4       int imageNumber; */
        int BitPixel;
        int ColorResolution;
        int Background;
diff --git a/graphics/gd2/files/gd_gif_out.c b/graphics/gd/files/gd_gif_out.c
index bc8a4f06d54b..bc8a4f06d54b 100644
--- a/graphics/gd2/files/gd_gif_out.c
+++ b/graphics/gd/files/gd_gif_out.c
diff --git a/graphics/gd2/files/gd_lzw_out.c b/graphics/gd/files/gd_lzw_out.c
index ee130c5e5a38..ee130c5e5a38 100644
--- a/graphics/gd2/files/gd_lzw_out.c
+++ b/graphics/gd/files/gd_lzw_out.c
diff --git a/graphics/gd2/files/gdcmpgif.c b/graphics/gd/files/gdcmpgif.c
index 13c243014d2b..13c243014d2b 100644
--- a/graphics/gd2/files/gdcmpgif.c
+++ b/graphics/gd/files/gdcmpgif.c
diff --git a/graphics/gd2/files/giftogd2.c b/graphics/gd/files/giftogd2.c
index 3753b56ac4c6..3753b56ac4c6 100644
--- a/graphics/gd2/files/giftogd2.c
+++ b/graphics/gd/files/giftogd2.c
diff --git a/graphics/gd2/files/patch-gd.h b/graphics/gd/files/patch-gd.h
index 026f87b14b30..026f87b14b30 100644
--- a/graphics/gd2/files/patch-gd.h
+++ b/graphics/gd/files/patch-gd.h
diff --git a/graphics/gd/files/patch-gdcache.h b/graphics/gd/files/patch-gdcache.h
deleted file mode 100644
index 408a96443de6..000000000000
--- a/graphics/gd/files/patch-gdcache.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdcache.h.orig	Wed Feb  7 04:44:02 2001
-+++ gdcache.h	Fri Jul  4 21:58:32 2003
-@@ -40,7 +40,6 @@
- /* header                                                */
- /*********************************************************/
- 
--#include <malloc.h>
- #ifndef NULL
- #define NULL (void *)0
- #endif
diff --git a/graphics/gd2/files/patch-gdft.c b/graphics/gd/files/patch-gdft.c
index cdee3d88935b..cdee3d88935b 100644
--- a/graphics/gd2/files/patch-gdft.c
+++ b/graphics/gd/files/patch-gdft.c
diff --git a/graphics/gd/files/patch-gdkanji.c b/graphics/gd/files/patch-gdkanji.c
deleted file mode 100644
index 2162a7e95c38..000000000000
--- a/graphics/gd/files/patch-gdkanji.c
+++ /dev/null
@@ -1,87 +0,0 @@
---- gdkanji.c.orig	Fri Feb  2 05:23:56 2001
-+++ gdkanji.c	Wed Feb  7 20:59:08 2001
-@@ -103,14 +103,18 @@
- unsigned char *str;
- #endif
- {
--	static int whatcode;
-+	static int whatcode = ASCII;
-+	int oldcode = ASCII;
- 	int c, i;
- 	char *lang = NULL;
- 
- 	c = '\1';
- 	i = 0;
- 
--	if (whatcode == 0) whatcode = ASCII;
-+	if (whatcode != EUCORSJIS && whatcode != ASCII) {
-+		oldcode = whatcode;
-+		whatcode = ASCII;
-+	}
- 	
- 	while ((whatcode == EUCORSJIS || whatcode == ASCII) && c != '\0') {
- 		if ((c = str[i++]) != '\0') {
-@@ -167,7 +171,7 @@
- 				if ((c >= 64 && c <= 126) || (c >= 128 && c <= 160))
- 					whatcode = SJIS;
- 				else
--				if (c >= 253 && c >= 254) whatcode = EUC;
-+				if (c >= 253 && c <= 254) whatcode = EUC;
- 				else
- 				if (c >= 161 && c <= 252) whatcode = EUCORSJIS;
- 			}
-@@ -184,6 +188,8 @@
- 		debug("Kanji code detected at %d byte.", i);
- #endif
- 
-+	if (whatcode == EUCORSJIS && oldcode != ASCII) whatcode = oldcode;
-+
- 	if (whatcode == EUCORSJIS) {
- 		if (getenv ("LC_ALL")) lang = getenv ("LC_ALL");
- 		else
-@@ -310,7 +316,7 @@
- 			error("invalid code specification: \"%s\" or \"%s\"",
- 								EUCSTR, code);
- #endif
--		strcpy(to, from);
-+		ustrcpy(to, from);
- 		return;
- 	}
- 
-@@ -328,7 +334,7 @@
- 		else
- #endif
- 			error("something happen");
--		strcpy(to, from);
-+		ustrcpy(to, from);
- 		return;
- 	}
- 
-@@ -526,11 +532,10 @@
- 
- 	t = (unsigned char *)gdMalloc(BUFSIZ);
- 	any2eucjp(t, s, BUFSIZ);
--	i = strlen(t);
-+	i = strlen((const char *)t);
- 	gdFree(t);
- 	return i;
- }
--#endif
- 
- #ifdef DEBUG
- int main()
-@@ -543,7 +548,7 @@
- 	while ( (c = fgetc(stdin)) != '\n' && i < BUFSIZ ) input[i++] = c;
- 	input[i] = '\0';
- 
--	printf("input : %d bytes\n", strlen(input));
-+	printf("input : %d bytes\n", strlen((const char *)input));
- 	printf("output: %d bytes\n", strwidth(input));
- 
- 	output = (unsigned char *)gdMalloc(BUFSIZ);
-@@ -555,4 +560,5 @@
- 
- 	return 0;
- }
-+#endif
- #endif
diff --git a/graphics/gd2/files/patch-gdtest.c b/graphics/gd/files/patch-gdtest.c
index 85c855d4db02..85c855d4db02 100644
--- a/graphics/gd2/files/patch-gdtest.c
+++ b/graphics/gd/files/patch-gdtest.c
diff --git a/graphics/gd/files/patch-gdttf.c b/graphics/gd/files/patch-gdttf.c
deleted file mode 100644
index c7b8768a725f..000000000000
--- a/graphics/gd/files/patch-gdttf.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gdttf.c.orig	Fri Feb  2 05:23:56 2001
-+++ gdttf.c	Wed Feb  7 20:57:34 2001
-@@ -221,11 +221,10 @@
-     byte = *((unsigned char *) str);
- #ifdef JISX0208
-     if (0xA1 <= byte && byte <= 0xFE) {
--	int jiscode, ku, ten;
-+	int ku, ten;
- 
--	jiscode = 0x100 * (byte & 0x7F) + (str[1] & 0x7F);
--	ku = (jiscode >> 8) - 0x20;
--	ten = (jiscode % 256) - 0x20;
-+	ku = (byte & 0x7F) - 0x20;
-+	ten = (str[1] & 0x7F) - 0x20;
- 	if ( (ku < 1 || ku > 92) || (ten < 1 || ten > 94) ) {
-     		*chPtr = (Tcl_UniChar) byte;
-     		return 1;
diff --git a/graphics/gd/files/patch-gif b/graphics/gd/files/patch-gif
deleted file mode 100644
index e78b1e350e3f..000000000000
--- a/graphics/gd/files/patch-gif
+++ /dev/null
@@ -1,11 +0,0 @@
-This  patch  together  with  the old  implementation  (from  gd-1.5)  of
-gd_gif_in.c restore GD's ability to read GIF images. The writing of such
-images is troubled because of Unisys' zeal in patent enforcement.
-
---- gd.h	Tue Feb  6 14:44:01 2001
-+++ gd.h	Fri Jul 27 16:10:38 2001
-@@ -95,2 +95,4 @@
- gdImagePtr gdImageCreate(int sx, int sy);
-+gdImagePtr gdImageCreateFromGif(FILE *fd);
-+gdImagePtr gdImageCreateFromGifCtx(gdIOCtxPtr in);
- gdImagePtr gdImageCreateFromPng(FILE *fd);
diff --git a/graphics/gd2/files/patch-index.html b/graphics/gd/files/patch-index.html
index da061462fe6c..da061462fe6c 100644
--- a/graphics/gd2/files/patch-index.html
+++ b/graphics/gd/files/patch-index.html
diff --git a/graphics/gd/pkg-descr b/graphics/gd/pkg-descr
index f6ec333a65c6..f7507cc8d13f 100644
--- a/graphics/gd/pkg-descr
+++ b/graphics/gd/pkg-descr
@@ -1,23 +1,16 @@
-DESCRIPTION
+gd is a graphics library. It allows your code to quickly draw images
+complete with lines, arcs, text, multiple colors, cut and paste from
+other images, and flood fills, and write out the result as a PNG, GIF
+or JPEG file. This is particularly useful in World Wide Web applications,
+where PNG, GIF and JPEG are three of the formats accepted for inline
+images by most browsers.
 
-	gd is a graphics library. It allows your code to quickly draw images
-	complete with lines, arcs, text, multiple colors, cut and paste from
-	other images, and flood fills, and write out the result as a .PNG file.
-	This is particularly useful in World Wide Web applications, where .PNG
-	is the format used for inline images. 
-
-	gd is not a paint program. If you are looking for a paint program, you
-	are looking in the wrong place. If you are not a programmer, you are
-	looking in the wrong place.
-
-	gd does not provide for every possible desirable graphics operation.
-	It is not necessary or desirable for gd to become a kitchen-sink
-	graphics package, but version 1.7.3 incorporates most of the commonly
-	requested features for an 8-bit 2D package. Support for truecolor
-	images, JPEG and truecolor PNG is planned for version 2.0.
-
-AUTHOR
-	gd was written by Thomas Boutell and is currently distributed by 
-	boutell.com, Inc. 
+gd does  not provide for every possible desirable graphics operation,
+but version 2.0 does include most frequently requested features,
+including both truecolor and palette images, resampling (smooth
+resizing of truecolor images) and so forth.
 
 WWW: http://www.boutell.com/gd/
+
+- Alex Dupre
+sysadmin@alexdupre.com
diff --git a/graphics/gd/pkg-plist b/graphics/gd/pkg-plist
index b0daddfa56ee..a8b71306fc99 100644
--- a/graphics/gd/pkg-plist
+++ b/graphics/gd/pkg-plist
@@ -1,12 +1,25 @@
-include/gd/gd.h
-include/gd/gd_io.h
-include/gd/gdcache.h
-include/gd/gdfontg.h
-include/gd/gdfontl.h
-include/gd/gdfontmb.h
-include/gd/gdfonts.h
-include/gd/gdfontt.h
-lib/libgd1.a
-lib/libgd1.so
-lib/libgd1.so.2
-@dirrm include/gd
+bin/annotate
+bin/bdftogd
+bin/gd2copypal
+bin/gd2togif
+bin/gd2topng
+bin/gdcmpgif
+bin/gdparttopng
+bin/gdtopng
+bin/giftogd2
+bin/pngtogd
+bin/pngtogd2
+bin/webpng
+include/gd.h
+include/gd_io.h
+include/gdcache.h
+include/gdfontg.h
+include/gdfontl.h
+include/gdfontmb.h
+include/gdfonts.h
+include/gdfontt.h
+lib/libgd.a
+lib/libgd.so
+lib/libgd.so.4
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index afc96e0f11ee..e82e8f1bfe4b 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -1,14 +1,13 @@
-# New ports collection makefile for:	gd
-# Date created:         27 Mar 1998
-# Whom:                 jeff@cetlink.net
+# New ports collection makefile for:	gd1
+# Date created:				27 Mar 1998
+# Whom:					jeff@cetlink.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gd
 PORTVERSION=	1.8.4
-PORTREVISION=	7
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
@@ -21,19 +20,30 @@ COMMENT?=	A graphics library for fast creation of images
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
+.if defined(WITH_XPM)
+.if defined(WITHOUT_X11)
+LIB_DEPENDS+=   Xpm:${PORTSDIR}/graphics/xpm
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDFLAGS+=	-L${X11BASE}/lib -lXpm
+.else
+USE_XPM=	yes
+CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
+LDFLAGS+=	-L${X11BASE}/lib -lXpm -lX11
+.endif
+.endif
+
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+LATEST_LINK=	gd1
 
 MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
 
-.if defined(WITH_X11)
-USE_XPM=	yes
-.endif
-
 pre-everything::
-.if !defined(WITH_X11)
+.if !defined(WITH_XPM)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you want to compile with Xpm support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_X11=yes\""
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XPM=yes\""
 	@${ECHO_MSG}
 .endif
 
diff --git a/graphics/gd1/files/Makefile.lib b/graphics/gd1/files/Makefile.lib
index 8306444eb839..78c024d321f3 100644
--- a/graphics/gd1/files/Makefile.lib
+++ b/graphics/gd1/files/Makefile.lib
@@ -22,13 +22,9 @@ SRCS=		gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_ss.c \
 
 CFLAGS+=	-I${.CURDIR} -I${LOCALBASE}/include/freetype2/freetype \
 		-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include \
-		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ
-LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz
-
-.ifdef WITH_X11
-CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
-LDADD+=		-L${X11BASE}/lib -lXpm -lX11
-.endif
+		-DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE -DHAVE_LIBZ \
+		${CPPFLAGS}
+LDADD=		-L${LOCALBASE}/lib -lfreetype -ljpeg -lpng -lz ${LDFLAGS}
 
 beforeinstall:
 	mkdir -p ${INCSDIR}
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
deleted file mode 100644
index a8153cb54441..000000000000
--- a/graphics/gd2/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:	gd
-# Date created:         27 Mar 1998
-# Whom:                 jeff@cetlink.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gd
-PORTVERSION=	2.0.15
-CATEGORIES+=	graphics
-MASTER_SITES=	http://www.boutell.com/gd/http/ \
-		ftp://ftp.boutell.com/pub/boutell/gd/ \
-		${MASTER_SITE_RINGSERVER}
-MASTER_SITE_SUBDIR=	graphics/gd
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	A graphics library for fast creation of images
-
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2
-
-LATEST_LINK=	gd2
-
-MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-MAKEFILE=	${FILESDIR}/Makefile.bsd
-INSTALLS_SHLIB=	yes
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_X11) || defined(WITHOUT_XPM)
-PKGNAMESUFFIX=	-nox11
-.if !defined(WITHOUT_XPM)
-LIB_DEPENDS+=	Xpm:${PORTSDIR}/graphics/xpm
-CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM \
-		-DXPM_NOX
-LDFLAGS+=	-L${X11BASE}/lib -lXpm
-.endif
-.else
-USE_XPM=	yes
-CPPFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include -DHAVE_LIBXPM
-LDFLAGS+=	-L${X11BASE}/lib -lXpm -lX11
-.endif
-
-.if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \
-    (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
-CPPFLAGS+=	-DLZW_LICENSED
-.endif
-
-.if defined(GD_FONTS)
-USE_PERL5_BUILD=	yes
-SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
-.endif
-
-pre-everything::
-.if !defined(WITH_LZW)
-	@${ECHO_MSG} "************************************************************"
-	@${ECHO_MSG} "*      If you live outside US and Canada, you can define   *"
-	@${ECHO_MSG} "*      WITH_LZW to enable GIF compression support.         *"
-	@${ECHO_MSG} "************************************************************"
-.endif
-
-post-extract:
-	@${CP} ${FILESDIR}/g* ${WRKSRC}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/gd2/distinfo b/graphics/gd2/distinfo
deleted file mode 100644
index 4297649caf8a..000000000000
--- a/graphics/gd2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gd-2.0.15.tar.gz) = 6ededf633b4fd054662ec123c7825fbb
diff --git a/graphics/gd2/files/gd_gif_in.c b/graphics/gd2/files/gd_gif_in.c
deleted file mode 100644
index fc1b587cc8b4..000000000000
--- a/graphics/gd2/files/gd_gif_in.c
+++ /dev/null
@@ -1,573 +0,0 @@
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include "gd.h"
-
-/* Used only when debugging GIF compression code */
-/* #define DEBUGGING_ENVARS */
-
-#ifdef DEBUGGING_ENVARS
-
-static int verbose_set = 0;
-static int verbose;
-#define VERBOSE (verbose_set?verbose:set_verbose())
-
-static int set_verbose(void)
-{
- verbose = !!getenv("GIF_VERBOSE");
- verbose_set = 1;
- return(verbose);
-}
-
-#else
-
-#define VERBOSE 0
-
-#endif
-
-
-#define        MAXCOLORMAPSIZE         256
-
-#define        TRUE    1
-#define        FALSE   0
-
-#define CM_RED         0
-#define CM_GREEN       1
-#define CM_BLUE                2
-
-#define        MAX_LWZ_BITS            12
-
-#define INTERLACE              0x40
-#define LOCALCOLORMAP  0x80
-#define BitSet(byte, bit)      (((byte) & (bit)) == (bit))
-
-#define        ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) != 0)
-
-#define LM_to_uint(a,b)                        (((b)<<8)|(a))
-
-/* We may eventually want to use this information, but def it out for now */
-#if 0
-static struct {
-       unsigned int    Width;
-       unsigned int    Height;
-       unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
-       unsigned int    BitPixel;
-       unsigned int    ColorResolution;
-       unsigned int    Background;
-       unsigned int    AspectRatio;
-} GifScreen;
-#endif
-
-static struct {
-       int     transparent;
-       int     delayTime;
-       int     inputFlag;
-       int     disposal;
-} Gif89 = { -1, -1, -1, 0 };
-
-static int ReadColorMap (gdIOCtx *fd, int number, unsigned char (*buffer)[256]);
-static int DoExtension (gdIOCtx *fd, int label, int *Transparent);
-static int GetDataBlock (gdIOCtx *fd, unsigned char *buf);
-static int GetCode (gdIOCtx *fd, int code_size, int flag);
-static int LWZReadByte (gdIOCtx *fd, int flag, int input_code_size);
-
-static void ReadImage (gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace); /*1.4//, int ignore); */
-
-int ZeroDataBlock;
-
-gdImagePtr gdImageCreateFromGifSource(gdSourcePtr inSource)
-{
-        gdIOCtx         *in = gdNewSSCtx(inSource, NULL);
-        gdImagePtr      im;
-
-        im = gdImageCreateFromGifCtx(in);
-
-        in->gd_free(in);
-
-        return im;
-}
-
-gdImagePtr
-gdImageCreateFromGif(FILE *fdFile)
-{
-        gdIOCtx		*fd = gdNewFileCtx(fdFile);
-        gdImagePtr    	im = 0;
-
-        im = gdImageCreateFromGifCtx(fd);
-
-        fd->gd_free(fd);
-
-        return im;
-}
-
-gdImagePtr
-gdImageCreateFromGifCtx(gdIOCtxPtr fd)
-{
-/* 1.4       int imageNumber; */
-       int BitPixel;
-       int ColorResolution;
-       int Background;
-       int AspectRatio;
-       int Transparent = (-1);
-       unsigned char   buf[16];
-       unsigned char   c;
-       unsigned char   ColorMap[3][MAXCOLORMAPSIZE];
-       unsigned char   localColorMap[3][MAXCOLORMAPSIZE];
-       int             imw, imh;
-       int             useGlobalColormap;
-       int             bitPixel;
-       int	       i;
-       /*1.4//int             imageCount = 0; */
-       char            version[4];
-
-       gdImagePtr im = 0;
-       ZeroDataBlock = FALSE;
-
-       /*1.4//imageNumber = 1; */
-       if (! ReadOK(fd,buf,6)) {
-		return 0;
-	}
-       if (strncmp((char *)buf,"GIF",3) != 0) {
-		return 0;
-	}
-       strncpy(version, (char *)buf + 3, 3);
-       version[3] = '\0';
-
-       if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {
-		return 0;
-	}
-       if (! ReadOK(fd,buf,7)) {
-		return 0;
-	}
-       BitPixel        = 2<<(buf[4]&0x07);
-       ColorResolution = (int) (((buf[4]&0x70)>>3)+1);
-       Background      = buf[5];
-       AspectRatio     = buf[6];
-
-       if (BitSet(buf[4], LOCALCOLORMAP)) {    /* Global Colormap */
-               if (ReadColorMap(fd, BitPixel, ColorMap)) {
-			return 0;
-		}
-       }
-       for (;;) {
-               if (! ReadOK(fd,&c,1)) {
-                       return 0;
-               }
-               if (c == ';') {         /* GIF terminator */
-			goto terminated;
-	       }
-
-               if (c == '!') {         /* Extension */
-                       if (! ReadOK(fd,&c,1)) {
-                               return 0;
-                       }
-                       DoExtension(fd, c, &Transparent);
-                       continue;
-               }
-
-               if (c != ',') {         /* Not a valid start character */
-                       continue;
-               }
-
-               /*1.4//++imageCount; */
-
-               if (! ReadOK(fd,buf,9)) {
-	               return 0;
-               }
-
-               useGlobalColormap = ! BitSet(buf[8], LOCALCOLORMAP);
-
-               bitPixel = 1<<((buf[8]&0x07)+1);
-
-               imw = LM_to_uint(buf[4],buf[5]);
-               imh = LM_to_uint(buf[6],buf[7]);
-	       if (!(im = gdImageCreate(imw, imh))) {
-			 return 0;
-	       }
-               im->interlace = BitSet(buf[8], INTERLACE);
-               if (! useGlobalColormap) {
-                       if (ReadColorMap(fd, bitPixel, localColorMap)) { 
-                                 return 0;
-                       }
-                       ReadImage(im, fd, imw, imh, localColorMap, 
-                                 BitSet(buf[8], INTERLACE)); 
-                                 /*1.4//imageCount != imageNumber); */
-               } else {
-                       ReadImage(im, fd, imw, imh,
-                                 ColorMap, 
-                                 BitSet(buf[8], INTERLACE));
-                                 /*1.4//imageCount != imageNumber); */
-               }
-               if (Transparent != (-1)) {
-                       gdImageColorTransparent(im, Transparent);
-               }	   
-	       goto terminated;
-       }
-
-terminated:
-       /* Terminator before any image was declared! */
-       if (!im) {
-		return 0;
-       }
-       /* Check for open colors at the end, so
-          we can reduce colorsTotal and ultimately
-          BitsPerPixel */
-       for (i=((im->colorsTotal-1)); (i>=0); i--) {
-		if (im->open[i]) {
-                	im->colorsTotal--;
-                } else {
-                	break;
-                }
-       } 
-       return im;
-}
-
-static int
-ReadColorMap(gdIOCtx *fd, int number, unsigned char (*buffer)[256])
-{
-       int             i;
-       unsigned char   rgb[3];
-
-
-       for (i = 0; i < number; ++i) {
-               if (! ReadOK(fd, rgb, sizeof(rgb))) {
-                       return TRUE;
-               }
-               buffer[CM_RED][i] = rgb[0] ;
-               buffer[CM_GREEN][i] = rgb[1] ;
-               buffer[CM_BLUE][i] = rgb[2] ;
-       }
-
-
-       return FALSE;
-}
-
-static int
-DoExtension(gdIOCtx *fd, int label, int *Transparent)
-{
-       static unsigned char     buf[256];
-
-       switch (label) {
-       case 0xf9:              /* Graphic Control Extension */
-               (void) GetDataBlock(fd, (unsigned char*) buf);
-               Gif89.disposal    = (buf[0] >> 2) & 0x7;
-               Gif89.inputFlag   = (buf[0] >> 1) & 0x1;
-               Gif89.delayTime   = LM_to_uint(buf[1],buf[2]);
-               if ((buf[0] & 0x1) != 0)
-                       *Transparent = buf[3];
-
-               while (GetDataBlock(fd, (unsigned char*) buf) != 0)
-                       ;
-               return FALSE;
-       default:
-               break;
-       }
-       while (GetDataBlock(fd, (unsigned char*) buf) != 0)
-               ;
-
-       return FALSE;
-}
-
-static int
-GetDataBlock_(gdIOCtx *fd, unsigned char *buf)
-{
-       unsigned char   count;
-
-       if (! ReadOK(fd,&count,1)) {
-               return -1;
-       }
-
-       ZeroDataBlock = count == 0;
-
-       if ((count != 0) && (! ReadOK(fd, buf, count))) {
-               return -1;
-       }
-
-       return count;
-}
-
-static int
-GetDataBlock(gdIOCtx *fd, unsigned char *buf)
-{
- int rv;
- int i;
-
- rv = GetDataBlock_(fd,buf);
- if (VERBOSE)
-  { printf("[GetDataBlock returning %d",rv);
-    if (rv > 0)
-     { printf(":");
-       for (i=0;i<rv;i++) printf(" %02x",buf[i]);
-     }
-    printf("]\n");
-  }
- return(rv);
-}
-
-static int
-GetCode_(gdIOCtx *fd, int code_size, int flag)
-{
-       static unsigned char    buf[280];
-       static int              curbit, lastbit, done, last_byte;
-       int                     i, j, ret;
-       unsigned char           count;
-
-       if (flag) {
-               curbit = 0;
-               lastbit = 0;
-               done = FALSE;
-               return 0;
-       }
-
-       if ( (curbit+code_size) >= lastbit) {
-               if (done) {
-                       if (curbit >= lastbit) {
-                                /* Oh well */
-                       }                        
-                       return -1;
-               }
-               buf[0] = buf[last_byte-2];
-               buf[1] = buf[last_byte-1];
-
-               if ((count = GetDataBlock(fd, &buf[2])) == 0)
-                       done = TRUE;
-
-               last_byte = 2 + count;
-               curbit = (curbit - lastbit) + 16;
-               lastbit = (2+count)*8 ;
-       }
-
-       ret = 0;
-       for (i = curbit, j = 0; j < code_size; ++i, ++j)
-               ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j;
-
-       curbit += code_size;
-       return ret;
-}
-
-static int
-GetCode(gdIOCtx *fd, int code_size, int flag)
-{
- int rv;
-
- rv = GetCode_(fd,code_size,flag);
- if (VERBOSE) printf("[GetCode(,%d,%d) returning %d]\n",code_size,flag,rv);
- return(rv);
-}
-
-#define STACK_SIZE ((1<<(MAX_LWZ_BITS))*2)
-static int
-LWZReadByte_(gdIOCtx *fd, int flag, int input_code_size)
-{
-       static int      fresh = FALSE;
-       int             code, incode;
-       static int      code_size, set_code_size;
-       static int      max_code, max_code_size;
-       static int      firstcode, oldcode;
-       static int      clear_code, end_code;
-       static int      table[2][(1<< MAX_LWZ_BITS)];
-       static int      stack[STACK_SIZE], *sp;
-       register int    i;
-
-       if (flag) {
-               set_code_size = input_code_size;
-               code_size = set_code_size+1;
-               clear_code = 1 << set_code_size ;
-               end_code = clear_code + 1;
-               max_code_size = 2*clear_code;
-               max_code = clear_code+2;
-
-               GetCode(fd, 0, TRUE);
-               
-               fresh = TRUE;
-
-               for (i = 0; i < clear_code; ++i) {
-                       table[0][i] = 0;
-                       table[1][i] = i;
-               }
-               for (; i < (1<<MAX_LWZ_BITS); ++i)
-                       table[0][i] = table[1][0] = 0;
-
-               sp = stack;
-
-               return 0;
-       } else if (fresh) {
-               fresh = FALSE;
-               do {
-                       firstcode = oldcode =
-                               GetCode(fd, code_size, FALSE);
-               } while (firstcode == clear_code);
-               return firstcode;
-       }
-
-       if (sp > stack)
-               return *--sp;
-
-       while ((code = GetCode(fd, code_size, FALSE)) >= 0) {
-               if (code == clear_code) {
-                       for (i = 0; i < clear_code; ++i) {
-                               table[0][i] = 0;
-                               table[1][i] = i;
-                       }
-                       for (; i < (1<<MAX_LWZ_BITS); ++i)
-                               table[0][i] = table[1][i] = 0;
-                       code_size = set_code_size+1;
-                       max_code_size = 2*clear_code;
-                       max_code = clear_code+2;
-                       sp = stack;
-                       firstcode = oldcode =
-                                       GetCode(fd, code_size, FALSE);
-                       return firstcode;
-               } else if (code == end_code) {
-                       int             count;
-                       unsigned char   buf[260];
-
-                       if (ZeroDataBlock)
-                               return -2;
-
-                       while ((count = GetDataBlock(fd, buf)) > 0)
-                               ;
-
-                       if (count != 0)
-                       return -2;
-               }
-
-               incode = code;
-
-	       if (sp == (stack + STACK_SIZE)) {
-		       /* Bad compressed data stream */
-		       return -1;
-	       }
-
-               if (code >= max_code) {
-                       *sp++ = firstcode;
-                       code = oldcode;
-               }
-
-               while (code >= clear_code) {
-		       if (sp == (stack + STACK_SIZE)) {
-			       /* Bad compressed data stream */
-			       return -1;
-		       }
-                       *sp++ = table[1][code];
-                       if (code == table[0][code]) {
-                               /* Oh well */
-                       }
-                       code = table[0][code];
-               }
-
-               *sp++ = firstcode = table[1][code];
-
-               if ((code = max_code) <(1<<MAX_LWZ_BITS)) {
-                       table[0][code] = oldcode;
-                       table[1][code] = firstcode;
-                       ++max_code;
-                       if ((max_code >= max_code_size) &&
-                               (max_code_size < (1<<MAX_LWZ_BITS))) {
-                               max_code_size *= 2;
-                               ++code_size;
-                       }
-               }
-
-               oldcode = incode;
-
-               if (sp > stack)
-                       return *--sp;
-       }
-       return code;
-}
-
-static int
-LWZReadByte(gdIOCtx *fd, int flag, int input_code_size)
-{
- int rv;
-
- rv = LWZReadByte_(fd,flag,input_code_size);
- if (VERBOSE) printf("[LWZReadByte(,%d,%d) returning %d]\n",flag,input_code_size,rv);
- return(rv);
-}
-
-static void
-ReadImage(gdImagePtr im, gdIOCtx *fd, int len, int height, unsigned char (*cmap)[256], int interlace) /*1.4//, int ignore) */
-{
-       unsigned char   c;      
-       int             v;
-       int             xpos = 0, ypos = 0, pass = 0;
-       int i;
-       /* Stash the color map into the image */
-       for (i=0; (i<gdMaxColors); i++) {
-               im->red[i] = cmap[CM_RED][i];	
-               im->green[i] = cmap[CM_GREEN][i];	
-               im->blue[i] = cmap[CM_BLUE][i];	
-               im->open[i] = 1;
-       }
-       /* Many (perhaps most) of these colors will remain marked open. */
-       im->colorsTotal = gdMaxColors;
-       /*
-       **  Initialize the Compression routines
-       */
-       if (! ReadOK(fd,&c,1)) {
-               return; 
-       }
-       if (LWZReadByte(fd, TRUE, c) < 0) {
-               return;
-       }
-
-       /*
-       **  If this is an "uninteresting picture" ignore it.
-       **  REMOVED For 1.4
-       */
-       /*if (ignore) { */
-       /*        while (LWZReadByte(fd, FALSE, c) >= 0) */
-       /*                ; */
-       /*        return; */
-       /*} */
-
-       while ((v = LWZReadByte(fd,FALSE,c)) >= 0 ) {
-               /* This how we recognize which colors are actually used. */
-               if (im->open[v]) {
-                       im->open[v] = 0;
-               }
-               gdImageSetPixel(im, xpos, ypos, v);
-               ++xpos;
-               if (xpos == len) {
-                       xpos = 0;
-                       if (interlace) {
-                               switch (pass) {
-                               case 0:
-                               case 1:
-                                       ypos += 8; break;
-                               case 2:
-                                       ypos += 4; break;
-                               case 3:
-                                       ypos += 2; break;
-                               }
-
-                               if (ypos >= height) {
-                                       ++pass;
-                                       switch (pass) {
-                                       case 1:
-                                               ypos = 4; break;
-                                       case 2:
-                                               ypos = 2; break;
-                                       case 3:
-                                               ypos = 1; break;
-                                       default:
-                                               goto fini;
-                                       }
-                               }
-                       } else {
-                               ++ypos;
-                       }
-               }
-               if (ypos >= height)
-                       break;
-       }
-
-fini:
-       if (LWZReadByte(fd,FALSE,c)>=0) {
-               /* Ignore extra */
-       }
-}
-
diff --git a/graphics/gd2/pkg-descr b/graphics/gd2/pkg-descr
deleted file mode 100644
index f7507cc8d13f..000000000000
--- a/graphics/gd2/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-gd is a graphics library. It allows your code to quickly draw images
-complete with lines, arcs, text, multiple colors, cut and paste from
-other images, and flood fills, and write out the result as a PNG, GIF
-or JPEG file. This is particularly useful in World Wide Web applications,
-where PNG, GIF and JPEG are three of the formats accepted for inline
-images by most browsers.
-
-gd does  not provide for every possible desirable graphics operation,
-but version 2.0 does include most frequently requested features,
-including both truecolor and palette images, resampling (smooth
-resizing of truecolor images) and so forth.
-
-WWW: http://www.boutell.com/gd/
-
-- Alex Dupre
-sysadmin@alexdupre.com
diff --git a/graphics/gd2/pkg-plist b/graphics/gd2/pkg-plist
deleted file mode 100644
index a8b71306fc99..000000000000
--- a/graphics/gd2/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-bin/annotate
-bin/bdftogd
-bin/gd2copypal
-bin/gd2togif
-bin/gd2topng
-bin/gdcmpgif
-bin/gdparttopng
-bin/gdtopng
-bin/giftogd2
-bin/pngtogd
-bin/pngtogd2
-bin/webpng
-include/gd.h
-include/gd_io.h
-include/gdcache.h
-include/gdfontg.h
-include/gdfontl.h
-include/gdfontmb.h
-include/gdfonts.h
-include/gdfontt.h
-lib/libgd.a
-lib/libgd.so
-lib/libgd.so.4
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/gd2/scripts/configure b/graphics/gd2/scripts/configure
deleted file mode 100644
index 299f3877aaf8..000000000000
--- a/graphics/gd2/scripts/configure
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# The GD_FONTS environment variable can be set to specify the gzipped
-# tar-ball containing the fonts in bdf format and the bdf file names.
-#
-# For example:
-# GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \
-#	koi9x15.bdf koi12x24.bdf koi10x20.bdf"
-#
-# This can be usefull for slave ports, like ukrainian/gd, which may
-# now provide alternative fonts easily.
-
-#	TODO: . handle multiple archiving formats: tgz, tar.bz2, zip
-#	      . allow for passing already extracted font-files
-
-if [ -z "$GD_FONTS" ]
-then
-	echo "GD_FONTS can be set to specify an alternative list of .bdf files"
-	echo "See $0 for details..."
-	exit 0
-fi
-
-set $GD_FONTS
-#
-# The  tarball is  the  first argument,  the  tiny, small,  medium-bold,
-# large, and giant fonts follow.
-#
-
-tarball=$1
-shift
-tar -xvzpf $tarball -C $WRKSRC $@
-
-rm -f $WRKSRC/Makefile.fonts
-
-for font in Tiny Small MediumBold Large Giant
-do
-	f=`echo $font | tr -d [[:lower:]] | tr [[:upper:]] [[:lower:]]`
-	rm -f $WRKSRC/gdfont$f.[ch]
-	printf 'gdfont%s.c gdfont%s.h: %s\
-		perl ${.CURDIR}/bdftogd gdFont%s font%s < %s\n' \
-		$f $f $1 $font $f $1 >> $WRKSRC/Makefile.fonts
-	shift
-done
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 61c364a131f6..3f7554c0d381 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdchart
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.fred.net/brv/chart/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -15,7 +16,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}dev
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Easy to use, fast C API for creating charts and graphs
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		freetype:${PORTSDIR}/print/freetype2
 
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 6f501f95d60e..f70e0576bdfc 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,33 +1,26 @@
-# New ports collection makefile for:    p5-GD
-# Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
+# New ports collection makefile for:	p5-GD
+# Date created:				March 11, 2003
+# Whom:					Philip M. Gollucci <philip@p6m7g8.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.41
-PORTREVISION=	1
+PORTVERSION=	2.07
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
+DISTNAME=	GD-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A perl5 interface to Gd Graphics Library
+MAINTAINER=	philip@p6m7g8.com
+COMMENT=	A perl5 interface to Gd Graphics Library version2
 
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 
 PERL_CONFIGURE=	yes
-USE_REINPLACE=	yes
+CONFIGURE_ARGS=	-options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		GD.3
-
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's,@@LOCALBASE@@,${LOCALBASE},g' \
-		-e 's,@@X11BASE@@,${X11BASE},g' \
-		${WRKSRC}/Makefile.PL
+MAN3=		GD.3 GD::Polyline.3
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD/distinfo b/graphics/p5-GD/distinfo
index 04586f6731af..8c7737fc0055 100644
--- a/graphics/p5-GD/distinfo
+++ b/graphics/p5-GD/distinfo
@@ -1 +1 @@
-MD5 (GD-1.41.tar.gz) = 9f11b3f6bb73f04d2bc3f02df0662bdd
+MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300
diff --git a/graphics/p5-GD2/files/patch-GD.xs b/graphics/p5-GD/files/patch-GD.xs
index fc34f5f463be..fc34f5f463be 100644
--- a/graphics/p5-GD2/files/patch-GD.xs
+++ b/graphics/p5-GD/files/patch-GD.xs
diff --git a/graphics/p5-GD/files/patch-aa b/graphics/p5-GD/files/patch-aa
deleted file mode 100644
index b0d25fd004db..000000000000
--- a/graphics/p5-GD/files/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.PL.orig	Wed Jun 19 14:02:59 2002
-+++ Makefile.PL	Sat Jun 22 21:25:18 2002
-@@ -3,40 +3,17 @@
- warn "NOTICE: This module requires libgd 1.8.4 or higher (shared library version 4.X).\n";
- 
- # =====> PATHS: CHECK AND ADJUST <=====
--my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
--my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
--my @LIBS    = qw(-lgd -lpng -lz);
--
--# FEATURE FLAGS
--warn "\nPlease choose the features that match how libgd was built:\n";
--
--my $JPEG    = lc prompt('Build JPEG support?','y') eq 'y';
--my $TTF     = lc prompt('Build FreeType support?','y') eq 'y';
--my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
--my $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') eq 'y';
-+my @INC     = qw(-I@@LOCALBASE@@/include/gd -I@@LOCALBASE@@/include/freetype -I@@LOCALBASE@@/include -I@@X11BASE@@/include/X11 -I@@X11BASE@@/include); 
-+my @LIBPATH = qw(-L@@LOCALBASE@@/lib -L@@X11BASE@@/lib);
-+my @LIBS    = qw(-lfreetype -ljpeg -lgd1 -lpng -lz);
- 
- my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
- 
--warn "\nIf you experience compile problems, please check the \@INC, \@LIBPATH and \@LIBS\n",
--     "arrays defined in Makefile.PL and manually adjust, if necessary.\n\n";
--
--#### no user-serviceable parts below #####
--
--push @LIBS,'-lfreetype' if $TTF;
--push @LIBS,'-ljpeg' if $JPEG;
--push @LIBS, '-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 @LIBS,'-lX11','-lXpm' if $XPM; 
--} 
-+push @LIBS,'-lX11','-lXpm' unless $^O eq 'MSWin32';
- 
- my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
--my $DEFINES = '';
--$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
--$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
--$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
--$DEFINES    .= ' -DHAVE_GIF'  if $GIF;
-+my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
-+$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
- $DEFINES    .= ' -DFCGI'      if $FCGI;
- 
- WriteMakefile(
diff --git a/graphics/p5-GD/pkg-descr b/graphics/p5-GD/pkg-descr
index 0124434aae6d..69d40ab54e8c 100644
--- a/graphics/p5-GD/pkg-descr
+++ b/graphics/p5-GD/pkg-descr
@@ -1,4 +1,6 @@
-       GD.pm is a port of Thomas Boutell's gd graphics library
-       (see below).  GD allows you to create color drawings using
-       a large number of graphics primitives, and emit the
-       drawings as GIF files.
+GD.pm is a Perl interface to Thomas Boutell's gd graphics library
+(version 2.01 or higher). GD allows you to create color drawings
+using a large number of graphics primitives, and emit the drawings
+as PNG files.
+
+WWW: http://stein.cshl.org/WWW/software/GD/
diff --git a/graphics/p5-GD/pkg-plist b/graphics/p5-GD/pkg-plist
index d87ad5c57600..3c98e9f34dc7 100644
--- a/graphics/p5-GD/pkg-plist
+++ b/graphics/p5-GD/pkg-plist
@@ -1,8 +1,9 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/patch_gd.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/qd.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD
+%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GD
diff --git a/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index 6f501f95d60e..178612e37930 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:    p5-GD
+# New ports collection makefile for:	p5-GD1
 # Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
+# Whom:					James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	GD
 PORTVERSION=	1.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A perl5 interface to Gd Graphics Library
 
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 
 PERL_CONFIGURE=	yes
 USE_REINPLACE=	yes
diff --git a/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
deleted file mode 100644
index 8339bceeb891..000000000000
--- a/graphics/p5-GD2/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:    p5-GD2
-# Date created:				March 11, 2003
-# Whom:	      				Philip M. Gollucci <philip@p6m7g8.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	GD2
-PORTVERSION=	2.07
-CATEGORIES=	graphics perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	GD
-PKGNAMEPREFIX=	p5-
-DISTNAME=	GD-${PORTVERSION}
-
-MAINTAINER=	philip@p6m7g8.com
-COMMENT=	A perl5 interface to Gd Graphics Library version2
-
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	-options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
-
-MAN3=		GD.3 GD::Polyline.3
-
-.include <bsd.port.mk>
diff --git a/graphics/p5-GD2/distinfo b/graphics/p5-GD2/distinfo
deleted file mode 100644
index 8c7737fc0055..000000000000
--- a/graphics/p5-GD2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300
diff --git a/graphics/p5-GD2/pkg-descr b/graphics/p5-GD2/pkg-descr
deleted file mode 100644
index 69d40ab54e8c..000000000000
--- a/graphics/p5-GD2/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GD.pm is a Perl interface to Thomas Boutell's gd graphics library
-(version 2.01 or higher). GD allows you to create color drawings
-using a large number of graphics primitives, and emit the drawings
-as PNG files.
-
-WWW: http://stein.cshl.org/WWW/software/GD/
diff --git a/graphics/p5-GD2/pkg-plist b/graphics/p5-GD2/pkg-plist
deleted file mode 100644
index 3c98e9f34dc7..000000000000
--- a/graphics/p5-GD2/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GD
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index 958252183231..97bd214bc2a9 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	phplot
 PORTVERSION=	4.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phplot
@@ -16,7 +16,7 @@ MAINTAINER=	yukinopo@livedoor.com
 COMMENT=	A PHP class for creating scientific and business charts
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 NO_BUILD=	YES
 
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 7462e557b3ed..76cd5f8d0b23 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	png2html
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.engr.mun.ca/~holden/
 
@@ -15,7 +15,7 @@ MAINTAINER=	jedgar@fxp.org
 COMMENT=	Takes a PNG image and transforms it into HTML
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		gd.4:${PORTSDIR}/graphics/gd2
+		gd.4:${PORTSDIR}/graphics/gd
 
 do-configure:
 		@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index d0ebbbef65a1..7f5fb50e8ece 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	0.42
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	http://newcenturycomputers.net/projects/download.cgi/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ DISTNAME=	gdmodule-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Python interface to the GD library
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_XPM=	yes
 USE_REINPLACE=  yes
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 6201076116e2..ea791d55c59a 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GD
 PORTVERSION=	0.7.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.acc.ne.jp/~tam/GD/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -30,13 +30,13 @@ CONFIGURE_ARGS=	--with-gd-lib="${LOCALBASE}/lib" \
 		--with-freetype
 INSTALL_TARGET=	site-install
 
-.if defined(WITH_GD2)
+.if defined(WITH_GD1)
+CONFIGURE_ARGS+=	--with-gd-include="${LOCALBASE}/include/gd"
+LIB_DEPENDS+=	gd1.2:${PORTSDIR}/graphics/gd1
+.else
 CONFIGURE_ARGS+=	----enable-gd2_0 \
-			--with-gd-include="${LOCALBASE}/include"
+		--with-gd-include="${LOCALBASE}/include"
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
-.else
-CONFIGURE_ARGS+=	--with-gd-include="${LOCALBASE}/include/gd"
-LIB_DEPENDS+=	gd1.2:${PORTSDIR}/graphics/gd
 .endif
 
 .include <bsd.port.pre.mk>
@@ -70,10 +70,10 @@ DOCS_JA=	readme.ja	\
 
 post-patch:
 	${RUBY} -i -pe 'sub %r:/win98/windows/FONTS:, "${X11BASE}/lib/X11/fonts/TrueType"' ${WRKSRC}/sample/gdtestttf.rb
-.if defined(WITH_GD2)
-	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb
-.else
+.if defined(WITH_GD1)
 	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd1"' ${WRKSRC}/extconf.rb
+.else
+	${RUBY} -i -pe 'sub %r:%%GD%%:, "gd"' ${WRKSRC}/extconf.rb
 .endif
 
 post-install:
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index c0fb1ebb3853..dd7ea1c052a2 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scr2png
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -17,13 +17,7 @@ NO_WRKSUBDIR=	yes
 MAINTAINER=	nik@freebsd.org
 COMMENT=	Converts the output of "vidcontrol -p" to PNG
 
-.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
-.else
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd-nox11
-.else
-.endif
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_REINPLACE=	yes
 
@@ -37,4 +31,4 @@ post-extract:
 do-install:	
 	@cd ${WRKSRC}; ${MAKE} BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX} install
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index d6cc5dab4076..31d11c771ff9 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zimg
 PORTVERSION=	4.19.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image-generator that uses ASCII input files to create PNGs/EDFs
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/japanese/Makefile b/japanese/Makefile
index a1362203d308..8bdaa333003c 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -84,6 +84,7 @@
     SUBDIR += gauche-kakasi
     SUBDIR += gawk
     SUBDIR += gd
+    SUBDIR += gd1
     SUBDIR += ghostscript-gnu-jpnfont
     SUBDIR += gicq
     SUBDIR += gn-gnspool
diff --git a/japanese/gd/Makefile b/japanese/gd/Makefile
index 06832cb0275b..7a58d1ba9956 100644
--- a/japanese/gd/Makefile
+++ b/japanese/gd/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: gd
+# New ports collection makefile for:	gd2
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
@@ -12,6 +12,6 @@ COMMENT=	A graphics library for fast image creation with Japanese support
 
 MASTERDIR=	${.CURDIR}/../../graphics/gd
 
-MAKE_ARGS=	-DJISX0208
+CPPFLAGS+=	-DJISX0208
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/gd1/Makefile b/japanese/gd1/Makefile
index 06832cb0275b..b5336deb424d 100644
--- a/japanese/gd1/Makefile
+++ b/japanese/gd1/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: gd
+# New ports collection makefile for:	gd1
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
@@ -10,8 +10,8 @@ CATEGORIES=	japanese
 MAINTAINER=	ichiro@ichiro.org
 COMMENT=	A graphics library for fast image creation with Japanese support
 
-MASTERDIR=	${.CURDIR}/../../graphics/gd
+MASTERDIR=	${.CURDIR}/../../graphics/gd1
 
-MAKE_ARGS=	-DJISX0208
+CPPFLAGS+=	-DJISX0208
 
 .include "${MASTERDIR}/Makefile"
diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 9ec313128004..17c8bbf7d00b 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ploticus
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 DISTNAME=	plsrc${PORTVERSION:S/.//}
@@ -16,7 +16,7 @@ DISTNAME=	plsrc${PORTVERSION:S/.//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates plots and graphs from data
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ming.3:${PORTSDIR}/graphics/ming \
 		png.5:${PORTSDIR}/graphics/png \
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 8aa00e5b9b12..22d52b7837d5 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	5.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,11 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific plotting package
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
-RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack pkgconfig
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index c0784deb2d99..144a0637530a 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.29
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
@@ -20,14 +20,14 @@ COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include
+		--with-gd-inc=${LOCALBASE}/include/gd
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include/gd
+		--with-gd-inc=${LOCALBASE}/include
 .endif
 
 USE_PERL5=	YES
@@ -43,10 +43,10 @@ MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
-.if defined(WITH_GD2)
-	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
-.else
+.if defined(WITH_GD1)
 	${PERL} -pi -e 's:%%GD%%:-lgd1:g' ${WRKSRC}/configure
+.else
+	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
 .endif
 
 do-install:
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net-mgmt/nagios12/Makefile
+++ b/net-mgmt/nagios12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net-mgmt/netsaint/Makefile b/net-mgmt/netsaint/Makefile
index 9a042d807eae..05c660ff4a87 100644
--- a/net-mgmt/netsaint/Makefile
+++ b/net-mgmt/netsaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
@@ -18,18 +18,16 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
 
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--with-command-grp=www \
+		--with-gd-lib=${LOCALBASE}/lib \
+		--with-gd-inc=${LOCALBASE}/include \
 		--with-netsaint-user=netsaint \
 		--with-netsaint-grp=netsaint \
 		--sbindir=${PREFIX}/share/netsaint/sbin \
@@ -37,6 +35,7 @@ CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--datadir=${PREFIX}/share/netsaint \
 		--sysconfdir=${PREFIX}/etc/netsaint \
 		--localstatedir=${PREFIX}/var/netsaint
+INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
@@ -53,18 +52,14 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
-INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
-
 pre-fetch:
 	@${SH} ${SCRIPTDIR}/checkps
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
 post-install:
-.for i in ${BSDIMAGES}
+.for i in bsd_logofullsize.gif bsd_sblogo.gif
 	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
diff --git a/net-mgmt/netsaint/files/patch-ad b/net-mgmt/netsaint/files/patch-ad
index 6d8038c4bd21..aeb6f67857ca 100644
--- a/net-mgmt/netsaint/files/patch-ad
+++ b/net-mgmt/netsaint/files/patch-ad
@@ -21,22 +21,3 @@
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
- 	LDFLAGS="${LDFLAGS} -L${withval}"
- 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- 	
-+else
-+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
- 
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
-   withval="$with_gd_inc"
-   
- 	CFLAGS="${CFLAGS} -I${withval}"
-+else
-+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
- 	
- fi
- 
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index c0784deb2d99..144a0637530a 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.9.29
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
@@ -20,14 +20,14 @@ COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include
+		--with-gd-inc=${LOCALBASE}/include/gd
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
-		--with-gd-inc=${LOCALBASE}/include/gd
+		--with-gd-inc=${LOCALBASE}/include
 .endif
 
 USE_PERL5=	YES
@@ -43,10 +43,10 @@ MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
-.if defined(WITH_GD2)
-	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
-.else
+.if defined(WITH_GD1)
 	${PERL} -pi -e 's:%%GD%%:-lgd1:g' ${WRKSRC}/configure
+.else
+	${PERL} -pi -e 's:%%GD%%:-lgd:g' ${WRKSRC}/configure
 .endif
 
 do-install:
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index 3df6e0f4dc54..16d762142ebe 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=nagios
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=nagios
 MAINTAINER=	blaz@si.FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-.if defined(WITH_GD2)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+.if defined(WITH_GD1)
+LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1
 .else
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins
 
@@ -44,12 +44,12 @@ CONFIGURE_ARGS=	--with-command-user=nagios \
 		--localstatedir=/var/spool/nagios \
 		--prefix=${PREFIX}
 
-.if defined(WITH_GD2)
-INCGD=		-I${LOCALBASE}/include
-LIBGD=		-lgd
-.else
+.if defined(WITH_GD1)
 INCGD=		-I${LOCALBASE}/include/gd
 LIBGD=		-lgd1
+.else
+INCGD=		-I${LOCALBASE}/include
+LIBGD=		-lgd
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/net/netsaint/Makefile b/net/netsaint/Makefile
index 9a042d807eae..05c660ff4a87 100644
--- a/net/netsaint/Makefile
+++ b/net/netsaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netsaint
 PORTVERSION=	0.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/ \
@@ -18,18 +18,16 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} netsaint-graphics.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extremely powerful network monitoring system
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins
 
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--with-command-grp=www \
+		--with-gd-lib=${LOCALBASE}/lib \
+		--with-gd-inc=${LOCALBASE}/include \
 		--with-netsaint-user=netsaint \
 		--with-netsaint-grp=netsaint \
 		--sbindir=${PREFIX}/share/netsaint/sbin \
@@ -37,6 +35,7 @@ CONFIGURE_ARGS=	--with-command-user=netsaint \
 		--datadir=${PREFIX}/share/netsaint \
 		--sysconfdir=${PREFIX}/etc/netsaint \
 		--localstatedir=${PREFIX}/var/netsaint
+INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
@@ -53,18 +52,14 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
-INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
-
 pre-fetch:
 	@${SH} ${SCRIPTDIR}/checkps
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-BSDIMAGES=	bsd_logofullsize.gif bsd_sblogo.gif
-
 post-install:
-.for i in ${BSDIMAGES}
+.for i in bsd_logofullsize.gif bsd_sblogo.gif
 	${INSTALL_DATA} ${WRKDIR}/netsaint-0.0.7b6/html/images/$i ${PREFIX}/share/${PORTNAME}/images/
 .endfor
 
diff --git a/net/netsaint/files/patch-ad b/net/netsaint/files/patch-ad
index 6d8038c4bd21..aeb6f67857ca 100644
--- a/net/netsaint/files/patch-ad
+++ b/net/netsaint/files/patch-ad
@@ -21,22 +21,3 @@
    fi
  fi
  for ac_site_file in $CONFIG_SITE; do
-@@ -1298,6 +1298,9 @@
- 	LDFLAGS="${LDFLAGS} -L${withval}"
- 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- 	
-+else
-+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
- fi
- 
- # Check whether --with-gd-inc or --without-gd-inc was given.
-@@ -1305,6 +1308,8 @@
-   withval="$with_gd_inc"
-   
- 	CFLAGS="${CFLAGS} -I${withval}"
-+else
-+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
- 	
- fi
- 
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index fea5e463920d..525cabb446bd 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	modlogan
 PORTVERSION=	0.8.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www
 MASTER_SITES=	http://jan.kneschke.de/projects/modlogan/download/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,7 +16,7 @@ MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A modular log file analysis program
 
 LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns \
-		gd.4:${PORTSDIR}/graphics/gd2 \
+		gd.4:${PORTSDIR}/graphics/gd \
 		intl.4:${PORTSDIR}/devel/gettext \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		expat.4:${PORTSDIR}/textproc/expat2
diff --git a/ukrainian/gd/Makefile b/ukrainian/gd/Makefile
index ad766d40fb40..95f756f8c21c 100644
--- a/ukrainian/gd/Makefile
+++ b/ukrainian/gd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../../graphics/gd2
+MASTERDIR=	${.CURDIR}/../../graphics/gd
 CATEGORIES=	ukrainian
 
 MAINTAINER=	mi@aldan.algebra.com
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 0a255671b14b..c7158035d10b 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	analog
 PORTVERSION=	5.32
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
@@ -24,7 +25,7 @@ MASTER_SITES=	http://www.analog.cx/ \
 MAINTAINER=	mharo@FreeBSD.org
 COMMENT=	An extremely fast program for analysing WWW logfiles
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2 \
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index a3497a9b97f2..7d26c5ac65b9 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	todd@thisisa.com
 COMMENT=	A fast Log-Analyzer for web servers
 
 BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MAN1=		http-analyze.1
 
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index 0040cdb1f2ba..77626937f546 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	mgstat
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://wizard.ae.krakow.pl/~mike/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce graphs from mod_gzip log files
 
-LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 GNU_CONFIGURE=	yes
 
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 2c186dfe72bc..5d0b54fe9aee 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	webalizer
 PORTVERSION=	2.1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
@@ -17,17 +17,13 @@ MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT=	A web server log file analysis program
 
 .if !defined(LIB_DEPENDS)
-LIB_DEPENDS=	gd.4:${PORTSDIR}/${GD_PORT}
-.if defined(WEBALIZER_WITH_GD2) 
-GD_PORT?=	graphics/gd2
-.endif
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-GD_PORT?=	graphics/gd-nox11
 
 .if defined(BATCH)
 # no cosmetique spaces allowed
@@ -39,7 +35,7 @@ WEBALIZER_LANG?=english
 CONFIGURE_ARGS+=	--enable-dns \
 			--with-etcdir=${PREFIX}/etc \
 			--with-gdlib=${PREFIX}/lib \
-			--with-gd=${PREFIX}/include/gd
+			--with-gd=${PREFIX}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
 CFLAGS+=	-DLINKLIST_MAX_STRING=256
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
author	Norikatsu Shigemura <nork@FreeBSD.org>	2003-08-18 16:15:10 +0000
committer	Norikatsu Shigemura <nork@FreeBSD.org>	2003-08-18 16:15:10 +0000
commit	efb928619b234d49b326a13f59a6e2ee354bf902 (patch)
tree	c62bd82140831e81442480b9cefc699e0c08f08d
parent	Update to 5.0.8. As reported by Paul Szabo in (diff)