Update this package to version 1.6.3, thereby fixing PR 7969 from

Jim Spath.

Changes from previous version include:

+ Version 1.6.3 corrects a memory leak in gd_png.c.  This leak caused a
significant amount of memory to be allocated and not freed when
writing a PNG image.

+ Version 1.6.2 from John Ellson adds two new functions:
gdImageStringTTF gdImageColorResolve

+ Version 1.6.1 incorporates superior PNG reading and writing code
from Greg Roelofs, with minor modifications by Tom Boutell.

+ Version 1.6 features the following changes:
Support for 8-bit palette PNG images has been added.  Support for GIF
has been removed.  This step was taken to completely avoid the legal
controversy regarding the LZW compression algorithm used in GIF.
Unisys holds a patent which is relevant to LZW compression.  PNG is a
superior image format in any case.  Now that PNG is supported by both
Microsoft Internet Explorer and Netscape (in their recent releases),
we highly recommend that GD users upgrade in order to get
well-compressed images in a format which is legally unemcumbered.

+ Version 1.5 featured the following changes:
New GD2 format
Re-arranged source files
Extended I/O capabilities.
Better support for Lincoln Stein's Perl Module
Added functions

+ Version 1.4 features the following changes:
Fixed polygon fill routine (again)
Support for alternate data sources
Support for alternate data destinations
More tolerant when reading GIFs

6 files changed, 64 insertions, 89 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 9ab5a0937f0..c5e196eeacd 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.9 1999/05/03 20:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.10 1999/08/26 15:26:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
-DISTNAME=       gd1.3
-PKGNAME=        gd-1.3p1
+DISTNAME=       gd-1.6.3
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://www.boutell.com/pub/boutell/gd/
+MASTER_SITES=   http://www.boutell.com/gd/http/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.boutell.com/gd/
 
 USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
-pre-install:
-	${MKDIR} ${PREFIX}/include/gd
-	${MKDIR} ${PREFIX}/share/examples/gd
+DEPENDS+=	png-1.0.3:../../graphics/png
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/files/md5 b/graphics/gd/files/md5
index d4ada83bdfb..30a46bdc720 100644
--- a/graphics/gd/files/md5
+++ b/graphics/gd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:21:35 agc Exp $
+$NetBSD: md5,v 1.5 1999/08/26 15:26:27 agc Exp $
 
-MD5 (gd1.3.tar.gz) = ff3de2c851c4b1fc6af6f14dcfbc6532
+MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84
diff --git a/graphics/gd/files/patch-sum b/graphics/gd/files/patch-sum
index 2dc99e5e112..d364e5f1971 100644
--- a/graphics/gd/files/patch-sum
+++ b/graphics/gd/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:07 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/26 15:26:28 agc Exp $
 
