Update to imlib2-1.1.1.

No real changelog available, so I'm guessing it are only bug-fixes..

8 files changed, 119 insertions, 67 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 12fee2e9ee5..4b68aeb5ed5 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/07/12 19:27:05 cube Exp $
+# $NetBSD: Makefile,v 1.21 2004/08/26 20:21:58 recht Exp $
 #
 
-DISTNAME=		imlib2-1.1.0
-PKGREVISION=		2
+DISTNAME=		imlib2-1.1.1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
@@ -28,6 +27,7 @@ CONFIGURE_ARGS+=	--enable-mmx
 . endif
 .endif
 
+.include "../../devel/libtool/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST
index f81247f3bcf..4d04bfc1548 100644
--- a/graphics/imlib2/PLIST
+++ b/graphics/imlib2/PLIST
@@ -1,51 +1,61 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/04 19:37:52 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/08/26 20:21:58 recht Exp $
+bin/bumpmaptest
+bin/color_spaces
+bin/imconvert
+bin/imlib2
 bin/imlib2-config
+bin/imlib2_test
+bin/imlib2_view
+bin/polytest
 include/Imlib2.h
+lib/imlib2_loaders/filter/bump_map.a
+lib/imlib2_loaders/filter/bump_map.la
+lib/imlib2_loaders/filter/bump_map.so
+lib/imlib2_loaders/filter/colormod.a
+lib/imlib2_loaders/filter/colormod.la
+lib/imlib2_loaders/filter/colormod.so
+lib/imlib2_loaders/filter/testfilter.a
+lib/imlib2_loaders/filter/testfilter.la
+lib/imlib2_loaders/filter/testfilter.so
+lib/imlib2_loaders/image/argb.a
+lib/imlib2_loaders/image/argb.la
+lib/imlib2_loaders/image/argb.so
+lib/imlib2_loaders/image/bmp.a
+lib/imlib2_loaders/image/bmp.la
+lib/imlib2_loaders/image/bmp.so
+lib/imlib2_loaders/image/bz2.a
+lib/imlib2_loaders/image/bz2.la
+lib/imlib2_loaders/image/bz2.so
+lib/imlib2_loaders/image/gif.a
+lib/imlib2_loaders/image/gif.la
+lib/imlib2_loaders/image/gif.so
+lib/imlib2_loaders/image/jpeg.a
+lib/imlib2_loaders/image/jpeg.la
+lib/imlib2_loaders/image/jpeg.so
+lib/imlib2_loaders/image/png.a
+lib/imlib2_loaders/image/png.la
+lib/imlib2_loaders/image/png.so
+lib/imlib2_loaders/image/pnm.a
+lib/imlib2_loaders/image/pnm.la
+lib/imlib2_loaders/image/pnm.so
+lib/imlib2_loaders/image/tga.a
+lib/imlib2_loaders/image/tga.la
+lib/imlib2_loaders/image/tga.so
+lib/imlib2_loaders/image/tiff.a
+lib/imlib2_loaders/image/tiff.la
+lib/imlib2_loaders/image/tiff.so
+lib/imlib2_loaders/image/xpm.a
+lib/imlib2_loaders/image/xpm.la
+lib/imlib2_loaders/image/xpm.so
+lib/imlib2_loaders/image/zlib.a
+lib/imlib2_loaders/image/zlib.la
+lib/imlib2_loaders/image/zlib.so
 lib/libImlib2.a
 lib/libImlib2.la
 lib/libImlib2.so
 lib/libImlib2.so.2
-lib/libImlib2.so.2.0
-lib/loaders/filter/bump_map.a
-lib/loaders/filter/bump_map.la
-lib/loaders/filter/bump_map.so
-lib/loaders/filter/colormod.a
-lib/loaders/filter/colormod.la
-lib/loaders/filter/colormod.so
-lib/loaders/filter/testfilter.a
-lib/loaders/filter/testfilter.la
-lib/loaders/filter/testfilter.so
-lib/loaders/image/argb.a
-lib/loaders/image/argb.la
-lib/loaders/image/argb.so
-lib/loaders/image/bmp.a
-lib/loaders/image/bmp.la
-lib/loaders/image/bmp.so
-lib/loaders/image/gif.a
-lib/loaders/image/gif.la
-lib/loaders/image/gif.so
-lib/loaders/image/gzbz2.a
-lib/loaders/image/gzbz2.la
-lib/loaders/image/gzbz2.so
-lib/loaders/image/jpeg.a
-lib/loaders/image/jpeg.la
-lib/loaders/image/jpeg.so
-lib/loaders/image/png.a
-lib/loaders/image/png.la
-lib/loaders/image/png.so
-lib/loaders/image/pnm.a
-lib/loaders/image/pnm.la
-lib/loaders/image/pnm.so
-lib/loaders/image/tga.a
-lib/loaders/image/tga.la
-lib/loaders/image/tga.so
-lib/loaders/image/tiff.a
-lib/loaders/image/tiff.la
-lib/loaders/image/tiff.so
-lib/loaders/image/xpm.a
-lib/loaders/image/xpm.la
-lib/loaders/image/xpm.so
+lib/libImlib2.so.2.1
 lib/pkgconfig/imlib2.pc
-@dirrm lib/loaders/image
-@dirrm lib/loaders/filter
-@dirrm lib/loaders
+@dirrm lib/imlib2_loaders/image
+@dirrm lib/imlib2_loaders/filter
+@dirrm lib/imlib2_loaders
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index e8d6529789b..78b54eb0456 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/12/04 19:37:52 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2004/08/26 20:21:58 recht Exp $
 
