Update giflib to 4.1.0. Note that installed headers are in a new location.

Changes from version 3.0:

Version 4.1.0
============
* Several minor memory leaks in error conditions have been plugged.
* New Function EGifOpen(void *userData, OutputFunc writeFunc) allows user
  specified gif writing functions.
* Old copyright notices in a few source files have been updated.  All library
  copyrights should now reflect the copyright notice in the COPYING file.

Version 4.0.0 -- giflib
=======================
This version of the giflib library merges Eric Raymond's giflib-3.0 release
with the libungif-4.0 release to give people a binary compatible choice
between the two libraries and gives me the chance to add bugfixes to giflib
that have been incorporated in libungif.

PLEASE READ THE FILE PATENT_PROBLEMS BEFORE USING THIS LIBRARY!

Version 4.0.0
=============
Major fixes have been made to the code that handles Extensions.
Unfortunately, this causes binary incompatibility with giflib-3.0 and
libungif-3.x.  However, the API is still intact.  I am, however, deprecating
the use of saveImage[x].Function.  Use
saveImage[x].ExtensionBlocks[y].Function instead.

Version 3.1.1
=============
 The following bugs which caused SegFaults have been fixed:
 * When reading gif files with extensions, DGifSlurp would violate memory.
 * When closing a gif that had a local colormap, DGifCloseFile would attempt
   to free the colormap twice.
 * Fix a potential memory leak in DGifSlurp.
The following enhancements have been made:
 * New function DGifOpen to allow specifying a user definable gif reading
   function.

Version 3.1.0
=============
 * Add a new function:
        GifFileType *DGifOpen(void * userData, InputFunc readFunc)
   to read the gif image from a user defined input function.
 * A few bugfixes.

Version 3.0
===========
Changes from Eric Raymond's libgif:
 * A new gif encoder that makes uncompressed gifs rather than standard,
   LZW-compressed gifs.  This is actually the major motivating factor behind
   libungif; to provide third-party distributors a means to provide a gif
   library without the patented LZW encoder.

 * A new configure script to make compilation of the library on multiple
   platforms easier.  The package should now build shared libraries on all
   platforms supported by GNU libtool.

 * Removed the getarg functions from libgif.  These were not part of the
   public API and only used by the tools in the utils directory so I separated
   them from the rest of the library.

 * Fixed a few bugs in the tools in the utils directory.

10 files changed, 66 insertions, 243 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 2bcb38be90d..22fc8ae5d3a 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,28 +1,34 @@
-# $NetBSD: Makefile,v 1.16 1999/09/30 15:21:55 agc Exp $
-# FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp
+# $NetBSD: Makefile,v 1.17 1999/10/09 20:31:33 jlam Exp $
 #
 
-DISTNAME=	giflib-3.0
+DISTNAME=	giflib-4.1.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.ccil.org/~esr/giflib/
+MASTER_SITES=	ftp://prtr-13.ucsc.edu/pub/giflib/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.ccil.org/~esr/giflib/
+HOMEPAGE=	http://prtr-13.ucsc.edu/~badger/software/giflib.shtml
+
+CONFLICTS=	libungif-*
 
 USE_LIBTOOL=	yes
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-x
+
+DOCDIR=		${PREFIX}/share/doc/giflib
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	CC="${CC} -I${LOCALBASE}/include"
 .endif
 
