Update to 1.04:

1.04 Thu Feb  3 15:27:41 GMT 2005
	- Imlib2 1.1.2 broke our tests as it doesn't enable alpha by
          default (for optimisation purposes). The module now enables
          alpha by default when you create an image, but you can turn
          it off with has_alpha (thanks to Don Armstrong)
	- tested with Imlib2 1.2.0

Might fix PR 29054.

4 files changed, 12 insertions, 51 deletions

diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 341e1420c62..34234e9ccbc 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/12/20 11:31:04 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/03/14 15:46:47 wiz Exp $
 #
 
-DISTNAME=	Image-Imlib2-1.03
+DISTNAME=	Image-Imlib2-1.04
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
 SVR4_PKGNAME=	p5im2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Image/}
@@ -12,34 +11,17 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Image-Imlib2/
 COMMENT=	Interface to the Imlib2 image library
 
-DEPENDS+=	p5-Module-Build-[0-9]*:../../devel/p5-Module-Build
-
 USE_PERL5=	run
 USE_X11=	YES
 USE_BUILDLINK3=	YES
 
-# If the X11 and Xext libraries are not weeded out,
-# they will be unresolved in the resulting .so
-
-IMLIB2LIBS=	$$CONFIG --libs | ${SED} -e 's/-lX11//g' -e 's/-lXext//g'
-
-post-patch:
-	cd ${WRKSRC} && \
-	${SED} -e 's,@IMLIB2LIBS@,${IMLIB2LIBS},' Build.PL > Build.PL.new && \
-	${MV} -f Build.PL.new Build.PL
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Build.PL
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
+# versions before that contained a broken imlib2-config
+BUILDLINK_DEPENDS.imlib2+=	imlib2>=1.2.0nb2
 
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build test
+PERL5_MODULE_TYPE=	Module::Build
 
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Imlib2/.packlist
 
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-Image-Imlib2/PLIST b/graphics/p5-Image-Imlib2/PLIST
index aebb8e05861..59d5b4b9470 100644
--- a/graphics/p5-Image-Imlib2/PLIST
+++ b/graphics/p5-Image-Imlib2/PLIST
@@ -1,6 +1 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/02 06:17:00 kim Exp $
-${PERL5_SITEARCH}/auto/Image/Imlib2/Imlib2.bs
-${PERL5_SITEARCH}/auto/Image/Imlib2/Imlib2.so
-${PERL5_SITEARCH}/Image/Imlib2.pm
-lib/perl5/site_perl/man/man3/Image::Imlib2.3
-@dirrm ${PERL5_SITEARCH}/auto/Image/Imlib2
+@comment $NetBSD: PLIST,v 1.3 2005/03/14 15:46:47 wiz Exp $
diff --git a/graphics/p5-Image-Imlib2/distinfo b/graphics/p5-Image-Imlib2/distinfo
index 8c88725f9c9..638dc53cbf1 100644
--- a/graphics/p5-Image-Imlib2/distinfo
+++ b/graphics/p5-Image-Imlib2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:11 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/14 15:46:47 wiz Exp $
 
-SHA1 (Image-Imlib2-1.03.tar.gz) = 6c8647fb9c77c8efd952c872ee0d9b6d174a4170
-RMD160 (Image-Imlib2-1.03.tar.gz) = 479aa661f6628ddd10555fbeb3bd263061dd0a9c
-Size (Image-Imlib2-1.03.tar.gz) = 16420 bytes
-SHA1 (patch-aa) = d296df4af5e66b498bbc9c7f85d54439c600247f
+SHA1 (Image-Imlib2-1.04.tar.gz) = 2abf4cb04f60062c06c8f86dc981c89b253b60a3
+RMD160 (Image-Imlib2-1.04.tar.gz) = f1af86da36fb1c39b2fa8c5432570f4a292ffb5f
+Size (Image-Imlib2-1.04.tar.gz) = 16736 bytes
diff --git a/graphics/p5-Image-Imlib2/patches/patch-aa b/graphics/p5-Image-Imlib2/patches/patch-aa
deleted file mode 100644
index a97599fae78..00000000000
--- a/graphics/p5-Image-Imlib2/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/07/25 04:23:36 kim Exp $
-
-Ugly trick to get rid of multiple X libraries that won't be found.
-
---- Build.PL.orig	2004-07-13 06:32:25.000000000 -0400
-+++ Build.PL	2004-07-25 00:16:24.000000000 -0400
-@@ -19,7 +19,7 @@
-   print "Found imlib2 $version";
- }
- 
--my $libs = `$CONFIG --libs`;
-+my $libs = `@IMLIB2LIBS@`;
- my $cflags = "-DX_DISPLAY_MISSING " . `$CONFIG --cflags`;
- 
- my $build = Module::Build->new(