Update this package to version 1.8.1.

The 1.7.3 distribution file now contains 1.8.1; lame.

5 files changed, 26 insertions, 25 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index ebb58bfb556..ee44da06fd5 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2000/02/09 20:20:54 tron Exp $
+# $NetBSD: Makefile,v 1.13 2000/03/17 21:05:19 he Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
-DISTNAME=       gd-1.7.3
+DISTNAME=       gd-1.8.1
 CATEGORIES=	graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.boutell.com/gd/
 
-USE_LIBTOOL=	yes
-USE_X11=	yes
-
 DEPENDS+=	freetype-*:../../graphics/freetype
 DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	xpm-*:../../graphics/xpm
+DEPENDS+=	jpeg-*:../../graphics/jpeg
+
+USE_LIBTOOL=	yes
+USE_X11=	yes
 
 NO_CONFIGURE=	yes
 
@@ -30,7 +31,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include				# zlib.h
 # bump the MINOR when a new version comes out.
 #
 GD_MAJOR=	1
-GD_MINOR=	7
+GD_MINOR=	8
 MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}"
 
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/graphics/gd/files/md5 b/graphics/gd/files/md5
index c34aa337968..e8a35ac7464 100644
--- a/graphics/gd/files/md5
+++ b/graphics/gd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/11/01 03:29:30 jlam Exp $
+$NetBSD: md5,v 1.7 2000/03/17 21:05:19 he Exp $
 
-MD5 (gd-1.7.3.tar.gz) = c3690ae8c2cc0710e1777c697b876297
+MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f
diff --git a/graphics/gd/files/patch-sum b/graphics/gd/files/patch-sum
index 9fcee657e37..bacff5c6936 100644
--- a/graphics/gd/files/patch-sum
+++ b/graphics/gd/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/11/01 03:29:30 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/03/17 21:05:19 he Exp $
 
-MD5 (patch-aa) = dbf124363cae0edf06b034e7eaac20c0
+MD5 (patch-aa) = 8c3f8695506e9685466918bbe2d15750
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index aac2df21507..c969c44d920 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1999/11/01 03:29:30 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2000/03/17 21:05:20 he Exp $
 
---- Makefile.orig	Wed Oct 13 17:20:11 1999
-+++ Makefile	Sat Oct 30 23:28:34 1999
+--- Makefile.orig	Mon Mar 13 19:25:57 2000
++++ Makefile	Fri Mar 17 21:44:01 2000
 @@ -11,27 +11,27 @@
  
  #If the install command is not in your path, provide
@@ -9,27 +9,27 @@ $NetBSD: patch-aa,v 1.5 1999/11/01 03:29:30 jlam Exp $
 -INSTALL=install
 +INSTALL=$(LIBTOOL) install -c
  
- #If you don't have FreeType and/or Xpm installed, including the
+ #If you don't have FreeType, libjpeg and/or Xpm installed, including the
  #header files, uncomment this (default).
 -CFLAGS=-O
 +#CFLAGS=-O
- #If you do have FreeType and/or Xpm fully installed, uncomment a
+ #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_LIBTTF
-+CFLAGS+=-O -DHAVE_XPM -DHAVE_LIBTTF
+-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
++CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
  
  #If you don't have FreeType and/or Xpm fully installed, uncomment this
  #(default).
 -LIBS=-lm -lgd -lpng -lz
 +#LIBS=-lm -lgd -lpng -lz
  
- #If you do have FreeType and/or Xpm fully installed, uncomment a 
+ #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
  #Xpm requires X11. See also CFLAGS above.
--#LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11
-+LIBS=$(LIBGD) -lm -lpng -lz -lttf -lintl -lXpm -lX11
+-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
++LIBS=$(LIBGD) -lm -lpng -lz -ljpeg -lttf -lXpm -lX11
  
- #Typical install locations for freetype, zlib, xpm and libpng header files.
+ #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
  #If yours are somewhere else, change this. 
 -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
 +INCLUDEDIRS=${CPPFLAGS}
@@ -132,12 +132,12 @@ $NetBSD: patch-aa,v 1.5 1999/11/01 03:29:30 jlam Exp $
  
 -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_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 gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.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 \
 -	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.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 gdxpm.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
 -	-ranlib libgd.a
diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST
index 1a358b73135..81fb654bb5b 100644
--- a/graphics/gd/pkg/PLIST
+++ b/graphics/gd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1999/11/01 03:29:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/03/17 21:05:20 he Exp $
 bin/pngtogd
 bin/pngtogd2
 bin/gdtopng
@@ -16,4 +16,4 @@ include/gdfontmb.h
 include/gdfonts.h
 include/gdfontt.h
 lib/libgd.a
-lib/libgd.so.1.7
+lib/libgd.so.1.8