From 8f32bb677185031519f0d403ac89c75f62f986da Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 18 Jan 2011 11:53:33 +0000 Subject: (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) --- graphics/giflib/Makefile | 31 ++++++++--------- graphics/giflib/patches/patch-aa | 74 +++++++--------------------------------- 2 files changed, 28 insertions(+), 77 deletions(-) diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index 4fa3e807d49..5b0e6b8a03e 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -1,22 +1,21 @@ -# New ports collection makefile for: giflib -# Version required: 3.0 -# Date created: 03 May 1997 -# Whom: Thomas Gellekum -# -# $Id: Makefile,v 1.1.1.1 1997/12/29 02:51:19 hubertf Exp $ +# $NetBSD: Makefile,v 1.1.1.2 2011/01/18 11:53:33 drochner Exp $ # -DISTNAME= giflib-3.0 +DISTNAME= giflib-4.1.6 CATEGORIES= graphics -MASTER_SITES= http://www.ccil.org/~esr/giflib/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=giflib/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://giflib.sourceforge.net/ +COMMENT= GIF image format library +#LICENSE= # TODO: (see mk/license.mk) -MAINTAINER= tg@FreeBSD.ORG +CONFLICTS+= libungif-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/giflib - @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/giflib -.endif - @${LDCONFIG} -m ${PREFIX}/lib +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_LANGUAGES= c c++ -.include +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa index c39f47fd372..b017d06b741 100644 --- a/graphics/giflib/patches/patch-aa +++ b/graphics/giflib/patches/patch-aa @@ -1,61 +1,13 @@ ---- lib/Makefile.orig Thu Jun 26 20:07:56 1997 -+++ lib/Makefile Wed Sep 24 08:51:35 1997 -@@ -11,9 +11,10 @@ - - # - # Where all the include files are: --INCS = -I. -+INCS = -I. -I${X11BASE}/include - --LIBDIR = /usr/lib -+INCDIR = ${PREFIX}/include/giflib -+LIBDIR = ${PREFIX}/lib - - # - # What devices we should be able to grab into gif images. Note that if -@@ -63,14 +64,22 @@ - 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 - -@@ -82,9 +91,9 @@ - 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 -@@ -99,6 +108,8 @@ - - install-lib: libgif.a - cp libgif.a libgif.so.$(V) $(LIBDIR) -+ mkdir -p $(INCDIR) -+ cp *.h $(INCDIR) - - uninstall-lib: shared static - rm -f $(LIBDIR)/libgif.a $(LIBDIR)/$(SHLIB) +$NetBSD: patch-aa,v 1.1.1.2 2011/01/18 11:53:33 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 \ -- cgit v1.2.3