head 1.11; access; symbols pkgsrc-2013Q2:1.11.0.6 pkgsrc-2013Q2-base:1.11 pkgsrc-2012Q4:1.11.0.4 pkgsrc-2012Q4-base:1.11 pkgsrc-2011Q4:1.11.0.2 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q2:1.10.0.4 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.2 pkgsrc-2011Q1-base:1.10 pkgsrc-base:1.1.1.2 TNF:1.1.1 pkgsrc-2009Q4:1.9.0.36 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.34 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.32 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.30 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.28 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.26 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.24 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.22 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.20 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.18 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.16 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.14 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.12 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.10 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.8 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.6 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.4 pkgsrc-2005Q2-base:1.9 pkgsrc-2005Q1:1.9.0.2 pkgsrc-2005Q1-base:1.9 pkgsrc-2004Q4:1.8.0.18 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.16 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.14 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.12 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.10 pkgsrc-2003Q4-base:1.8 netbsd-1-6-1:1.8.0.6 netbsd-1-6-1-base:1.8 netbsd-1-6:1.8.0.8 netbsd-1-6-RELEASE-base:1.8 pkgviews:1.8.0.4 pkgviews-base:1.8 buildlink2:1.8.0.2 buildlink2-base:1.8 netbsd-1-5-PATCH003:1.8 netbsd-1-5-PATCH001:1.8 netbsd-1-5-RELEASE:1.8 netbsd-1-4-PATCH003:1.8 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.6 netbsd-1-4-PATCH001:1.5 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-10-28:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.11 date 2011.09.03.15.25.01; author obache; state dead; branches; next 1.10; 1.10 date 2011.01.18.11.57.54; author drochner; state Exp; branches; next 1.9; 1.9 date 2005.03.08.14.15.33; author adam; state dead; branches; next 1.8; 1.8 date 2000.07.14.09.52.46; author jlam; state Exp; branches; next 1.7; 1.7 date 2000.06.09.05.34.28; author jlam; state dead; branches; next 1.6; 1.6 date 99.10.09.20.31.34; author jlam; state Exp; branches; next 1.5; 1.5 date 98.11.12.23.36.24; author frueauf; state Exp; branches; next 1.4; 1.4 date 98.09.15.00.48.38; author tv; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.47; author agc; state Exp; branches; next 1.2; 1.2 date 98.07.14.19.55.49; author tv; state Exp; branches; next 1.1; 1.1 date 97.12.29.02.51.19; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.12.29.02.51.19; author hubertf; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2011.01.18.11.53.33; author drochner; state Exp; branches; next ; desc @@ 1.11 log @Install utils and docs. Based on PR pkg/45321 by Uwe Klaus. While here, set LICENSE=mit. Bump PKGREVISION. @ text @$NetBSD: patch-aa,v 1.10 2011/01/18 11:57:54 drochner Exp $ --- Makefile.in.orig 2007-11-10 22:53:34.000000000 +0000 +++ Makefile.in @@@@ -188,7 +188,7 @@@@ sysconfdir = @@sysconfdir@@ target_alias = @@target_alias@@ top_builddir = @@top_builddir@@ top_srcdir = @@top_srcdir@@ -SUBDIRS = lib util doc pic +SUBDIRS = lib WINDOWS = $(top_srcdir)/windows/GifWin.cpp \ $(top_srcdir)/windows/GifWin.h \ $(top_srcdir)/windows/StdAfx.h \ @ 1.10 log @resolve conflicts @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Removed giflib - no package depends on it, obsoleted by libungif @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2000/07/14 09:52:46 jlam Exp $ d3 11 a13 15 --- configure.in.orig Wed Feb 10 01:19:36 1999 +++ configure.in Fri Jul 14 05:48:33 2000 @@@@ -16,12 +16,6 @@@@ AC_CHECK_LIB(m, pow, [MATH_LIB="${MATH_LIB} -lm" COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gifclrmp gifrotat"] ) -if test ${MATH_LIB}; then - AC_CHECK_LIB(rle, rle_hdr_init, [RLE_LIB="${RLE_LIBS} -lrle -lm" - COMPILABLE_EXTRAS="${COMPILABLE_EXTRAS} gif2rle rle2gif"], - ,"-lm" ) -fi - dnl I don't have this on my system. Could someone else configure it and dnl check that it works? (Need to change "main" to a function that's in the dnl library, check that giflib can be reautoconf'd, configured, and @ 1.8 log @Don't pick up stray librle.so if it exists. We don't want to build translation support to/from GIF and RLE format. Closes PR#10172. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @USE_LIBTOOL and LTCONFIG_OVERRIDE instead of pkglibtool and patching configure. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 1999/10/09 20:31:34 jlam Exp $ d3 5 a7 5 --- ./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 d9 9 a17 12 +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 @ 1.6 log @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. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Add missing rcs ids. @ text @d3 15 a17 5 --- 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. d19 2 a20 63 -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) @ 1.4 log @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 such that the malloc() warnings go away on LP64. @ text @d1 2 @ 1.3 log @Add NetBSD RCS Ids. @ text @a0 2 $NetBSD$ d2 2 a3 4 +++ lib/Makefile Tue Jul 14 15:37:23 1998 @@@@ -11,9 +11,10 @@@@ # d5 1 a5 2 -INCS = -I. +INCS = -I. -I${X11BASE}/include d13 9 @ 1.2 log @Update to use libtool; it now works on ELF and static-only platforms. Make use of ${BSD_INSTALL_*} macros. @ text @d1 2 @ 1.1 log @Initial revision @ text @d1 2 a2 2 --- lib/Makefile.orig Thu Jun 26 20:07:56 1997 +++ lib/Makefile Wed Sep 24 08:51:35 1997 d16 1 a16 1 @@@@ -63,14 +64,22 @@@@ a26 5 +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 + d29 1 a29 10 + $(CC) -c $(INCS) $(DEVS) $(CFLAGS) $< + +.c.so: + $(CC) -c $(INCS) $(DEVS) $(CFLAGS) -fpic -DPIC -o $@@ $< all: static shared @@@@ -82,9 +91,9 @@@@ ar rcv libgif.a $(OBJS) -ranlib libgif.a d31 11 d43 1 a43 2 +$(SHLIB): $(SOBJS) rm -f libgif.so.$(V) d45 3 a47 1 + ld -Bshareable -o $(SHLIB) $(SOBJS) d51 10 a60 6 @@@@ -99,6 +108,8 @@@@ install-lib: libgif.a cp libgif.a libgif.so.$(V) $(LIBDIR) + mkdir -p $(INCDIR) + cp *.h $(INCDIR) @ 1.1.1.1 log @Tools and library routines for working with GIF images. Taken from FreeBSD. @ text @@ 1.1.1.2 log @(re)add giflib-4.1.6, a library for the GIF image format which is API compatible with the libungif currently used in pkgsrc (libungif was used due to patents which are expired now) @ text @d1 61 a61 13 $NetBSD$ --- Makefile.in.orig 2007-11-10 22:53:34.000000000 +0000 +++ Makefile.in @@@@ -188,7 +188,7 @@@@ sysconfdir = @@sysconfdir@@ target_alias = @@target_alias@@ top_builddir = @@top_builddir@@ top_srcdir = @@top_srcdir@@ -SUBDIRS = lib util doc pic +SUBDIRS = lib WINDOWS = $(top_srcdir)/windows/GifWin.cpp \ $(top_srcdir)/windows/GifWin.h \ $(top_srcdir)/windows/StdAfx.h \ @