From 958c5e5a32346a38dd2454cf64b256287c91dd79 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Thu, 18 Mar 1999 01:31:15 +0000
Subject: [PATCH] upgrade to giflib 4.1.0

---
 graphics/giflib/Makefile           |  17 +++--
 graphics/giflib/files/md5          |   6 +-
 graphics/giflib/patches/patch-aa   | 107 +++--------------------------
 graphics/giflib/patches/patch-ab   |  87 +++++++++++------------
 graphics/giflib/pkg/PLIST          |  64 ++++++++---------
 graphics/giflib/pkg/PLIST.noshared |  60 ++++++++--------
 6 files changed, 123 insertions(+), 218 deletions(-)

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index b7406cb867c..0e5aa7fdfac 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,15 +1,20 @@
-# $OpenBSD: Makefile,v 1.2 1999/02/21 04:26:11 marc Exp $
-#
+# $OpenBSD: Makefile,v 1.3 1999/03/18 01:31:15 brad Exp $
 
-DISTNAME=		giflib-3.0
+DISTNAME=		giflib-4.1.0
 CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	libs/giflib
 
-NEED_VERSION=		1.64
+NEED_VERSION=		1.73
 
 MAINTAINER=		yanick@fries.net	
 
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs/giflib
+USE_GMAKE=	yes
+SYSCONFDIR=	${PREFIX}/lib
+SEPARATE_BUILD=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
+CONFIGURE_ARGS+=	--enable-static --sysconfdir=${SYSCONFDIR}
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/giflib/files/md5 b/graphics/giflib/files/md5
index acdad86b2f9..af2a1d5cac9 100644
--- a/graphics/giflib/files/md5
+++ b/graphics/giflib/files/md5
@@ -1,3 +1,3 @@
-MD5 (giflib-3.0.tar.gz) = d8fb92324901ec8ae4d8da223875669b
-RMD160 (giflib-3.0.tar.gz) = 518c00246ad6c0119e959634a0def5a4169bde65
-SHA1 (giflib-3.0.tar.gz) = 721ecf07e74ef20e0c6a496f64e1aa405d7db7a0
+MD5 (giflib-4.1.0.tar.gz) = f70e8fe2dd57815bd2740aa88aa32f2c
+RMD160 (giflib-4.1.0.tar.gz) = 539793899cfbd866df862143c3a158a62de9a663
+SHA1 (giflib-4.1.0.tar.gz) = d282070e7fda813c87789d4b31b61ac8afeccc3c
diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa
index ac9bec88841..bfadbc93279 100644
--- a/graphics/giflib/patches/patch-aa
+++ b/graphics/giflib/patches/patch-aa
@@ -1,98 +1,11 @@
---- lib/Makefile.orig	Thu Jun 26 14:07:56 1997
-+++ lib/Makefile	Sat Nov  7 17:23:01 1998
-@@ -11,9 +11,10 @@
+--- lib/Makefile.in.orig	Wed Mar 17 15:19:06 1999
++++ lib/Makefile.in	Wed Mar 17 15:19:21 1999
+@@ -97,7 +97,7 @@
+                     quantize.c  \
+ 					gif_lib_private.h
  
