Changes 1.2.0:

* Source tree clean up
* Bug fixes

8 files changed, 64 insertions, 109 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 59184960c4f..dc681e88636 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.26 2004/12/28 23:18:21 reed Exp $
-#
+# $NetBSD: Makefile,v 1.27 2005/01/11 13:37:54 adam Exp $
 
-DISTNAME=		imlib2-1.1.2
-PKGREVISION=		3
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
+DISTNAME=	imlib2-1.2.0
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.enlightenment.org/pages/imlib2.html
-COMMENT=		Image manipulation library
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://www.enlightenment.org/pages/imlib2.html
+COMMENT=	Image manipulation library
 
-GNU_CONFIGURE=		YES
-USE_X11=		YES
-USE_LIBTOOL=		YES
 USE_BUILDLINK3=		YES
+USE_LIBTOOL=		YES
+USE_X11=		YES
+GNU_CONFIGURE=		YES
 
 PKGCONFIG_OVERRIDE=	imlib2.pc.in
 
@@ -36,4 +34,5 @@ CONFIGURE_ARGS+=	--enable-mmx
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST
index fe0047f9247..36258e57469 100644
--- a/graphics/imlib2/PLIST
+++ b/graphics/imlib2/PLIST
@@ -1,30 +1,56 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:34 jlam Exp $
-bin/bumpmaptest
-bin/color_spaces
-bin/imconvert
-bin/imlib2
+@comment $NetBSD: PLIST,v 1.7 2005/01/11 13:37:54 adam Exp $
 bin/imlib2-config
+bin/imlib2_bumpmap
+bin/imlib2_colorspace
+bin/imlib2_conv
+bin/imlib2_poly
+bin/imlib2_show
 bin/imlib2_test
 bin/imlib2_view
-bin/polytest
 include/Imlib2.h
-lib/imlib2_loaders/filter/bump_map.la
-lib/imlib2_loaders/filter/colormod.la
-lib/imlib2_loaders/filter/testfilter.la
-lib/imlib2_loaders/image/argb.la
-lib/imlib2_loaders/image/bmp.la
-lib/imlib2_loaders/image/bz2.la
-lib/imlib2_loaders/image/gif.la
-lib/imlib2_loaders/image/jpeg.la
-lib/imlib2_loaders/image/lbm.la
-lib/imlib2_loaders/image/png.la
-lib/imlib2_loaders/image/pnm.la
-lib/imlib2_loaders/image/tga.la
-lib/imlib2_loaders/image/tiff.la
-lib/imlib2_loaders/image/xpm.la
-lib/imlib2_loaders/image/zlib.la
+lib/imlib2/filters/bumpmap.la
+lib/imlib2/filters/colormod.la
+lib/imlib2/filters/testfilter.la
+lib/imlib2/loaders/argb.la
+lib/imlib2/loaders/bmp.la
+lib/imlib2/loaders/bz2.la
+lib/imlib2/loaders/gif.la
+lib/imlib2/loaders/jpeg.la
+lib/imlib2/loaders/lbm.la
+lib/imlib2/loaders/png.la
+lib/imlib2/loaders/pnm.la
+lib/imlib2/loaders/tga.la
+lib/imlib2/loaders/tiff.la
+lib/imlib2/loaders/xpm.la
+lib/imlib2/loaders/zlib.la
 lib/libImlib2.la
 lib/pkgconfig/imlib2.pc