-MD5 (patch-aa) = 13dbe438975fa2acffab0d71f63313b5
+MD5 (patch-aa) = 0c87c22700449b7774111879ee16c7ef
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index dcd62665a76..98fc8347e10 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,49 +1,22 @@
-$NetBSD: patch-aa,v 1.3 1999/05/02 17:46:19 tsarna Exp $
---- Makefile.orig	Tue Aug  8 15:28:27 1995
-+++ Makefile	Fri Apr 16 03:49:36 1999
-@@ -7,28 +7,32 @@
- #If the ar command fails on your system, consult the ar manpage
- #for your system. 
- 
--CC=gcc 
--AR=ar
--CFLAGS=-O
--LIBS=-L./ -lgd -lm
-+CC=${LIBTOOL} cc
-+LIBS=libgd.la -lm
-+OBJS=gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o
- 
- all: libgd.a gddemo giftogd webgif
- 
- gddemo: gddemo.o libgd.a gd.h gdfonts.h gdfontl.h
--	$(CC) gddemo.o -o gddemo	$(LIBS)
-+	${LIBTOOL} --mode=link cc gddemo.o -o gddemo	$(LIBS)
- 
- giftogd: giftogd.o libgd.a gd.h
--	$(CC) giftogd.o -o giftogd	$(LIBS) 
-+	${LIBTOOL} --mode=link cc giftogd.o -o giftogd	$(LIBS) 
- 
--libgd.a: gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
--	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
--	rm -f libgd.a
--	$(AR) rc libgd.a gd.o gdfontt.o gdfonts.o gdfontmb.o \
--		gdfontl.o gdfontg.o
-+libgd.a: ${OBJS} gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
-+	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:0
- 
- webgif: webgif.o libgd.a gd.h
--	$(CC) webgif.o -o webgif	$(LIBS)
-+	${LIBTOOL} --mode=link cc webgif.o -o webgif	$(LIBS)
- 
- clean:
--	rm -f *.o *.a gddemo giftogd 
-+	rm -f *.lo *.o *.a gddemo giftogd 
- 
-+install:
-+	${LIBTOOL} --mode=install install -cs -o bin -g bin gddemo giftogd webgif ${PREFIX}/bin
-+	${LIBTOOL} --mode=install install -c -o bin -g bin libgd.la ${PREFIX}/lib
-+	install -c -o bin -g bin gd.h gdfonts.h ${PREFIX}/include/gd
-+	install -c -o bin -g bin gdfontt.h gdfontmb.h ${PREFIX}/include/gd
-+	install -c -o bin -g bin gdfontl.h gdfontg.h ${PREFIX}/include/gd
-+	install -c -o bin -g bin index.html ${PREFIX}/share/examples/gd
-+	install -c -o bin -g bin demoin.gif ${PREFIX}/share/examples/gd
+$NetBSD: patch-aa,v 1.4 1999/08/26 15:26:28 agc Exp $
+
+Use NetBSD libtool
+
+--- configure	1999/08/26 15:11:27	1.1
++++ configure	1999/08/26 15:12:16
+@@ -1366,6 +1366,7 @@
+ fi
+ 
+ 
++if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -1523,6 +1524,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
++fi
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
diff --git a/graphics/gd/pkg/DESCR b/graphics/gd/pkg/DESCR
index b7a08dc1f56..ac93e67ac56 100644
--- a/graphics/gd/pkg/DESCR
+++ b/graphics/gd/pkg/DESCR
@@ -1,19 +1,22 @@
 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 .GIF file.
-	This is particularly useful in World Wide Web applications, where .GIF
-	is the format used for inline images. 
+	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 .GIF file.  This is particularly useful in
+	World Wide Web applications, where .GIF is the format used for
+	inline images. 
 
-	gd is not a paint program. If you are looking for a paint program, try 
-	xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com
-	in pub/ko/koblas. (That package is for the X Window System; for the Mac
-	and the PC, paint programs are considerably easier to find.) 
+	gd is not a paint program.  If you are looking for a paint
+	program, try xpaint by David Koblas, available by anonymous
+	FTP from ftp.netcom.com in pub/ko/koblas.  (That package is
+	for the X Window System; for the Mac and the PC, paint
+	programs are considerably easier to find.)
+
+	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 gd incorporates most of
+	the commonly requested features for a 2D package. 
 
-	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.3 incorporates most of the commonly requested 
-	features for a 2D package. 
 AUTHOR
-	gd 1.3 was written by Thomas Boutell and is currently distributed by 
+	gd was written by Thomas Boutell and is currently distributed by 
 	boutell.com, Inc. 
diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST
index b7b86ecda32..c58373dae88 100644
--- a/graphics/gd/pkg/PLIST
+++ b/graphics/gd/pkg/PLIST
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 1999/05/02 17:46:20 tsarna Exp $
-bin/gddemo
-bin/giftogd
-bin/webgif
-include/gd/gd.h
-include/gd/gdfontg.h
-include/gd/gdfontl.h
-include/gd/gdfontmb.h
-include/gd/gdfonts.h
-include/gd/gdfontt.h
-lib/libgd.a
+@comment $NetBSD: PLIST,v 1.4 1999/08/26 15:26:29 agc Exp $
+bin/pngtogd
+bin/pngtogd2
+bin/gdtopng
+bin/gd2topng
+bin/gd2copypal
+bin/gdparttopng
+bin/webpng
+include/gd.h
+include/gd_io.h
+include/gdfontt.h
+include/gdfonts.h
+include/gdfontmb.h
+include/gdfontl.h
+include/gdfontg.h
 lib/libgd.so.0.0
-share/examples/gd/demoin.gif
-share/examples/gd/index.html
-@dirrm include/gd
-@dirrm share/examples/gd
+lib/libgd.a