Update to 1.8.4:

* Add support for FreeType2 (John Ellson ellson@lucent.com)
[not used in the package right now]
* Add support for finding in fonts in a builtin DEFAULT_FONTPATH, or in a path
  from the GDFONTPATH environment variable.
* remove some unused symbols to reduce compiler warnings
* bugfix in size comparisons in gdImageCompare
* REXX now mentioned
* All memory allocation functions are now wrapped within the library; gdFree is
  exported and recommended for freeing memory returned by the
  gdImage(Something)Ptr family of functions.
Based on a package sent to tech-pkg by Adam Ciarcinski.

4 files changed, 63 insertions, 64 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index bd0966de6dc..1bf3bf1060f 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:00 jlam Exp $
-# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
+# $NetBSD: Makefile,v 1.34 2002/01/21 16:29:25 wiz Exp $
 #
 
-DISTNAME=       gd-1.8.3
+DISTNAME=       gd-1.8.4
 CATEGORIES=	graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/
 
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index bcd3f3383b3..90e361cb0ed 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/06/28 20:02:56 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/01/21 16:29:25 wiz Exp $
 
-SHA1 (gd-1.8.3.tar.gz) = a0a40813a2a516be35f464a76f7e15af238b45e1
-Size (gd-1.8.3.tar.gz) = 274318 bytes
-SHA1 (patch-aa) = 18391771c9b58172d58b25e841c2793a74c43282
-SHA1 (patch-ab) = a00035b1d8a2c9f2f705778c7d3d3ccd5f8e9a5e
+SHA1 (gd-1.8.4.tar.gz) = be8b20ca26b116a22e7a40c8a33dd54edb4a3721
+Size (gd-1.8.4.tar.gz) = 257631 bytes
+SHA1 (patch-aa) = 179b1f581e8fd6d627e8b1993d9d3e8d1dc301fa
+SHA1 (patch-ab) = 3ccce1d70933fb45159fbcbec7ef5450f2238049
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index 27630847b3c..35222f4b505 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,61 +1,61 @@
-$NetBSD: patch-aa,v 1.13 2001/06/28 20:02:57 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2002/01/21 16:29:26 wiz Exp $
 
---- Makefile.orig	Sat Jun  3 15:26:12 2000
+--- Makefile.orig	Thu Feb 22 18:03:43 2001
 +++ Makefile
-@@ -3,7 +3,9 @@
+@@ -3,7 +3,8 @@
  #If you do not have gcc, change the setting for COMPILER, but you must
  #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
  #compiler; get gcc if you are still using it). 
 -COMPILER=gcc
 +#COMPILER=gcc
-+
 +INSTALL=$(LIBTOOL) install -c -m
  
  #If the ar command fails on your system, consult the ar manpage
  #for your system. 
-@@ -11,10 +13,10 @@
- 
+@@ -12,12 +13,11 @@
  #If you don't have FreeType, libjpeg and/or Xpm installed, including the
- #header files, uncomment this (default).
--CFLAGS=-O
-+#CFLAGS=-O
+ #header files, uncomment this (default). You really must install
+ #libpng and zlib to get anywhere if you wish to create PNG images.
+-CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG
++#CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG
+ 
  #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
  #variation of this and comment out the line above. See also LIBS below.
--#CFLAGS=-O  -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
-+CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+-#CFLAGS=-O -DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \
+-#	-DHAVE_LIBFREETYPE -DHAVE_LIBTTF 
++CFLAGS+=-DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBTTF 
  
- #If you don't have FreeType and/or Xpm fully installed, uncomment this
- #(default).
-@@ -23,7 +25,7 @@
+ #To use the old FreeType 1.x library, add this additional #define
+ #to the line above
+@@ -30,13 +30,13 @@
  #Some systems are very picky about link order. They don't all agree
  #on the right order, either.
  
--LIBS=-lm -lgd -lpng -lz
-+#LIBS=-lm -lgd -lpng -lz
+-LIBS=-lgd -lpng -lz -lm
++#LIBS=-lgd -lpng -lz -lm
  
  #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
-@@ -33,14 +35,14 @@
- #Some systems are very picky about link order. They don't all agree
- #on the right order, either.
+ #Xpm requires X11. See also CFLAGS above.
  
--#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
-+LIBS=$(LIBGD) -lm -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl
+-#LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf
++LIBS=$(LIBGD) -lpng -lz -ljpeg -lm -lttf -lintl
  
- #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
- #If yours are somewhere else, change this. 
- #-I. is important to ensure that the version of gd you are installing
- #is used, and not an older release in your directory tree somewhere.
+ #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead.
  
--INCLUDEDIRS=-I. -I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
+@@ -45,7 +45,7 @@
+ #ensure that the version of gd you are installing is used, and not an 
+ #older release in your directory tree somewhere.
+ 
+-INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
 +INCLUDEDIRS=-I. ${CPPFLAGS}
  
  #Typical install locations for freetype, zlib, xpm and libpng libraries.
  #If yours are somewhere else, other than a standard location
