Update imlib to 1.9.11. Changes are bugfixes and the addition of man pages

8 files changed, 56 insertions, 77 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 6c7c0a2ad89..691ae30e713 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2001/06/29 04:54:55 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2001/08/13 11:14:30 rh Exp $
 #
 
-DISTNAME=		imlib-1.9.8.1
+DISTNAME=		imlib-1.9.11
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/imlib/}
 
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 3bbb862c94a..16d09198c22 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/06/16 19:56:48 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/13 11:14:30 rh Exp $
 
-SHA1 (imlib-1.9.8.1.tar.gz) = bf091ac5bf18524582e6c285014ba648f77c5215
-Size (imlib-1.9.8.1.tar.gz) = 705913 bytes
-SHA1 (patch-aa) = 29cbcd677f8dfb53af7ed14f933f26fde345c2cf
-SHA1 (patch-ab) = d493a50b32956d7594b3d3bfe752a4a2519c0928
-SHA1 (patch-ac) = 4eee2bf33d047d7c267883d6e7f590222f879d8b
-SHA1 (patch-ad) = 352f1bbee6145bdbfbcf00d86cbcc46a5fe6e0bf
-SHA1 (patch-ae) = db7ae8767de3f8aa933d66ccde50f4e704296a04
+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 (patch-ad) = 0f9aacc69e072338f02bb0307699df068d42089a
+SHA1 (patch-ae) = 9701e0251592ae8df33b455457b6470f9833bbd7
diff --git a/graphics/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
index c4c76d978f2..6cbcc1a0ca8 100644
--- a/graphics/imlib/patches/patch-aa
+++ b/graphics/imlib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2000/06/17 01:09:36 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2001/08/13 11:14:31 rh Exp $
 
---- gdk_imlib/io-png.c.orig	Sun Oct  3 21:17:35 1999
-+++ gdk_imlib/io-png.c	Sat Jun 17 02:58:44 2000
-@@ -61,6 +61,9 @@
+--- gdk_imlib/io-png.c.orig	Sat Jul 28 16:15:16 2001
++++ gdk_imlib/io-png.c
+@@ -299,6 +299,9 @@
    /* Setup Translators */
    if (color_type == PNG_COLOR_TYPE_PALETTE)
      png_set_expand(png_ptr);
@@ -12,29 +12,3 @@ $NetBSD: patch-aa,v 1.11 2000/06/17 01:09:36 wiz Exp $
    png_set_strip_16(png_ptr);
    png_set_packing(png_ptr);
    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-@@ -97,7 +100,8 @@
-   png_read_image(png_ptr, lines);
-   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-   ptr = data;
--  if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+  if (color_type == PNG_COLOR_TYPE_GRAY
-+      || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-       for (y = 0; y < *h; y++)
- 	{
-@@ -122,6 +126,7 @@
- 	    }
- 	}
-     }
-+#if 0
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-     {
-       for (y = 0; y < *h; y++)
-@@ -136,6 +141,7 @@
- 	    }
- 	}
-     }
-+#endif
-   else
-     {
-       for (y = 0; y < *h; y++)
diff --git a/graphics/imlib/patches/patch-ab b/graphics/imlib/patches/patch-ab
index e6f345f8db5..3905e6e1d42 100644
--- a/graphics/imlib/patches/patch-ab
+++ b/graphics/imlib/patches/patch-ab
@@ -1,18 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2000/06/17 01:09:36 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2001/08/13 11:14:31 rh Exp $
 
---- Imlib/load.c.orig	Sun Oct  3 21:17:35 1999
-+++ Imlib/load.c	Sat Jun 17 02:58:25 2000
-@@ -209,6 +209,9 @@
-   /* Setup Translators */
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-     png_set_expand(png_ptr);
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-+    png_set_expand(png_ptr);
-+
-   png_set_strip_16(png_ptr);
-   png_set_packing(png_ptr);
-   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-@@ -247,7 +250,8 @@
+--- Imlib/load.c.orig	Wed Aug  1 00:15:16 2001
++++ Imlib/load.c
+@@ -241,7 +241,8 @@
    png_read_image(png_ptr, lines);
    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
    ptr = data;
@@ -22,7 +12,7 @@ $NetBSD: patch-ab,v 1.3 2000/06/17 01:09:36 wiz Exp $
      {
        for (y = 0; y < *h; y++)
  	{
-@@ -272,6 +276,7 @@
+@@ -266,6 +267,7 @@
  	    }
  	}
      }
@@ -30,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2000/06/17 01:09:36 wiz Exp $
    else if (color_type == PNG_COLOR_TYPE_GRAY)
      {
        for (y = 0; y < *h; y++)
-@@ -286,6 +291,7 @@
+@@ -281,6 +283,7 @@
  	    }
  	}
      }
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
index f517b594783..5795113156b 100644
--- a/graphics/imlib/patches/patch-ac
+++ b/graphics/imlib/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.7 2000/06/27 01:13:49 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2001/08/13 11:14:31 rh Exp $
 