-SHA1 (imlib2-1.1.0.tar.gz) = 64ad5878eb8956e30100a0da0a1b89f00cffb0cb
-Size (imlib2-1.1.0.tar.gz) = 814851 bytes
-SHA1 (patch-aa) = 627f21f99db33ee652a1ab9b5214a15fbbcd60b2
-SHA1 (patch-ab) = 1f265f0c81e3e5c5ad6b6c9a784b2a3b720e39dc
+SHA1 (imlib2-1.1.1.tar.gz) = 3ed59dbba286ac0a8b0f375467b7d662e765b5c3
+Size (imlib2-1.1.1.tar.gz) = 871202 bytes
+SHA1 (patch-aa) = 5fd7a62f2424b87ce750e0f7700135f51f3bf9da
+SHA1 (patch-ab) = a6756a42c87562df34516a05ca2bd616b9562ba8
+SHA1 (patch-ac) = d65999f9b844db4a20dcd5bd47ff1127df54af15
+SHA1 (patch-ad) = 062c1359e98aafd30379699db4ab041d8f170bdb
+SHA1 (patch-ae) = 02bd5ca5c130fd02143199137f5108a8123f8112
diff --git a/graphics/imlib2/patches/patch-aa b/graphics/imlib2/patches/patch-aa
index fbe58e91166..987621e374b 100644
--- a/graphics/imlib2/patches/patch-aa
+++ b/graphics/imlib2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/12/04 19:37:52 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2004/08/26 20:21:58 recht Exp $
 
---- src/Makefile.in.orig	2003-09-07 21:12:28.000000000 -0500
-+++ src/Makefile.in
-@@ -99,7 +99,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+--- src/Makefile.in.orig	2004-07-30 05:06:53.000000000 +0200
++++ src/Makefile.in	2004-08-26 20:28:32.000000000 +0200
+@@ -113,7 +113,7 @@
  # A list of all the files in the current directory which can be regenerated
- MAINTAINERCLEANFILES = Makefile.in loaderpath.h
+ MAINTAINERCLEANFILES = Makefile.in
  
 -LDFLAGS = -L/usr/X11R6/lib
 +LDFLAGS = @LDFLAGS@
- INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
-                        $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_builddir)/src                        -I$(top_srcdir)/loaders                        $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir) @XMISS@
+ 
+ MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S 		       asm_blend_cmod.S
diff --git a/graphics/imlib2/patches/patch-ab b/graphics/imlib2/patches/patch-ab
index f5ca8571680..5f7e50e92f8 100644
--- a/graphics/imlib2/patches/patch-ab
+++ b/graphics/imlib2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2003/12/04 19:37:52 xtraeme Exp $
+$NetBSD: patch-ab,v 1.4 2004/08/26 20:21:58 recht Exp $
 
---- loaders/Makefile.in.orig	2003-09-07 21:12:29.000000000 -0500
-+++ loaders/Makefile.in
-@@ -99,7 +99,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+--- loaders/Makefile.in.orig	2004-07-30 05:06:54.000000000 +0200
++++ loaders/Makefile.in	2004-08-26 20:29:16.000000000 +0200
+@@ -113,7 +113,7 @@
  # A list of all the files in the current directory which can be regenerated
  MAINTAINERCLEANFILES = Makefile.in
  
 -LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
 +LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
- INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
-                        -I/usr/X11R6/include $(X_CFLAGS) \
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ 
+ 
diff --git a/graphics/imlib2/patches/patch-ac b/graphics/imlib2/patches/patch-ac
new file mode 100644
index 00000000000..827d3104696
--- /dev/null
+++ b/graphics/imlib2/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/08/26 20:21:58 recht Exp $
+
+--- filters/Makefile.in.orig	2004-08-26 20:30:16.000000000 +0200
++++ filters/Makefile.in	2004-08-26 20:30:32.000000000 +0200
+@@ -113,7 +113,7 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
++LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs @LDFLAGS@
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ 
+ 
diff --git a/graphics/imlib2/patches/patch-ad b/graphics/imlib2/patches/patch-ad
new file mode 100644
index 00000000000..ad5187b4aea
--- /dev/null
+++ b/graphics/imlib2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/08/26 20:21:58 recht Exp $
+
+--- test/Makefile.in.orig	2004-08-26 20:32:09.000000000 +0200
++++ test/Makefile.in	2004-08-26 20:32:23.000000000 +0200
+@@ -113,7 +113,7 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in				
+ 
+-LDFLAGS = -L/usr/X11R6/lib
++LDFLAGS = @LDFLAGS@
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS) 		       -I$(prefix)/include -I$(includedir)
+ 
+ 
diff --git a/graphics/imlib2/patches/patch-ae b/graphics/imlib2/patches/patch-ae
new file mode 100644
index 00000000000..ab889583282
--- /dev/null
+++ b/graphics/imlib2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/08/26 20:21:58 recht Exp $
+
+--- demo/Makefile.in.orig	2004-08-26 20:43:34.000000000 +0200
++++ demo/Makefile.in	2004-08-26 20:43:49.000000000 +0200
+@@ -113,7 +113,7 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in				
+ 
+-LDFLAGS = -L/usr/X11R6/lib
++LDFLAGS = @LDFLAGS@
+ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl                        -I/usr/X11R6/include $(X_CFLAGS)                        -I$(prefix)/include -I$(includedir)
+ 
+