Go away, X11. giflib, as a library whose X functionality is _minimal_,

need not depend on or use X.  Its two X functions (capture window and
display image) are done rather well by programs available elsewhere, many
of which already support GIF (or at least PPM, which can be converted).
Also include <stdlib.h> such that the malloc() warnings go away on LP64.

6 files changed, 62 insertions, 36 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index fc2b0072489..5708d776846 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/09/14 20:19:59 garbled Exp $
+# $NetBSD: Makefile,v 1.14 1998/09/15 00:48:38 tv Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp
 #
 
@@ -10,7 +10,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ccil.org/~esr/giflib/
 
 USE_LIBTOOL=	yes
-USE_X11=	yes
+
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/gif2x11.html
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/giflib
diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa
index f5efb835b90..af670eb6502 100644
--- a/graphics/giflib/patches/patch-aa
+++ b/graphics/giflib/patches/patch-aa
@@ -1,13 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:47 agc Exp $
-
 --- lib/Makefile.orig	Thu Jun 26 14:07:56 1997
-+++ lib/Makefile	Tue Jul 14 15:37:23 1998
-@@ -11,9 +11,10 @@
- 
- #
++++ lib/Makefile	Mon Sep 14 20:23:58 1998
+@@ -13,7 +13,8 @@
  # Where all the include files are:
--INCS = -I.
-+INCS = -I. -I${X11BASE}/include
+ INCS = -I.
  
 -LIBDIR = /usr/lib
 +INCDIR = ${PREFIX}/include/giflib
@@ -15,6 +10,15 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:47 agc Exp $
  
  #
  # 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
  #
diff --git a/graphics/giflib/patches/patch-ab b/graphics/giflib/patches/patch-ab
index 7035deef370..cf1a23caf05 100644
--- a/graphics/giflib/patches/patch-ab
+++ b/graphics/giflib/patches/patch-ab
@@ -1,7 +1,6 @@
-$NetBSD: patch-ab,v 1.4 1998/09/14 20:20:00 garbled Exp $
---- util/Makefile.orig	Thu Jun 26 10:22:30 1997
-+++ util/Makefile	Mon Sep 14 12:53:28 1998
-@@ -22,12 +22,13 @@
+--- util/Makefile.orig	Thu Jun 26 13:22:30 1997
++++ util/Makefile	Mon Sep 14 20:26:57 1998
+@@ -22,12 +22,12 @@
  # X_INC_DIR = /server/sun4/usr/new/lib/X11R4
  
  # Declare the include files and libraries for the GIF utils:
@@ -11,7 +10,6 @@ $NetBSD: patch-ab,v 1.4 1998/09/14 20:20:00 garbled Exp $
 +CFLAGS+= -I../lib
 +GIF_LIB = ../lib/libgif.la
 +GIF_INC_DEPEND = ../lib/libgif.la ../lib/gif_lib.h ../lib/getarg.h
-+LDFLAGS = -s
  
  # Where to copy executables to:
 -DEST = /usr/bin
@@ -19,7 +17,7 @@ $NetBSD: patch-ab,v 1.4 1998/09/14 20:20:00 garbled Exp $
  
  # These are the flags for gcc, in BSD4.3 or Sun O.S. 4.0.3
  #
-@@ -81,12 +82,12 @@
+@@ -81,14 +81,14 @@
  
  # Linux using XFree86
  #
@@ -27,16 +25,18 @@ $NetBSD: patch-ab,v 1.4 1998/09/14 20:20:00 garbled Exp $
 +#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
-+X_INC_DIR = ${X11BASE}/include
-+X_LIB_DIR = ${X11BASE}/lib
++#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 gif2x11 gifasm gifbg \
++BINARIES = gif2epsn gif2ps gif2rgb gifasm gifbg \
  	gifclip gifclrmp gifcomb giffix gifflip gifhisto \
-@@ -105,7 +106,8 @@
+ 	gifinter gifinto gifovly gifpos gifrotat gifrsize giftext \
+ 	gifwedge raw2gif rgb2gif text2gif gifspnge giffiltr \
+@@ -105,7 +105,8 @@
  iris: $(IRIS)
  
  install-all:
@@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.4 1998/09/14 20:20:00 garbled Exp $
  
  install-rle:
  	cp $(RLE) $(DEST)
-@@ -114,7 +116,7 @@
+@@ -114,7 +115,7 @@
  	cp $(IRIS) $(DEST)
  
  .c:
@@ -55,12 +55,3 @@ $NetBSD: patch-ab,v 1.4 1998/09/14 20:20:00 garbled Exp $
  
  uninstall-utils:
  	(cd $(DEST); rm -f $(BINARIES) $(RLE) $(IRIS) $(SCRIPTS))
-@@ -123,7 +125,7 @@
- 	$(CC) gif2iris.c $(CFLAGS) $(LDFLAGS) -lgl_s -o gif2iris
- 
- gif2x11: gif2x11.c
--	$(CC) gif2x11.c $(CFLAGS) -I$(X_INC_DIR) -L$(X_LIB_DIR) $(LDFLAGS) $(GIF_LIB) $(XLIBS) -o gif2x11
-+	${LIBTOOL} --mode=link $(CC) gif2x11.c $(CFLAGS) -I$(X_INC_DIR) -L$(X_LIB_DIR) $(LDFLAGS) $(GIF_LIB) $(XLIBS) -o gif2x11
- 
- 
- clean:
diff --git a/graphics/giflib/patches/patch-ac b/graphics/giflib/patches/patch-ac
new file mode 100644
index 00000000000..d469ce68861
--- /dev/null
+++ b/graphics/giflib/patches/patch-ac
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 00000000000..42ab79dee50
--- /dev/null
+++ b/graphics/giflib/patches/patch-ad
@@ -0,0 +1,11 @@
+--- 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/pkg/PLIST b/graphics/giflib/pkg/PLIST
index acc13ad155a..278424c360d 100644
--- a/graphics/giflib/pkg/PLIST
+++ b/graphics/giflib/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 1998/07/16 13:36:47 tv Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/09/15 00:48:39 tv Exp $
 bin/gif2epsn
 bin/gif2ps
 bin/gif2rgb
-bin/gif2x11
 bin/gifasm
 bin/gifbg
 bin/gifclip
@@ -40,7 +39,6 @@ share/doc/giflib/gif2iris.html
 share/doc/giflib/gif2ps.html
 share/doc/giflib/gif2rgb.html
 share/doc/giflib/gif2rle.html
-share/doc/giflib/gif2x11.html
 share/doc/giflib/gif89.txt
 share/doc/giflib/gif_lib.html
 share/doc/giflib/gifasm.html