Updated to 1.1.0, provided by Min Sik Kim PR pkg/23630.

Changes:

	o imlib2-1.1.0 uses freetype2 instead of freetype1.
	o More bugfixes, etc.

6 files changed, 35 insertions, 35 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index f8b590727d6..d9080723b40 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 16:51:46 martti Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/04 19:37:52 xtraeme Exp $
 #
 
-DISTNAME=		imlib2-1.0.6
-PKGREVISION=		2
+DISTNAME=		imlib2-1.1.0
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
@@ -16,6 +15,7 @@ USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/imlib2.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,11 +24,10 @@ CONFIGURE_ARGS+=	--enable-mmx
 .endif
 BUILD_DEFS+=		USE_MMX
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
-.include "../../databases/edb/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST
index 59c846edcde..f81247f3bcf 100644
--- a/graphics/imlib2/PLIST
+++ b/graphics/imlib2/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/15 12:00:40 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/04 19:37:52 xtraeme Exp $
 bin/imlib2-config
 include/Imlib2.h
 lib/libImlib2.a
 lib/libImlib2.la
 lib/libImlib2.so
-lib/libImlib2.so.1
-lib/libImlib2.so.1.4
+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
@@ -24,6 +24,9 @@ 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
@@ -42,6 +45,7 @@ lib/loaders/image/tiff.so
 lib/loaders/image/xpm.a
 lib/loaders/image/xpm.la
 lib/loaders/image/xpm.so
+lib/pkgconfig/imlib2.pc
 @dirrm lib/loaders/image
 @dirrm lib/loaders/filter
 @dirrm lib/loaders
diff --git a/graphics/imlib2/buildlink2.mk b/graphics/imlib2/buildlink2.mk
index 6635ffbce52..0de0ceef4a6 100644
--- a/graphics/imlib2/buildlink2.mk
+++ b/graphics/imlib2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/12/03 01:32:08 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/04 19:37:52 xtraeme Exp $
 
 .if !defined(IMLIB2_BUILDLINK2_MK)
 IMLIB2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		imlib2
-BUILDLINK_DEPENDS.imlib2?=	imlib2>=1.0.6nb2
+BUILDLINK_DEPENDS.imlib2?=	imlib2>=1.1.0
 BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib2=imlib2
@@ -12,16 +12,14 @@ BUILDLINK_PREFIX.imlib2_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.imlib2=		bin/imlib2-config
 BUILDLINK_FILES.imlib2+=	include/Imlib2.h
 BUILDLINK_FILES.imlib2+=	lib/libImlib2.*
+BUILDLINK_FILES.imlib2+=	lib/loaders/filter/*
 BUILDLINK_FILES.imlib2+=	lib/loaders/image/*
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
-.include "../../databases/edb/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	imlib2-buildlink
 
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index eb3b7c5339b..e8d6529789b 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/02/15 12:00:40 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/12/04 19:37:52 xtraeme Exp $
 
-SHA1 (imlib2-1.0.6.tar.gz) = 79bd982eef1a18bf5df0407b50d1a38a6c57fd58
-Size (imlib2-1.0.6.tar.gz) = 688521 bytes
-SHA1 (patch-ab.new) = 605bdf9f45c26929a15826ac5a86a4b8787e2f9c
-SHA1 (patch-aa) = 41fab46215fb0c4ca305ba2c958990589279a073
-SHA1 (patch-ab) = 9ee42d4a2bf97a0ac21f6e9ba32490d92fafc260
+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
diff --git a/graphics/imlib2/patches/patch-aa b/graphics/imlib2/patches/patch-aa
index 4afbf37060b..fbe58e91166 100644
--- a/graphics/imlib2/patches/patch-aa
+++ b/graphics/imlib2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/16 10:49:52 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/04 19:37:52 xtraeme Exp $
 
---- src/Makefile.in.orig	Sun Apr 29 07:54:34 2001
+--- src/Makefile.in.orig	2003-09-07 21:12:28.000000000 -0500
 +++ src/Makefile.in
-@@ -93,7 +93,7 @@
+@@ -99,7 +99,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
  # A list of all the files in the current directory which can be regenerated
  MAINTAINERCLEANFILES = Makefile.in loaderpath.h
  
 -LDFLAGS = -L/usr/X11R6/lib
 +LDFLAGS = @LDFLAGS@
- INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl                        $(X_CFLAGS) -I$(prefix)/include -I$(includedir) 		       -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders
- 
- MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S 		       asm_blend_cmod.S
+ 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) \
diff --git a/graphics/imlib2/patches/patch-ab b/graphics/imlib2/patches/patch-ab
index 60af9d573f9..f5ca8571680 100644
--- a/graphics/imlib2/patches/patch-ab
+++ b/graphics/imlib2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/02/15 12:00:41 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2003/12/04 19:37:52 xtraeme Exp $
 
---- loaders/Makefile.in.orig	Fri Apr 26 01:45:29 2002
+--- loaders/Makefile.in.orig	2003-09-07 21:12:29.000000000 -0500
 +++ loaders/Makefile.in
-@@ -92,7 +92,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
+@@ -99,7 +99,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 -L$(top_builddir)/src
-+LDFLAGS = @LDFLAGS@ -L$(top_builddir)/src
- INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl                        $(X_CFLAGS) -I$(prefix)/include -I$(includedir) 		       -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders
- 
- 
+-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) \