From 15cbf6b3e5ad2ca6fcf45f8c01c83148c48f8ee6 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 9 Jun 2000 05:34:25 +0000
Subject: USE_LIBTOOL and LTCONFIG_OVERRIDE instead of pkglibtool and patching
 configure.

---
 graphics/giflib/Makefile         | 25 +++++++++++++------------
 graphics/giflib/files/patch-sum  |  3 +--
 graphics/giflib/patches/patch-aa | 20 --------------------
 graphics/giflib/pkg/PLIST        |  3 ++-
 4 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 graphics/giflib/patches/patch-aa

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 2e084c5a6f0..60492c3f79e 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.20 2000/06/01 11:23:28 rh Exp $
+# $NetBSD: Makefile,v 1.21 2000/06/09 05:34:25 jlam Exp $
 #
 
-DISTNAME=	giflib-4.1.0
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://prtr-13.ucsc.edu/pub/libungif/
+DISTNAME=		giflib-4.1.0
+CATEGORIES=		graphics
+MASTER_SITES=		ftp://prtr-13.ucsc.edu/pub/libungif/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml
 
-CONFLICTS=	libungif-*
+CONFLICTS=		libungif-*
 
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-x
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS=		--without-x
 
-DOCDIR=		${PREFIX}/share/doc/giflib
+DOCDIR=			${PREFIX}/share/doc/giflib
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-MAKE_ENV+=	CC="${CC} -I${LOCALBASE}/include"
+MAKE_ENV+=		CC="${CC} -I${LOCALBASE}/include"
 .endif
 
 post-patch:
diff --git a/graphics/giflib/files/patch-sum b/graphics/giflib/files/patch-sum
index 0381e6c9a51..302072c9968 100644
--- a/graphics/giflib/files/patch-sum
+++ b/graphics/giflib/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/10/09 20:31:34 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/09 05:34:27 jlam Exp $
 
-MD5 (patch-aa) = 9cdc34473a103569f40b987991c70d21
 MD5 (patch-ab) = c74223ef8d6f51235a56930377ea6558
diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa
deleted file mode 100644
index 07d48071661..00000000000
--- a/graphics/giflib/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.6 1999/10/09 20:31:34 jlam Exp $
-
---- ./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
- 
-+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
diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST
index a4a94fef05f..4b79318b3ad 100644
--- a/graphics/giflib/pkg/PLIST
+++ b/graphics/giflib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1999/10/09 20:31:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/06/09 05:34:29 jlam Exp $
 bin/gif2epsn
 bin/gif2ps
 bin/gif2rgb
@@ -29,6 +29,7 @@ bin/gifcompose
 bin/gifburst
 include/gif_lib.h
 lib/libgif.a
+lib/libgif.la
 lib/libgif.so.5.0
 share/doc/giflib/COPYING
 share/doc/giflib/GifFileType.png
-- 
cgit v1.2.3