-@dirrm lib/imlib2_loaders/image
-@dirrm lib/imlib2_loaders/filter
-@dirrm lib/imlib2_loaders
+share/imlib2/data/fonts/cinema.ttf
+share/imlib2/data/fonts/grunge.ttf
+share/imlib2/data/fonts/morpheus.ttf
+share/imlib2/data/fonts/notepad.ttf
+share/imlib2/data/images/audio.png
+share/imlib2/data/images/bg.png
+share/imlib2/data/images/bulb.png
+share/imlib2/data/images/cal.png
+share/imlib2/data/images/calc.png
+share/imlib2/data/images/folder.png
+share/imlib2/data/images/globe.png
+share/imlib2/data/images/imlib2.png
+share/imlib2/data/images/lock.png
+share/imlib2/data/images/mail.png
+share/imlib2/data/images/menu.png
+share/imlib2/data/images/mush.png
+share/imlib2/data/images/paper.png
+share/imlib2/data/images/sh1.png
+share/imlib2/data/images/sh2.png
+share/imlib2/data/images/sh3.png
+share/imlib2/data/images/stop.png
+share/imlib2/data/images/tnt.png
+@dirrm share/imlib2/data/images
+@dirrm share/imlib2/data/fonts
+@dirrm share/imlib2/data
+@dirrm share/imlib2
+@dirrm lib/imlib2/loaders
+@dirrm lib/imlib2/filters
+@dirrm lib/imlib2
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index ea929cb7e0a..db184ad89f3 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,9 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/09/06 02:56:07 rh Exp $
+$NetBSD: distinfo,v 1.7 2005/01/11 13:37:54 adam Exp $
 
-SHA1 (imlib2-1.1.2.tar.gz) = ac26760d09aed5eb200101a9846c7647cf991dff
-Size (imlib2-1.1.2.tar.gz) = 875843 bytes
-SHA1 (patch-aa) = c17ca68d6335814d2d36330f61b2bd65a1af9f9c
-SHA1 (patch-ab) = 7d62dace61a3c39a93e642edfcf66beaa80fa184
-SHA1 (patch-ac) = 988d5962f10c3ff843f259bc4029465b0c85e21f
-SHA1 (patch-ad) = 622dfb1c2666dad4f216e78191ec186cb8d6f657
-SHA1 (patch-ae) = 9858eccea874a1574fc472b025968c847bd1d3bd
+SHA1 (imlib2-1.2.0.tar.gz) = 54f8ef83b0eac3f8e7f2218705e02a425fa73118
+Size (imlib2-1.2.0.tar.gz) = 890457 bytes
diff --git a/graphics/imlib2/patches/patch-aa b/graphics/imlib2/patches/patch-aa
deleted file mode 100644
index b20592c639a..00000000000
--- a/graphics/imlib2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/09/06 02:56:07 rh Exp $
-
---- demo/Makefile.in.orig	2004-08-31 05:23:11.000000000 +0200
-+++ demo/Makefile.in
-@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
- # 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-ab b/graphics/imlib2/patches/patch-ab
deleted file mode 100644
index 88dfde5478f..00000000000
--- a/graphics/imlib2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/09/06 02:56:07 rh Exp $
-
---- filters/Makefile.in.orig	2004-08-31 05:23:10.000000000 +0200
-+++ filters/Makefile.in
-@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
- # 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-ac b/graphics/imlib2/patches/patch-ac
deleted file mode 100644
index 0e1fa2e0897..00000000000
--- a/graphics/imlib2/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/09/06 02:56:07 rh Exp $
-
---- loaders/Makefile.in.orig	2004-08-31 05:23:11.000000000 +0200
-+++ loaders/Makefile.in
-@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
- # 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)                        -I$(prefix)/include -I$(includedir)
- 
- 
diff --git a/graphics/imlib2/patches/patch-ad b/graphics/imlib2/patches/patch-ad
deleted file mode 100644
index 8908afad171..00000000000
--- a/graphics/imlib2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/09/06 02:56:07 rh Exp $
-
---- src/Makefile.in.orig	2004-08-31 05:23:10.000000000 +0200
-+++ src/Makefile.in
-@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
- # 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_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-ae b/graphics/imlib2/patches/patch-ae
deleted file mode 100644
index a582633f5c5..00000000000
--- a/graphics/imlib2/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/09/06 02:56:07 rh Exp $
-
---- test/Makefile.in.orig	2004-08-31 05:23:11.000000000 +0200
-+++ test/Makefile.in
-@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
- # 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)
- 
-