- #
- # Where all the include files are:
--INCS = -I.
-+INCS = -I. -I${X11BASE}/include
- 
--LIBDIR = /usr/lib
-+IDIR=    ${PREFIX}/include/giflib
-+LIBDIR = ${PREFIX}/lib
- 
- #
- # What devices we should be able to grab into gif images. Note that if
-@@ -31,9 +32,9 @@
- # the -Wxxx with -Wall. I can not add -Wimplicit as my system uses old cc
- # h files.
- #
--# CC = gcc
-+CC = gcc
- #
--# CFLAGS = -O -c -W -Wreturn-type -Wcomment
-+CFLAGS = -O -c -W -Wreturn-type -Wcomment
- # CFLAGS = -g -pg -c -W -Wreturn-type -Wcomment
- #
- # for sun 4 (gunnars@ifi.uib.no). Tested using gcc 1.39.
-@@ -60,31 +61,43 @@
- #
- # GNU CC over Linux and XFree86
- #
--CC = gcc
-+#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
- 
-+SOBJS= dev2gif.so egif_lib.so dgif_lib.so gifalloc.so gif_font.so gif_hash.so \
-+	gif_err.so quantize.so qprintf.so getarg.so
-+
-+.SUFFIXES: .o .so
-+
- .c.o:
--	$(CC) $(INCS) $(DEVS) $(CFLAGS) $<
-+	$(CC) -c $(INCS) $(DEVS) $(CFLAGS) $<
-+
-+.c.so:
-+	$(CC) -c $(INCS) $(DEVS) $(CFLAGS) -fpic -DPIC -o $@ $<
- 
- all: static shared
- 
- static: libgif.a
-+.if (${MACHINE_ARCH} == "alpha")
-+shared:
-+.else
- shared: $(SHLIB)
-+.endif
- 
- libgif.a: $(OBJS)
- 	rm -f libgif.a
- 	ar rcv libgif.a $(OBJS)
- 	-ranlib libgif.a
- 
--$(SHLIB): $(OBJS)
-+$(SHLIB): $(SOBJS)
- 	rm -f libgif.so.$(V)
--	gcc -shared -o $(SHLIB) $(OBJS)
-+	ld -Bshareable -o $(SHLIB) $(SOBJS)
- 
- dev2gif.o: gif_lib.h
- egif_lib.o: gif_lib.h gif_hash.h
-@@ -98,9 +111,18 @@
- getarg.o: getarg.h
- 
- install-lib: libgif.a
--	cp libgif.a libgif.so.$(V) $(LIBDIR)
-+	${BSD_INSTALL_DATA} libgif.a $(LIBDIR)
-+.if (${MACHINE_ARCH} != "alpha")
-+	${BSD_INSTALL_DATA} libgif.so.$(V) $(LIBDIR)
-+.endif
-+	${BSD_INSTALL_DATA_DIR} ${IDIR}
-+	${BSD_INSTALL_DATA} *.h ${IDIR}
-+
-+uninstall-lib:
-+	${RM} -f $(LIBDIR)/libgif.a
-+.if (${MACHINE_ARCH} != "alpha")
-+	${RM} -f $(LIBDIR)/$(SHLIB)
-+.endif
- 
--uninstall-lib: shared static
--	rm -f $(LIBDIR)/libgif.a $(LIBDIR)/$(SHLIB)
- clean:
- 	rm -f *.[oa] *~ libgif.so.$(V)
+-libgif_la_LDFLAGS = -version-info 5:0:1
++libgif_la_LDFLAGS = -version-info 4:1:0
+ libgif_la_LIBADD = @DEVS@
+ CFLAGS = @CFLAGS@ $(X_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/giflib/patches/patch-ab b/graphics/giflib/patches/patch-ab
index 3eae912d81b..0bc198a4efe 100644
--- a/graphics/giflib/patches/patch-ab
+++ b/graphics/giflib/patches/patch-ab
@@ -1,48 +1,43 @@
---- util/Makefile.orig	Thu Jun 26 10:22:30 1997
-+++ util/Makefile	Wed Nov  4 18:10:27 1998
-@@ -6,7 +6,7 @@
- #
- #	make -f makefile.unx [all] [rle] [iris]
- #
--# To install them in the /usr/bin directory:
-+# To install them in the ${PREFIX}/bin directory:
- #
- #	make -f makefile.unx [install-all] [install-rle] [install-iris]
- #
-@@ -27,7 +27,7 @@
- GIF_INC_DEPEND = ../lib/libgif.a ../lib/gif_lib.h ../lib/getarg.h
+--- ltmain.sh.orig	Wed Mar 17 15:17:14 1999
++++ ltmain.sh	Wed Mar 17 15:17:40 1999
+@@ -2162,40 +2162,6 @@
+       done
+     fi
  
- # Where to copy executables to:
--DEST = /usr/bin
-+DEST = ${PREFIX}/bin
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "To link against installed libraries in a given directory, LIBDIR,"
+-    echo "you must use the \`-LLIBDIR' flag during linking."
+-    echo
+-    echo " You will also need to do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
  
- # These are the flags for gcc, in BSD4.3 or Sun O.S. 4.0.3
- #
-@@ -35,8 +35,8 @@
- # the -Wxxx with -Wall. I can not add -Wimplicit as my system uses old cc
- # h files.
- #
--# CC = gcc
--# CFLAGS = $(INC) -O -s -W -Wreturn-type -Wcomment
-+CC = gcc
-+CFLAGS = $(INC) -O -s -W -Wreturn-type -Wcomment
- # CFLAGS = $(INC) -g -pg -W -Wreturn-type -Wcomment
- 
- 
-@@ -81,12 +81,12 @@
- 
- # 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
-+#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
- 
- BINARIES = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg \
- 	gifclip gifclrmp gifcomb giffix gifflip gifhisto \
diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST
index 51807ef9ac7..d5b03bd16d8 100644
--- a/graphics/giflib/pkg/PLIST
+++ b/graphics/giflib/pkg/PLIST
@@ -1,38 +1,34 @@
-@cwd /usr/local
-@name giflib-3.0
-bin/rgb2gif
 bin/gif2epsn
-bin/gifcompose
-bin/gifcolor
-bin/icon2gif
-bin/giffiltr
-bin/gifspnge
-bin/text2gif
-bin/raw2gif
-bin/gifwedge
-bin/giftext
-bin/gifrsize
-bin/gifrotat
-bin/gifpos
-bin/gifovly
-bin/gifinto
-bin/gifinter
-bin/gifhisto
-bin/gifflip
-bin/giffix
-bin/gifcomb
-bin/gifclrmp
-bin/gifclip
-bin/gifbg
-bin/gifasm
-bin/gif2x11
-bin/gif2rgb
 bin/gif2ps
+bin/gif2rgb
+bin/gifasm
+bin/gifbg
+bin/gifclip
+bin/gifcomb
+bin/giffix
+bin/gifflip
+bin/gifhisto
+bin/gifinter
+bin/gifinto
+bin/gifovly
+bin/gifpos
+bin/gifrsize
+bin/giftext
+bin/gifwedge
+bin/raw2gif
+bin/rgb2gif
+bin/text2gif
+bin/gifspnge
+bin/giffiltr
+bin/icon2gif
+bin/gifcolor
+bin/gifclrmp
+bin/gifrotat
+bin/gif2x11
+bin/gifcompose
 bin/gifburst
-lib/libgif.so.3.0
 lib/libgif.a
-include/giflib/gif_lib.h
-include/giflib/gif_hash.h
-include/giflib/getarg.h
-@dirrm include/giflib
-@exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m /usr/local/lib
+lib/libgif.la
+lib/libgif.so.4.1
+include/gif_lib.h
+@exec /sbin/ldconfig -m /usr/local/lib
diff --git a/graphics/giflib/pkg/PLIST.noshared b/graphics/giflib/pkg/PLIST.noshared
index 30cd2293d02..25acdbb513a 100644
--- a/graphics/giflib/pkg/PLIST.noshared
+++ b/graphics/giflib/pkg/PLIST.noshared
@@ -1,36 +1,32 @@
-@cwd /usr/local
-@name giflib-3.0
-bin/rgb2gif
 bin/gif2epsn
-bin/gifcompose
-bin/gifcolor
-bin/icon2gif
-bin/giffiltr
-bin/gifspnge
-bin/text2gif
-bin/raw2gif
-bin/gifwedge
-bin/giftext
-bin/gifrsize
-bin/gifrotat
-bin/gifpos
-bin/gifovly
-bin/gifinto
-bin/gifinter
-bin/gifhisto
-bin/gifflip
-bin/giffix
-bin/gifcomb
-bin/gifclrmp
-bin/gifclip
-bin/gifbg
-bin/gifasm
-bin/gif2x11
-bin/gif2rgb
 bin/gif2ps
+bin/gif2rgb
+bin/gifasm
+bin/gifbg
+bin/gifclip
+bin/gifcomb
+bin/giffix
+bin/gifflip
+bin/gifhisto
+bin/gifinter
+bin/gifinto
+bin/gifovly
+bin/gifpos
+bin/gifrsize
+bin/giftext
+bin/gifwedge
+bin/raw2gif
+bin/rgb2gif
+bin/text2gif
+bin/gifspnge
+bin/giffiltr
+bin/icon2gif
+bin/gifcolor
+bin/gifclrmp
+bin/gifrotat
+bin/gif2x11
+bin/gifcompose
 bin/gifburst
 lib/libgif.a
-include/giflib/gif_lib.h
-include/giflib/gif_hash.h
-include/giflib/getarg.h
-@dirrm include/giflib
+lib/libgif.la
+include/gif_lib.h