split giflib into 2 pkgs: one for the lib, one for cmd line utils

4 files changed, 165 insertions, 86 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 17b82f9c234..a3e940e0932 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2011/09/03 15:25:01 obache Exp $
+# $NetBSD: Makefile,v 1.43 2011/09/06 18:45:46 drochner Exp $
 #
 
 DISTNAME=	giflib-4.1.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=giflib/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,19 +18,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	perl:run
 
-DOCDIR=			${PREFIX}/share/doc/giflib
-HTMLDIR=		${PREFIX}/share/doc/html/giflib
+BUILD_DIRS=	lib
+INSTALL_DIRS=	lib
 
-REPLACE_PERL+=		util/gifburst
-
-post-patch:
-	${RM} ${WRKSRC}/doc/gif2x11.html
-
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} COPYING ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt *.png ${DESTDIR}${HTMLDIR}
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giflib/PLIST b/graphics/giflib/PLIST
index 30211d158cf..790e23c6e22 100644
--- a/graphics/giflib/PLIST
+++ b/graphics/giflib/PLIST
@@ -1,72 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2011/09/03 15:25:01 obache Exp $
-bin/gif2epsn
-bin/gif2ps
-bin/gif2rgb
-bin/gifasm
-bin/gifbg
-bin/gifburst
-bin/gifclip
-bin/gifclrmp
-bin/gifcolor
-bin/gifcomb
-bin/gifcompose
-bin/giffiltr
-bin/giffix
-bin/gifflip
-bin/gifhisto
-bin/gifinfo
-bin/gifinter
-bin/gifinto
-bin/gifovly
-bin/gifpos
-bin/gifrotat
-bin/gifrsize
-bin/gifspnge
-bin/giftext
-bin/gifwedge
-bin/icon2gif
-bin/raw2gif
-bin/rgb2gif
-bin/text2gif
+@comment $NetBSD: PLIST,v 1.6 2011/09/06 18:45:46 drochner Exp $
 include/gif_lib.h
 lib/libgif.la
-share/doc/giflib/COPYING
-share/doc/html/giflib/GifFileType.png
-share/doc/html/giflib/gif2bgi.html
-share/doc/html/giflib/gif2epsn.html
-share/doc/html/giflib/gif2herc.html
-share/doc/html/giflib/gif2iris.html
-share/doc/html/giflib/gif2ps.html
-share/doc/html/giflib/gif2rgb.html
-share/doc/html/giflib/gif2rle.html
-share/doc/html/giflib/gif89.txt
-share/doc/html/giflib/gif_lib.html
-share/doc/html/giflib/gifasm.html
-share/doc/html/giflib/gifbg.html
-share/doc/html/giflib/gifburst.html
-share/doc/html/giflib/gifclip.html
-share/doc/html/giflib/gifclrmp.html
-share/doc/html/giflib/gifcolor.html
-share/doc/html/giflib/gifcomb.html
-share/doc/html/giflib/gifcompose.html
-share/doc/html/giflib/giffiltr.html
-share/doc/html/giflib/giffix.html
-share/doc/html/giflib/gifflip.html
-share/doc/html/giflib/gifhisto.html
-share/doc/html/giflib/gifinter.html
-share/doc/html/giflib/gifinto.html
-share/doc/html/giflib/gifovly.html
-share/doc/html/giflib/gifpos.html
-share/doc/html/giflib/gifrotat.html
-share/doc/html/giflib/gifrsize.html
-share/doc/html/giflib/gifspnge.html
-share/doc/html/giflib/giftext.html
-share/doc/html/giflib/gifwedge.html
-share/doc/html/giflib/icon2gif.html
-share/doc/html/giflib/index.html
-share/doc/html/giflib/liberror.html
-share/doc/html/giflib/lzgif.txt
-share/doc/html/giflib/raw2gif.html
-share/doc/html/giflib/rgb2gif.html
-share/doc/html/giflib/rle2gif.html
-share/doc/html/giflib/text2gif.html
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index d17414220c7..78a7e117870 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2011/09/03 15:25:01 obache Exp $
+$NetBSD: distinfo,v 1.8 2011/09/06 18:45:46 drochner Exp $
 
 SHA1 (giflib-4.1.6.tar.bz2) = 22680f604ec92065f04caf00b1c180ba74fb8562
 RMD160 (giflib-4.1.6.tar.bz2) = bdb99f7048a79b9e771b069f90ac151537011d19
 Size (giflib-4.1.6.tar.bz2) = 506050 bytes
