Update to 1.9.14. Changes since 1.9.13:

* load.c: Fixed reported bug.  If Imlib thought it needed a fallback,
  bad things will happen.
* utils.c: Removed the open/close_helper functions.  A little less
  bloat now removed.

5 files changed, 21 insertions, 32 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f3074b5ee7b..bba3806231f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2002/03/19 16:16:08 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2002/03/29 18:01:13 wiz Exp $
 #
 
-DISTNAME=		imlib-1.9.13
+DISTNAME=		imlib-1.9.14
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/imlib/}
 
diff --git a/graphics/imlib/PLIST b/graphics/imlib/PLIST
index 5e0dedf92f9..68b6079c58c 100644
--- a/graphics/imlib/PLIST
+++ b/graphics/imlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/03/19 16:16:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/03/29 18:01:13 wiz Exp $
 bin/imlib_config
 bin/imlib-config
 etc/imrc
@@ -15,12 +15,12 @@ lib/libImlib.a
 lib/libImlib.la
 lib/libImlib.so
 lib/libImlib.so.10
-lib/libImlib.so.10.13
+lib/libImlib.so.10.14
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
 lib/libgdk_imlib.so.10
-lib/libgdk_imlib.so.10.13
+lib/libgdk_imlib.so.10.14
 lib/libimlib-bmp.a
 lib/libimlib-bmp.la
 lib/libimlib-bmp.so
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 655ecafe7eb..1bf0dff6c7f 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2002/03/19 16:16:08 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/03/29 18:01:13 wiz Exp $
 
-SHA1 (imlib-1.9.13.tar.gz) = cca0ab01b40ca32c9b1b526d84a3ed8d956eb84f
-Size (imlib-1.9.13.tar.gz) = 752512 bytes
+SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6
+Size (imlib-1.9.14.tar.gz) = 748591 bytes
 SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
 SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805
-SHA1 (patch-ad) = 6c673375d669b7e3e57b558c4f7fbd320162eaf4
+SHA1 (patch-ad) = 0910b5574cca6c7cfbaec04c4c5396488d422ce7
 SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7
-SHA1 (patch-ag) = 244d480873a58f379674d75b5bb7b1f720a3c38c
+SHA1 (patch-ag) = 5e8452358e1f0625d1a1a5a990512bd51f51e6c9
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad
index dea17bd61bc..879f45eb8cd 100644
--- a/graphics/imlib/patches/patch-ad
+++ b/graphics/imlib/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.6 2001/08/23 04:47:54 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2002/03/29 18:01:14 wiz Exp $
 
---- configure.in.orig	Wed Aug  1 00:12:24 2001
+--- configure.in.orig	Fri Mar 22 15:51:24 2002
 +++ configure.in
 @@ -32,6 +32,8 @@
  	fi
@@ -33,7 +33,7 @@ $NetBSD: patch-ad,v 1.6 2001/08/23 04:47:54 jlam Exp $
     AC_SUBST(GMODULE_LIBS)
     AC_SUBST(GMODULE_FLAGS)
  fi
-@@ -153,7 +155,9 @@
+@@ -139,7 +141,9 @@
    GX_LIBS="$GTK_LIBS"
  fi
  
@@ -44,18 +44,7 @@ $NetBSD: patch-ad,v 1.6 2001/08/23 04:47:54 jlam Exp $
  
  SUPPORT_LIBS=""
  
-@@ -245,8 +249,8 @@
- dnl Test for libtiff
- AC_CHECK_LIB(tiff, TIFFReadScanline,
-   AC_CHECK_HEADER(tiffio.h,
--    TIFFLIBS="-ltiff"
--    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; AC_DEFINE(HAVE_LIBTIFF),
-+    TIFFLIBS="-ltiff -ljpeg -lz"
-+    SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF),
-     AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)),
-   AC_CHECK_LIB(tiff, TIFFWriteScanline,
-     AC_CHECK_HEADER(tiffio.h,
-@@ -334,6 +338,7 @@
+@@ -309,6 +313,7 @@
  AC_SUBST(CPPFLAGS)
  AC_SUBST(X_CFLAGS)
  AC_SUBST(LDFLAGS)
diff --git a/graphics/imlib/patches/patch-ag b/graphics/imlib/patches/patch-ag
index 423022b53f9..93805c04255 100644
--- a/graphics/imlib/patches/patch-ag
+++ b/graphics/imlib/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2002/03/29 18:01:14 wiz Exp $
 
---- configure.orig	Wed Mar 13 18:58:16 2002
+--- configure.orig	Mon Mar 25 17:45:33 2002
 +++ configure
 @@ -5596,6 +5596,43 @@
  fi
@@ -68,7 +68,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
     
     
  fi
-@@ -7515,7 +7552,9 @@
+@@ -7365,7 +7402,9 @@
    GX_LIBS="$GTK_LIBS"
  fi
  
@@ -79,7 +79,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
  
  SUPPORT_LIBS=""
  
-@@ -7820,8 +7859,8 @@
+@@ -7670,8 +7709,8 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -90,7 +90,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
  #define HAVE_LIBTIFF 1
  EOF
  
-@@ -8297,6 +8336,7 @@
+@@ -8137,6 +8176,7 @@
  
  
  
@@ -98,7 +98,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
-@@ -8477,6 +8517,7 @@
+@@ -8317,6 +8357,7 @@
  s%@GTK_CONFIG@%$GTK_CONFIG%g
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
@@ -106,7 +106,7 @@ $NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
  s%@GMODULE_LIBS@%$GMODULE_LIBS%g
  s%@GMODULE_FLAGS@%$GMODULE_FLAGS%g
  s%@TIFFLIBS@%$TIFFLIBS%g
-@@ -8507,6 +8548,7 @@
+@@ -8341,6 +8382,7 @@
  s%@HAVE_JPEG_FALSE@%$HAVE_JPEG_FALSE%g
  s%@SUPPORT_LIBS@%$SUPPORT_LIBS%g
  s%@GDK_SUPPORT_LIBS@%$GDK_SUPPORT_LIBS%g