---- gdk_imlib/Makefile.am.orig	Sat May 20 08:24:11 2000
-+++ gdk_imlib/Makefile.am	Tue Jun 27 00:54:21 2000
+--- gdk_imlib/Makefile.am.orig	Wed Aug  1 01:34:44 2001
++++ gdk_imlib/Makefile.am
 @@ -82,7 +82,7 @@
  
  
- libgdk_imlib_la_LDFLAGS = -version-info 10:8:9
+ libgdk_imlib_la_LDFLAGS = -version-info 10:11:9
 -libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
 +libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) $(SUPPORT_LIBS)
  
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad
index 1fa06277a0e..2ff40fb70d1 100644
--- a/graphics/imlib/patches/patch-ad
+++ b/graphics/imlib/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2001/06/16 19:56:16 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2001/08/13 11:14:31 rh Exp $
 
---- configure.in.orig	Sat May 20 02:24:10 2000
-+++ configure.in	Fri Jun 15 22:52:42 2001
-@@ -34,6 +34,8 @@
+--- configure.in.orig	Wed Aug  1 00:12:24 2001
++++ configure.in
+@@ -32,6 +32,8 @@
  	fi
  ])
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2001/06/16 19:56:16 jlam Exp $
  dynworks=false
  if test x$with_modules = xno; then
  	AC_MSG_RESULT(no)
-@@ -43,8 +45,8 @@
+@@ -41,8 +43,8 @@
  if test "x$GDK_IMLIB" != x; then
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.4 2001/06/16 19:56:16 jlam Exp $
    AC_TRY_RUN([
  #include <glib.h>
  #include <gmodule.h>
-@@ -76,8 +78,8 @@
+@@ -74,8 +76,8 @@
  
  if $dynworks; then
     AC_DEFINE(USE_GMODULE)
@@ -32,8 +32,8 @@ $NetBSD: patch-ad,v 1.4 2001/06/16 19:56:16 jlam Exp $
 +   GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`"
     AC_SUBST(GMODULE_LIBS)
     AC_SUBST(GMODULE_FLAGS)
-    AC_MSG_RESULT(yes)
-@@ -157,7 +159,9 @@
+ fi
+@@ -153,7 +155,9 @@
    GX_LIBS="$GTK_LIBS"
  fi
  
@@ -44,7 +44,18 @@ $NetBSD: patch-ad,v 1.4 2001/06/16 19:56:16 jlam Exp $
  
  SUPPORT_LIBS=""
  
-@@ -338,6 +342,7 @@
+@@ -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 -jpeg -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 @@
  AC_SUBST(CPPFLAGS)
  AC_SUBST(X_CFLAGS)
  AC_SUBST(LDFLAGS)
diff --git a/graphics/imlib/patches/patch-ae b/graphics/imlib/patches/patch-ae
index 6e9f6ab5a64..11ad2029a84 100644
--- a/graphics/imlib/patches/patch-ae
+++ b/graphics/imlib/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2001/06/16 19:54:50 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2001/08/13 11:14:31 rh Exp $
 
---- imlib-config.in.orig	Thu Jan 14 04:43:29 1999
-+++ imlib-config.in	Fri Jun 15 22:58:16 2001
+--- imlib-config.in.orig	Wed Mar 28 05:18:40 2001
++++ imlib-config.in
 @@ -55,15 +55,15 @@
        if test @includedir@ != /usr/include ; then
          includes=-I@includedir@
@@ -11,9 +11,9 @@ $NetBSD: patch-ae,v 1.3 2001/06/16 19:54:50 jlam Exp $
        ;;
      --libs)
 -      libdirs=-L@libdir@
--      echo $libdirs -lImlib $gx_libs @LDFLAGS@ @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+-      echo $libdirs -lImlib @LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
 +      libdirs="-L@libdir@ -Wl,-R@libdir@"
-+      echo $libdirs -lImlib $gx_libs @X_LDFLAGS@ @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
++      echo $libdirs -lImlib @X_LDFLAGS@ $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
        ;;
      --libs-gdk)
 -      libdirs=-L@libdir@
diff --git a/graphics/imlib/pkg/PLIST b/graphics/imlib/pkg/PLIST
index 593032075c1..f56ae1ab528 100644
--- a/graphics/imlib/pkg/PLIST
+++ b/graphics/imlib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2001/01/04 15:10:39 agc Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/08/13 11:14:31 rh 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.8
+lib/libImlib.so.10.11
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
 lib/libgdk_imlib.so.10
-lib/libgdk_imlib.so.10.8
+lib/libgdk_imlib.so.10.11
 lib/libimlib-bmp.a
 lib/libimlib-bmp.la
 lib/libimlib-bmp.so
@@ -45,6 +45,10 @@ lib/libimlib-tiff.so
 lib/libimlib-xpm.a
 lib/libimlib-xpm.la
 lib/libimlib-xpm.so
+lib/pkgconfig/imlib.pc
+lib/pkgconfig/imlibgdk.pc
+man/man1/imlib-config.1
+man/man1/imlib_config.1
 share/aclocal/imlib.m4
 share/doc/imlib/bg.gif
 share/doc/imlib/border_diag.gif