Update to 1.9.13. Bugfix release.

6 files changed, 29 insertions, 32 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 50f4b55a6c5..f3074b5ee7b 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2002/03/13 17:37:10 fredb Exp $
+# $NetBSD: Makefile,v 1.65 2002/03/19 16:16:08 wiz Exp $
 #
 
-DISTNAME=		imlib-1.9.11
-PKGREVISION=		1
+DISTNAME=		imlib-1.9.13
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/imlib/}
 
diff --git a/graphics/imlib/PLIST b/graphics/imlib/PLIST
index 581e8031bad..5e0dedf92f9 100644
--- a/graphics/imlib/PLIST
+++ b/graphics/imlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/19 16:16:08 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.11
+lib/libImlib.so.10.13
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
 lib/libgdk_imlib.so.10
-lib/libgdk_imlib.so.10.11
+lib/libgdk_imlib.so.10.13
 lib/libimlib-bmp.a
 lib/libimlib-bmp.la
 lib/libimlib-bmp.so
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 69d8a7e1755..655ecafe7eb 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/03/11 08:03:04 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/03/19 16:16:08 wiz Exp $
 
-SHA1 (imlib-1.9.11.tar.gz) = 30b48d9f3745547d2186750ecbd3a391d3f805ed
-Size (imlib-1.9.11.tar.gz) = 758757 bytes
-SHA1 (patch-aa) = 3b0d14a026bb1d63ef83e2bca9ee674c2645c8bf
-SHA1 (patch-ab) = 9af11e0041b07670a3bab37cd4234e4e00bc7d78
-SHA1 (patch-ac) = d92c08ede60358d192c32d08482b536ff13a7fb8
+SHA1 (imlib-1.9.13.tar.gz) = cca0ab01b40ca32c9b1b526d84a3ed8d956eb84f
+Size (imlib-1.9.13.tar.gz) = 752512 bytes
+SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
+SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805
 SHA1 (patch-ad) = 6c673375d669b7e3e57b558c4f7fbd320162eaf4
 SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7
-SHA1 (patch-af) = 693144285a5d2729925bc9256e951dd34e71c249
-SHA1 (patch-ag) = 5ee9f5c78b4991d1d916d83e0ca46b5ce9e6729c
+SHA1 (patch-ag) = 244d480873a58f379674d75b5bb7b1f720a3c38c
diff --git a/graphics/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
index 6cbcc1a0ca8..59761c37111 100644
--- a/graphics/imlib/patches/patch-aa
+++ b/graphics/imlib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2001/08/13 11:14:31 rh Exp $
+$NetBSD: patch-aa,v 1.13 2002/03/19 16:16:08 wiz Exp $
 
---- gdk_imlib/io-png.c.orig	Sat Jul 28 16:15:16 2001
+--- gdk_imlib/io-png.c.orig	Mon Mar  4 17:26:51 2002
 +++ gdk_imlib/io-png.c
-@@ -299,6 +299,9 @@
+@@ -301,6 +301,9 @@
    /* Setup Translators */
    if (color_type == PNG_COLOR_TYPE_PALETTE)
      png_set_expand(png_ptr);
diff --git a/graphics/imlib/patches/patch-ab b/graphics/imlib/patches/patch-ab
index 3905e6e1d42..572a759f4f0 100644
--- a/graphics/imlib/patches/patch-ab
+++ b/graphics/imlib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/08/13 11:14:31 rh Exp $
+$NetBSD: patch-ab,v 1.5 2002/03/19 16:16:08 wiz Exp $
 
---- Imlib/load.c.orig	Wed Aug  1 00:15:16 2001
+--- Imlib/load.c.orig	Wed Mar 13 19:06:29 2002
 +++ Imlib/load.c
-@@ -241,7 +241,8 @@
+@@ -254,7 +254,8 @@
    png_read_image(png_ptr, lines);
    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
    ptr = data;
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/13 11:14:31 rh Exp $
      {
        for (y = 0; y < *h; y++)
  	{
-@@ -266,6 +267,7 @@
+@@ -279,6 +280,7 @@
  	    }
  	}
      }
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/13 11:14:31 rh Exp $
    else if (color_type == PNG_COLOR_TYPE_GRAY)
      {
        for (y = 0; y < *h; y++)
-@@ -281,6 +283,7 @@
+@@ -294,6 +296,7 @@
  	    }
  	}
      }
diff --git a/graphics/imlib/patches/patch-ag b/graphics/imlib/patches/patch-ag
index f5367064506..423022b53f9 100644
--- a/graphics/imlib/patches/patch-ag
+++ b/graphics/imlib/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2002/03/19 16:16:08 wiz Exp $
 
---- configure.orig	Tue Jul 31 16:34:51 2001
+--- configure.orig	Wed Mar 13 18:58:16 2002
 +++ configure
-@@ -5571,6 +5571,43 @@
+@@ -5596,6 +5596,43 @@
  fi
  
  
@@ -46,7 +46,7 @@ $NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
  dynworks=false
  if test x$with_modules = xno; then
  	echo "$ac_t""no" 1>&6
-@@ -5580,8 +5617,8 @@
+@@ -5605,8 +5642,8 @@
  if test "x$GDK_IMLIB" != x; then
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
@@ -57,7 +57,7 @@ $NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
-@@ -5631,8 +5668,8 @@
+@@ -5656,8 +5693,8 @@
  #define USE_GMODULE 1
  EOF
  
@@ -68,7 +68,7 @@ $NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
     
     
  fi
-@@ -7490,7 +7527,9 @@
+@@ -7515,7 +7552,9 @@
    GX_LIBS="$GTK_LIBS"
  fi
  
@@ -79,7 +79,7 @@ $NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
  
  SUPPORT_LIBS=""
  
-@@ -7795,8 +7834,8 @@
+@@ -7820,8 +7859,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.1 2002/03/11 08:03:05 skrll Exp $
  #define HAVE_LIBTIFF 1
  EOF
  
-@@ -8272,6 +8311,7 @@
+@@ -8297,6 +8336,7 @@
  
  
  
@@ -98,7 +98,7 @@ $NetBSD: patch-ag,v 1.1 2002/03/11 08:03:05 skrll Exp $
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
-@@ -8463,6 +8503,7 @@
+@@ -8477,6 +8517,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.1 2002/03/11 08:03:05 skrll Exp $
  s%@GMODULE_LIBS@%$GMODULE_LIBS%g
  s%@GMODULE_FLAGS@%$GMODULE_FLAGS%g
  s%@TIFFLIBS@%$TIFFLIBS%g
-@@ -8493,6 +8534,7 @@
+@@ -8507,6 +8548,7 @@
  s%@HAVE_JPEG_FALSE@%$HAVE_JPEG_FALSE%g
  s%@SUPPORT_LIBS@%$SUPPORT_LIBS%g
  s%@GDK_SUPPORT_LIBS@%$GDK_SUPPORT_LIBS%g