-post-extract:
-	@${RM} -f ${WRKSRC}/doc/gif2x11.html
+post-patch:
+	${RM} ${WRKSRC}/doc/gif2x11.html
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/giflib
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt \
-	  ${PREFIX}/share/doc/giflib
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} COPYING PATENT_PROBLEMS ${DOCDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt *.png ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giflib/files/md5 b/graphics/giflib/files/md5
index 16bafe13544..d6e7e25b5ba 100644
--- a/graphics/giflib/files/md5
+++ b/graphics/giflib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:36 agc Exp $
+$NetBSD: md5,v 1.3 1999/10/09 20:31:34 jlam Exp $
 
-MD5 (giflib-3.0.tar.gz) = d8fb92324901ec8ae4d8da223875669b
+MD5 (giflib-4.1.0.tar.gz) = f70e8fe2dd57815bd2740aa88aa32f2c
diff --git a/graphics/giflib/files/patch-sum b/graphics/giflib/files/patch-sum
index 0bed25cd927..0381e6c9a51 100644
--- a/graphics/giflib/files/patch-sum
+++ b/graphics/giflib/files/patch-sum
@@ -1,7 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/09/30 15:21:55 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/09 20:31:34 jlam Exp $
 
-MD5 (patch-aa) = 9ecb7a3292ae539e6c3664ee255cf50a
-MD5 (patch-ab) = ba2b8becb479b6762d41c68649d88373
-MD5 (patch-ac) = 2a058183175ff62add83420abb13315c
-MD5 (patch-ad) = 708895123a702ec7beb4c7fe31990e17
-MD5 (patch-ae) = 2b918a85267684e8ed99bdfe725e7bc8
+MD5 (patch-aa) = 9cdc34473a103569f40b987991c70d21
+MD5 (patch-ab) = c74223ef8d6f51235a56930377ea6558
diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa
index 0a972fdcf89..07d48071661 100644
--- a/graphics/giflib/patches/patch-aa
+++ b/graphics/giflib/patches/patch-aa
@@ -1,71 +1,20 @@
-$NetBSD: patch-aa,v 1.5 1998/11/12 23:36:24 frueauf Exp $
+$NetBSD: patch-aa,v 1.6 1999/10/09 20:31:34 jlam Exp $
 
---- lib/Makefile.orig	Thu Jun 26 14:07:56 1997
-+++ lib/Makefile	Mon Sep 14 20:23:58 1998
-@@ -13,7 +13,8 @@
- # Where all the include files are:
- INCS = -I.
- 
--LIBDIR = /usr/lib
-+INCDIR = ${PREFIX}/include/giflib
-+LIBDIR = ${PREFIX}/lib
- 
- #
- # What devices we should be able to grab into gif images. Note that if
-@@ -22,7 +23,7 @@
- # 1. EGA, VGA, SVGA (800x600), Hercules - all on IBM PC only.
- # 2. SGI 4D Irix using gl library (Add -D__SGI_GL__).
- # 3. X11 using libX.a (Add -D__X11__)
--DEVS = -D__X11__
-+#DEVS = -D__X11__
- 
- #
- # These are the flags for gcc, in BSD4.3 or Sun O.S. 4.0.3
-@@ -63,28 +64,20 @@
- CC = gcc
- #
- #CFLAGS = -fno-builtin -O -c -W -Wreturn-type -Wcomment
--CFLAGS = -fno-builtin -g -c -W -Wreturn-type -Wcomment
-+#CFLAGS = -fno-builtin -g -c -W -Wreturn-type -Wcomment
- 
- 
- OBJS = dev2gif.o egif_lib.o dgif_lib.o gifalloc.o gif_font.o gif_hash.o \
- 	gif_err.o quantize.o qprintf.o getarg.o
- 
- .c.o:
--	$(CC) $(INCS) $(DEVS) $(CFLAGS) $<
-+	${LIBTOOL} --mode=compile $(CC) -c $(INCS) $(DEVS) $(CFLAGS) $<
- 
--all: static shared
-+all static shared: libgif.la
- 
--static: libgif.a
--shared: $(SHLIB)
--
--libgif.a: $(OBJS)
--	rm -f libgif.a
--	ar rcv libgif.a $(OBJS)
--	-ranlib libgif.a
--
--$(SHLIB): $(OBJS)
--	rm -f libgif.so.$(V)
--	gcc -shared -o $(SHLIB) $(OBJS)
-+libgif.la: $(OBJS)
-+	${LIBTOOL} --mode=link ${CC} -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib \
-+		-version-info 3:0
- 
- dev2gif.o: gif_lib.h
- egif_lib.o: gif_lib.h gif_hash.h
-@@ -97,8 +90,10 @@
- qprintf.o: gif_lib.h
- getarg.o: getarg.h
- 
--install-lib: libgif.a
--	cp libgif.a libgif.so.$(V) $(LIBDIR)
-+install-lib: libgif.la
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libgif.la ${PREFIX}/lib
-+	mkdir -p ${INCDIR}
-+	${BSD_INSTALL_DATA} *.h ${INCDIR}
- 
- uninstall-lib: shared static
- 	rm -f $(LIBDIR)/libgif.a $(LIBDIR)/$(SHLIB)
+--- ./configure.orig	Wed Feb 10 01:35:28 1999
++++ ./configure	Wed Oct  6 00:07:40 1999
+@@ -1191,6 +1191,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1240,6 +1241,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
++fi
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/graphics/giflib/patches/patch-ab b/graphics/giflib/patches/patch-ab
index 8e04eab6ca4..e158c306e5f 100644
--- a/graphics/giflib/patches/patch-ab
+++ b/graphics/giflib/patches/patch-ab
@@ -1,61 +1,13 @@
-$NetBSD: patch-ab,v 1.7 1999/09/30 15:21:55 agc Exp $
+$NetBSD: patch-ab,v 1.8 1999/10/09 20:31:34 jlam Exp $
 
---- util/Makefile.orig	Thu Jun 26 18:22:30 1997
-+++ util/Makefile	Thu Sep 30 16:01:59 1999
-@@ -22,12 +22,12 @@
- # X_INC_DIR = /server/sun4/usr/new/lib/X11R4
- 
- # Declare the include files and libraries for the GIF utils:
--INC = -I../lib
--GIF_LIB = ../lib/libgif.a
--GIF_INC_DEPEND = ../lib/libgif.a ../lib/gif_lib.h ../lib/getarg.h
-+CDEFS= -I../lib
-+GIF_LIB = ../lib/libgif.la
-+GIF_INC_DEPEND = ../lib/libgif.la ../lib/gif_lib.h ../lib/getarg.h
- 
- # Where to copy executables to:
--DEST = /usr/bin
-+DEST = ${PREFIX}/bin
- 
- # These are the flags for gcc, in BSD4.3 or Sun O.S. 4.0.3
- #
-@@ -81,14 +81,14 @@
- 
- # Linux using XFree86
- #
--CC = gcc
-+#CC = gcc
- #CFLAGS = $(INC) -fno-builtin -O -s -W -Wreturn-type -Wcomment
--CFLAGS = $(INC) -fno-builtin -g -W -Wreturn-type -Wcomment
--XLIBS = -lX11
-+#CFLAGS = $(INC) -fno-builtin -g -W -Wreturn-type -Wcomment
-+#XLIBS = -lX11
- X_INC_DIR = /usr/X11/include
- X_LIB_DIR = /usr/X11/lib
- 
--BINARIES = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg \
-+BINARIES = gif2epsn gif2ps gif2rgb gifasm gifbg \
- 	gifclip gifclrmp gifcomb giffix gifflip gifhisto \
- 	gifinter gifinto gifovly gifpos gifrotat gifrsize giftext \
- 	gifwedge raw2gif rgb2gif text2gif gifspnge giffiltr \
-@@ -105,7 +105,8 @@
- iris: $(IRIS)
- 
- install-all:
--	cp $(BINARIES) $(SCRIPTS) $(DEST)
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(BINARIES) $(DEST)
-+	${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(DEST)
- 
- install-rle:
- 	cp $(RLE) $(DEST)
-@@ -113,8 +114,8 @@
- install-iris:
- 	cp $(IRIS) $(DEST)
- 
--.c:
--	$(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -o $*
-+.c:
-+	${LIBTOOL} --mode=link $(CC) $(CDEFS) ${CFLAGS} $< $(GIF_LIB) -lm $(LDFLAGS) -L$(X_LIB_DIR) $(XLIBS) -o $*
- 
- uninstall-utils:
- 	(cd $(DEST); rm -f $(BINARIES) $(RLE) $(IRIS) $(SCRIPTS))
+--- ./doc/index.html.orig	Sun Sep  6 12:07:35 1998
++++ ./doc/index.html	Wed Oct  6 00:08:07 1999
+@@ -65,8 +65,6 @@
+ <DD>convert images saved as GIF to 24-bit RGB image(s)
+ <DT><a href="gif2rle.html">gif2rle</a>
+ <DD>convert images saved as GIF to RLE (Utah raster toolkit) format
+-<DT><a href="gif2x11.html">gif2x11</a>
+-<DD>display images saved as GIF files under X window system
+ <DT><a href="raw2gif.html">raw2gif</a>
+ <DD>convert raw 8-bit image data into GIF files
+ <DT><a href="rgb2gif.html">rgb2gif</a>
diff --git a/graphics/giflib/patches/patch-ac b/graphics/giflib/patches/patch-ac
deleted file mode 100644
index 3be40153726..00000000000
--- a/graphics/giflib/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/11/12 23:36:24 frueauf Exp $
-
---- doc/index.html.orig	Mon Sep 14 20:18:13 1998
-+++ doc/index.html	Mon Sep 14 20:18:25 1998
-@@ -25,7 +25,7 @@
- maintainers for general distribution.</P>
- 
- The util directory includes programs to clip, rotate, scale, and
--position GIF images.  It includes an X11 viewer, code to dump GIFs to
-+position GIF images.  It includes code to dump GIFs to
- an Epson-compatible printer in graphics mode, and many conversion
- utilities.  These are no replacement for an interactive graphics
- editor, but they can be very useful for scripted image generation or
-@@ -65,8 +65,6 @@
- <DD>convert images saved as GIF to 24-bit RGB image(s)
- <DT><a href="gif2rle.html">gif2rle</a>
- <DD>convert images saved as GIF to RLE (Utah raster toolkit) format
--<DT><a href="gif2x11.html">gif2x11</a>
--<DD>display images saved as GIF files under X window system
- <DT><a href="raw2gif.html">raw2gif</a>
- <DD>convert raw 8-bit image data into GIF files
- <DT><a href="rgb2gif.html">rgb2gif</a>
diff --git a/graphics/giflib/patches/patch-ad b/graphics/giflib/patches/patch-ad
deleted file mode 100644
index 69d427ebdda..00000000000
--- a/graphics/giflib/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/11/12 23:36:24 frueauf Exp $
-
---- lib/gif_lib.h.orig	Mon Sep 14 20:28:38 1998
-+++ lib/gif_lib.h	Mon Sep 14 20:28:46 1998
-@@ -15,6 +15,8 @@
- #ifndef GIF_LIB_H
- #define GIF_LIB_H
- 
-+#include <stdlib.h>
-+
- #define GIF_LIB_VERSION	" Version 2.0, "
- 
- #define	GIF_ERROR	0
diff --git a/graphics/giflib/patches/patch-ae b/graphics/giflib/patches/patch-ae
deleted file mode 100644
index 966191e838d..00000000000
--- a/graphics/giflib/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/09/30 15:21:55 agc Exp $
-
-Use ${MAKE}, not make
-
---- Makefile	1999/09/30 15:10:53	1.1
-+++ Makefile	1999/09/30 15:11:26
-@@ -5,20 +5,20 @@
- VERSION=3.0
- 
- all:
--	cd lib; make static shared
--	cd util; make all
-+	cd lib; ${MAKE} static shared
-+	cd util; ${MAKE} all
- 
- install:
--	cd lib; make install-lib
--	cd util; make install-all
-+	cd lib; ${MAKE} install-lib
-+	cd util; ${MAKE} install-all
- 
- uninstall:
--	cd lib; make uninstall-lib
--	cd util; make uninstall-all
-+	cd lib; ${MAKE} uninstall-lib
-+	cd util; ${MAKE} uninstall-all
- 
- clean:
--	cd lib; make clean
--	cd util; make clean
-+	cd lib; ${MAKE} clean
-+	cd util; ${MAKE} clean
- 	rm -f giflib-$(VERSION)-1.i386.rpm giflib-$(VERSION)-1.src.rpm \
- 		giflib-$(VERSION).tar.gz core giflib.lsm
- 
-@@ -28,9 +28,9 @@
- 	gzip -f giflib-$(VERSION).tar
- 
- dist: Makefile
--	make giflib-$(VERSION).tar.gz
-+	${MAKE} giflib-$(VERSION).tar.gz
- 	lsmgen.sh $(VERSION) `wc -c giflib-$(VERSION).tar.gz` >giflib.lsm
--	make giflib-$(VERSION).tar.gz
-+	${MAKE} giflib-$(VERSION).tar.gz
- 	ls -l giflib-$(VERSION).tar.gz
- 	@echo "Don't forget to build RPMs from root!"
- 
diff --git a/graphics/giflib/pkg/DESCR b/graphics/giflib/pkg/DESCR
index f7a03519d10..974ae0b7020 100644
--- a/graphics/giflib/pkg/DESCR
+++ b/graphics/giflib/pkg/DESCR
@@ -1,12 +1,13 @@
+Giflib is a GIF manipulation library and tools.  Note that this package
+has potential patent problems: giflib incorporates the LZW compression
+algorithm whose patent is currently held by Unisys.
+
 The tools include programs to clip, rotate, scale, and position
-GIF images.  It includes an X11 viewer, and code to dump GIFs to an
-Epson-compatible printer in graphics mode, and several conversion utilities.
+GIF images.  It includes code to dump GIFs to an Epson-compatible printer
+in graphics mode, and several conversion utilities.
 
 The library includes program-callable entry points for reading and writing
 GIF files, an 8x8 utility font for embedding text in GIFs, and an error
 handler.  GIF manipulation can be done at a relatively low level by
 sequential I/O (which automatically does/undoes image compression) or at
 a higher level by slurping an entire GIF into allocated core.
-
-See /usr/local/share/doc/giflib directory for more information
-on GIFLIB's capabilities.
diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST
index 278424c360d..a4a94fef05f 100644
--- a/graphics/giflib/pkg/PLIST
+++ b/graphics/giflib/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 1998/09/15 00:48:39 tv Exp $
+@comment $NetBSD: PLIST,v 1.8 1999/10/09 20:31:35 jlam Exp $
 bin/gif2epsn
 bin/gif2ps
 bin/gif2rgb
 bin/gifasm
 bin/gifbg
 bin/gifclip
-bin/gifclrmp
 bin/gifcomb
 bin/giffix
 bin/gifflip
@@ -14,7 +13,6 @@ bin/gifinter
 bin/gifinto
 bin/gifovly
 bin/gifpos
-bin/gifrotat
 bin/gifrsize
 bin/giftext
 bin/gifwedge
@@ -25,13 +23,16 @@ bin/gifspnge
 bin/giffiltr
 bin/icon2gif
 bin/gifcolor
+bin/gifclrmp
+bin/gifrotat
 bin/gifcompose
 bin/gifburst
-include/giflib/getarg.h
-include/giflib/gif_hash.h
-include/giflib/gif_lib.h
+include/gif_lib.h
 lib/libgif.a
-lib/libgif.so.3.0
+lib/libgif.so.5.0
+share/doc/giflib/COPYING
+share/doc/giflib/GifFileType.png
+share/doc/giflib/PATENT_PROBLEMS
 share/doc/giflib/gif2bgi.html
 share/doc/giflib/gif2epsn.html
 share/doc/giflib/gif2herc.html
@@ -70,5 +71,4 @@ share/doc/giflib/raw2gif.html
 share/doc/giflib/rgb2gif.html
 share/doc/giflib/rle2gif.html
 share/doc/giflib/text2gif.html
-@dirrm include/giflib
 @dirrm share/doc/giflib