-@@ -48,16 +50,16 @@
- #-L. as this allows the gd library itself to be found.
- #Put -L. first so that old versions of the gd library elsewhere
+@@ -55,16 +55,16 @@
  #on your system can't cause conflicts while building a new one.
+ #This line shouldn't hurt if you don't actually have some of the
+ #optional libraries and directories.
 -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
 +LIBDIRS=${LDFLAGS}
  
@@ -73,26 +73,21 @@ $NetBSD: patch-aa,v 1.13 2001/06/28 20:02:57 jlam Exp $
  
  #
  #
-@@ -65,9 +67,9 @@
- #
- #
+@@ -74,7 +74,7 @@
  
--VERSION=1.8.1
-+VERSION=1.8.3
+ VERSION=1.8.4
  
 -CC=$(COMPILER) $(INCLUDEDIRS)
 +CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS)
  LINK=$(CC) $(LIBDIRS) $(LIBS)
  
  PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
-@@ -75,71 +77,71 @@
+@@ -82,75 +82,75 @@
  BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
- TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
+ TEST_PROGRAMS=gdtest gddemo gd2time gdtestft gdtestttf
  
 -all: libgd.a $(PROGRAMS)
 +LIBGD=libgd.la
-+
-+all: $(LIBGD) $(PROGRAMS)
  
 -install: libgd.a $(BIN_PROGRAMS)
 -	sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a
@@ -112,6 +107,9 @@ $NetBSD: patch-aa,v 1.13 2001/06/28 20:02:57 jlam Exp $
 -	sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
 -	sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
 -	sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
++all: $(LIBGD) $(PROGRAMS)
+ 
+-gddemo: gddemo.o libgd.a
 +install: $(LIBGD) $(BIN_PROGRAMS)
 +	sh $(INSTALL) 644 $(LIBGD) $(INSTALL_LIB)
 +	sh $(INSTALL) 755 pngtogd $(INSTALL_BIN)/pngtogd
@@ -130,8 +128,7 @@ $NetBSD: patch-aa,v 1.13 2001/06/28 20:02:57 jlam Exp $
 +	sh $(INSTALL) 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
 +	sh $(INSTALL) 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
 +	sh $(INSTALL) 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
- 
--gddemo: gddemo.o libgd.a
++
 +gddemo: gddemo.o $(LIBGD)
  	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
  
@@ -171,31 +168,34 @@ $NetBSD: patch-aa,v 1.13 2001/06/28 20:02:57 jlam Exp $
 +gd2time: gd2time.o $(LIBGD)
  	$(CC) gd2time.o -o gd2time	$(LIBDIRS) $(LIBS)
  
+-gdtestft: gdtestft.o libgd.a
++gdtestft: gdtestft.o $(LIBGD)
+ 	$(CC) --verbose gdtestft.o -o gdtestft $(LIBDIRS) $(LIBS)
 -gdtestttf: gdtestttf.o libgd.a
 +gdtestttf: gdtestttf.o $(LIBGD)
- 	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
+ 	$(CC) --verbose gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
  
 -libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
--	gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
--	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o  wbmp.o gd_wbmp.o \
--	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
++GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
+ 	gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
+ 	gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
+-	gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
+-	gdfontg.h gdhelpers.h
 -	rm -f libgd.a
 -	$(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
 -		gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \
 -		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
--		gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o
+-		gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \
+ 		gd_wbmp.o gdhelpers.o
 -	-ranlib libgd.a
-+GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
-+	gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o \
-+	gdfontl.o gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o  wbmp.o \
-+	gd_wbmp.o
-+	
-+$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
++
++$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \
++	gdfontg.h gdhelpers.h
 +	rm -f $(LIBGD)
 +	$(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \
 +		-version-info $(GD_MAJOR):$(GD_MINOR) $(LIBDIRS) ${LIBS:C/${LIBGD}//g}
  
  clean:
 -	rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
--
 +	$(LIBTOOL) rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
+ 
diff --git a/graphics/gd/patches/patch-ab b/graphics/gd/patches/patch-ab
index 9e8e439f61c..cf4105e8f3e 100644
--- a/graphics/gd/patches/patch-ab
+++ b/graphics/gd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2000/06/14 16:33:49 he Exp $
+$NetBSD: patch-ab,v 1.5 2002/01/21 16:29:26 wiz Exp $
 
---- gd.h.orig	Wed Jun 14 17:45:03 2000
-+++ gd.h	Wed Jun 14 17:45:01 2000
-@@ -114,6 +114,7 @@
+--- gd.h.orig	Tue Feb  6 20:44:01 2001
++++ gd.h
+@@ -122,6 +122,7 @@
  gdImagePtr gdImageCreateFromGd2PartCtx(gdIOCtxPtr in, int srcx, int srcy, int w, int h);
  
  gdImagePtr gdImageCreateFromXbm(FILE *fd);