+SHA1 (patch-ab) = a50e8659c1b4e0dfd900f5032ceb39234a9ee077
diff --git a/graphics/giflib/patches/patch-ab b/graphics/giflib/patches/patch-ab
new file mode 100644
index 00000000000..c1d2c8fe1fb
--- /dev/null
+++ b/graphics/giflib/patches/patch-ab
@@ -0,0 +1,158 @@
+$NetBSD: patch-ab,v 1.10 2011/09/06 18:45:46 drochner Exp $
+
+--- util/Makefile.in.orig	2007-11-10 22:53:34.000000000 +0000
++++ util/Makefile.in
+@@ -59,18 +59,18 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_gif2epsn_OBJECTS = gif2epsn.$(OBJEXT)
+ gif2epsn_OBJECTS = $(am_gif2epsn_OBJECTS)
+ gif2epsn_LDADD = $(LDADD)
+-gif2epsn_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gif2epsn_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gif2iris_OBJECTS = gif2iris.$(OBJEXT)
+ gif2iris_OBJECTS = $(am_gif2iris_OBJECTS)
+ gif2iris_DEPENDENCIES = $(LDADD)
+ am_gif2ps_OBJECTS = gif2ps.$(OBJEXT)
+ gif2ps_OBJECTS = $(am_gif2ps_OBJECTS)
+ gif2ps_LDADD = $(LDADD)
+-gif2ps_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gif2ps_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gif2rgb_OBJECTS = gif2rgb.$(OBJEXT)
+ gif2rgb_OBJECTS = $(am_gif2rgb_OBJECTS)
+ gif2rgb_LDADD = $(LDADD)
+-gif2rgb_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gif2rgb_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gif2rle_OBJECTS = gif2rle.$(OBJEXT)
+ gif2rle_OBJECTS = $(am_gif2rle_OBJECTS)
+ gif2rle_DEPENDENCIES = $(LDADD)
+@@ -83,100 +83,100 @@ gif2x11_LINK = $(LIBTOOL) --tag=CC $(AM_
+ am_gifasm_OBJECTS = gifasm.$(OBJEXT)
+ gifasm_OBJECTS = $(am_gifasm_OBJECTS)
+ gifasm_LDADD = $(LDADD)
+-gifasm_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifasm_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifbg_OBJECTS = gifbg.$(OBJEXT)
+ gifbg_OBJECTS = $(am_gifbg_OBJECTS)
+ gifbg_LDADD = $(LDADD)
+-gifbg_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifbg_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifclip_OBJECTS = gifclip.$(OBJEXT)
+ gifclip_OBJECTS = $(am_gifclip_OBJECTS)
+ gifclip_LDADD = $(LDADD)
+-gifclip_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifclip_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifclrmp_OBJECTS = gifclrmp.$(OBJEXT)
+ gifclrmp_OBJECTS = $(am_gifclrmp_OBJECTS)
+ gifclrmp_DEPENDENCIES = $(LDADD)
+ am_gifcolor_OBJECTS = gifcolor.$(OBJEXT)
+ gifcolor_OBJECTS = $(am_gifcolor_OBJECTS)
+ gifcolor_LDADD = $(LDADD)
+-gifcolor_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifcolor_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifcomb_OBJECTS = gifcomb.$(OBJEXT)
+ gifcomb_OBJECTS = $(am_gifcomb_OBJECTS)
+ gifcomb_LDADD = $(LDADD)
+-gifcomb_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifcomb_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_giffiltr_OBJECTS = giffiltr.$(OBJEXT)
+ giffiltr_OBJECTS = $(am_giffiltr_OBJECTS)
+ giffiltr_LDADD = $(LDADD)
+-giffiltr_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++giffiltr_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_giffix_OBJECTS = giffix.$(OBJEXT)
+ giffix_OBJECTS = $(am_giffix_OBJECTS)
+ giffix_LDADD = $(LDADD)
+-giffix_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++giffix_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifflip_OBJECTS = gifflip.$(OBJEXT)
+ gifflip_OBJECTS = $(am_gifflip_OBJECTS)
+ gifflip_LDADD = $(LDADD)
+-gifflip_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifflip_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifhisto_OBJECTS = gifhisto.$(OBJEXT)
+ gifhisto_OBJECTS = $(am_gifhisto_OBJECTS)
+ gifhisto_LDADD = $(LDADD)
+-gifhisto_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifhisto_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifinfo_OBJECTS = gifinfo.$(OBJEXT)
+ gifinfo_OBJECTS = $(am_gifinfo_OBJECTS)
+ gifinfo_LDADD = $(LDADD)
+-gifinfo_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifinfo_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifinter_OBJECTS = gifinter.$(OBJEXT)
+ gifinter_OBJECTS = $(am_gifinter_OBJECTS)
+ gifinter_LDADD = $(LDADD)
+-gifinter_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifinter_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifinto_OBJECTS = gifinto.$(OBJEXT)
+ gifinto_OBJECTS = $(am_gifinto_OBJECTS)
+ gifinto_LDADD = $(LDADD)
+-gifinto_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifinto_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifovly_OBJECTS = gifovly.$(OBJEXT)
+ gifovly_OBJECTS = $(am_gifovly_OBJECTS)
+ gifovly_LDADD = $(LDADD)
+-gifovly_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifovly_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifpos_OBJECTS = gifpos.$(OBJEXT)
+ gifpos_OBJECTS = $(am_gifpos_OBJECTS)
+ gifpos_LDADD = $(LDADD)
+-gifpos_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifpos_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifrotat_OBJECTS = gifrotat.$(OBJEXT)
+ gifrotat_OBJECTS = $(am_gifrotat_OBJECTS)
+ gifrotat_DEPENDENCIES = $(LDADD)
+ am_gifrsize_OBJECTS = gifrsize.$(OBJEXT)
+ gifrsize_OBJECTS = $(am_gifrsize_OBJECTS)
+ gifrsize_LDADD = $(LDADD)
+-gifrsize_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifrsize_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifspnge_OBJECTS = gifspnge.$(OBJEXT)
+ gifspnge_OBJECTS = $(am_gifspnge_OBJECTS)
+ gifspnge_LDADD = $(LDADD)
+-gifspnge_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifspnge_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_giftext_OBJECTS = giftext.$(OBJEXT)
+ giftext_OBJECTS = $(am_giftext_OBJECTS)
+ giftext_LDADD = $(LDADD)
+-giftext_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++giftext_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_gifwedge_OBJECTS = gifwedge.$(OBJEXT)
+ gifwedge_OBJECTS = $(am_gifwedge_OBJECTS)
+ gifwedge_LDADD = $(LDADD)
+-gifwedge_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++gifwedge_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_icon2gif_OBJECTS = icon2gif.$(OBJEXT)
+ icon2gif_OBJECTS = $(am_icon2gif_OBJECTS)
+ icon2gif_LDADD = $(LDADD)
+-icon2gif_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++icon2gif_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_raw2gif_OBJECTS = raw2gif.$(OBJEXT)
+ raw2gif_OBJECTS = $(am_raw2gif_OBJECTS)
+ raw2gif_LDADD = $(LDADD)
+-raw2gif_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++raw2gif_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_rgb2gif_OBJECTS = rgb2gif.$(OBJEXT)
+ rgb2gif_OBJECTS = $(am_rgb2gif_OBJECTS)
+ rgb2gif_LDADD = $(LDADD)
+-rgb2gif_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++rgb2gif_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ am_rle2gif_OBJECTS = rle2gif.$(OBJEXT)
+ rle2gif_OBJECTS = $(am_rle2gif_OBJECTS)
+ rle2gif_DEPENDENCIES = $(LDADD)
+ am_text2gif_OBJECTS = text2gif.$(OBJEXT)
+ text2gif_OBJECTS = $(am_text2gif_OBJECTS)
+ text2gif_LDADD = $(LDADD)
+-text2gif_DEPENDENCIES = ../lib/libgif.la ../lib/libgetarg.a
++text2gif_DEPENDENCIES = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+@@ -335,7 +335,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ bin_SCRIPTS = gifcompose gifburst
+ EXTRA_DIST = Makefile.unx $(bin_SCRIPTS)
+-LDADD = ../lib/libgif.la ../lib/libgetarg.a
++LDADD = $(prefix)/lib/libgif.la ../lib/libgetarg.a
+ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/lib
+ gif2rle_SOURCES = gif2rle.c
+ gif2rle_LDADD = $(LDADD) @RLE_LIB@