* change to use libungif instead of giflib

* install library documentation

6 files changed, 32 insertions, 43 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index bcd78890fc1..ab229752a63 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/10/08 21:12:49 jlam Exp $
+# $NetBSD: Makefile,v 1.26 1999/10/09 20:12:10 jlam Exp $
 #
 
 DISTNAME=	imlib-1.9.4
@@ -8,23 +8,27 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.labs.redhat.com/imlib/
 
-DEPENDS+=	gtk+-1.2.4:../../x11/gtk
-DEPENDS+=	giflib-3.0:../../graphics/giflib
+DEPENDS+=	gtk+-1.2.*:../../x11/gtk
+DEPENDS+=	libungif-*:../../graphics/libungif
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	netpbm-19940301:../../graphics/netpbm
+DEPENDS+=	netpbm-*:../../graphics/netpbm
 DEPENDS+=	png-1.0.3:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11BASE=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
-LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS='-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib'
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib \
+		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 
-.include "../../mk/bsd.pkg.mk"
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.gif *.html \
+		${PREFIX}/share/doc/imlib
 
-.if !defined(USE_LOCALBASE_FOR_X11)
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
-.endif
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/files/patch-sum b/graphics/imlib/files/patch-sum
index cd255c0803e..88ee9f1e04a 100644
--- a/graphics/imlib/files/patch-sum
+++ b/graphics/imlib/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:08 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/09 20:12:10 jlam Exp $
 
-MD5 (patch-aa) = e3e4aa7fb0c12a2d54226bed648b4f8d
-MD5 (patch-ab) = 972483c71d297654f7572a1fc605ffb9
+MD5 (patch-aa) = a24cc3fe53db557c267da6b7f7112e33
 MD5 (patch-ac) = 7870aab85a57c2635c04f960066dc162
diff --git a/graphics/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
index ca5f530e1df..710b4c164dd 100644
--- a/graphics/imlib/patches/patch-aa
+++ b/graphics/imlib/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 1999/03/09 23:00:38 tron Exp $
+$NetBSD: patch-aa,v 1.7 1999/10/09 20:12:10 jlam Exp $
 
---- configure.orig	Thu Feb 25 00:44:38 1999
-+++ configure	Tue Mar  9 23:51:33 1999
+--- configure.orig	Wed Feb 24 18:44:38 1999
++++ configure	Fri Oct  8 14:46:40 1999
 @@ -1533,6 +1533,7 @@
  fi
  
@@ -18,15 +18,7 @@ $NetBSD: patch-aa,v 1.6 1999/03/09 23:00:38 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -2118,6 +2120,7 @@
-   else
-     GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-     GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+    GTK_LIBS=`echo "$GTK_LIBS -lintl"`
-     gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-@@ -5325,10 +5328,12 @@
+@@ -5325,10 +5327,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/imlib/patches/patch-ab b/graphics/imlib/patches/patch-ab
deleted file mode 100644
index 57091a06c9b..00000000000
--- a/graphics/imlib/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/09/04 13:13:17 agc Exp $
-
-Try as I might, passing things through the environment, this always
-ends up like this...
-
---- Makefile.in	1998/09/01 17:14:00	1.1
-+++ Makefile.in	1998/09/01 17:14:54
-@@ -48,7 +48,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
diff --git a/graphics/imlib/pkg/COMMENT b/graphics/imlib/pkg/COMMENT
index c0cbb034d4d..e2b4300803e 100644
--- a/graphics/imlib/pkg/COMMENT
+++ b/graphics/imlib/pkg/COMMENT
@@ -1 +1 @@
-an image manipulation library for X11.
+image manipulation library for X11
diff --git a/graphics/imlib/pkg/PLIST b/graphics/imlib/pkg/PLIST
index ee91c0713ff..8bf8d3e1e38 100644
--- a/graphics/imlib/pkg/PLIST
+++ b/graphics/imlib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/03/05 23:46:20 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 1999/10/09 20:12:11 jlam Exp $
 bin/imlib_config
 bin/imlib-config
 etc/imrc
@@ -14,3 +14,13 @@ lib/libImlib.a
 lib/libgdk_imlib.a
 lib/libgdk_imlib.so.10.4
 share/aclocal/imlib.m4
+share/doc/imlib/bg.gif
+share/doc/imlib/border_diag.gif
+share/doc/imlib/border_eg1.gif
+share/doc/imlib/border_eg2.gif
+share/doc/imlib/border_eg3.gif
+share/doc/imlib/curve1.gif
+share/doc/imlib/curve2.gif
+share/doc/imlib/imlib.gif
+share/doc/imlib/index.html
+@dirrm share/doc/imlib