Update to 2.003:

  2.003 2 January 2007

      * Added explicit version checking

  2.002 29 December 2006

      * Documentation updates.

      * Fix append mode with gzopen.
        rt-cpan.org 24041

      * Allow gzopen to read from and write to a scalar reference.

  2.001 1 November 2006

      * Remove beta status.

  2.000_14 26 October 2006

      * No changes.

  2.000_13 20 June 2006

      * No changes.

  2.000_12 16 April 2006

      * Fixed gzread to zap the output buffer to an empty string when zero
        bytes are requested. This matches the behaviour of C::Z 1.x

  2.000_11 10 April 2006

      * No changes.

  2.000_10 13 March 2006

      * Changed gzread so that its behaviour matches C::Z::gzread 1.x if it
        is called after eof. In this case it will write an empty string
        into the output parameter. This change is solely for backward
        compatability reasons.

  2.000_09 3 March 2006

      * Posted to CPAN

  2.000_08 2 March 2006

      * Breakout zlib specific code into separate modules.

      * Limited support for reading/writing zip files

  2.000_06 5 October 2005

      * Added eof parameter to Compress::Zlib::inflate method.

      * Fixed issue with 64-bit

  2.000_05 4 October 2005

      * Renamed IO::* to IO::Compress::* & IO::Uncompress::*

  2.000_04 23 September 2005

      * Fixed some more non-portable test that were failing on VMS.

      * fixed problem where error messages in the oneshot interface were
        getting lost.

  2.000_03 12 September 2005

      * Fixed some non-portable test that were failing on VMS.

      * Fixed export of zlib constants from the IO::* classes

  2.000_02 6 September 2005

      * Split Append mode into Append and Merge

      * Fixed typos in the documentation.

      * Added pod/FAQ.pod

      * Added libscan to Makefile.PL

      * Added InputLength for IO::Gunzip et al

  2.000_01 22 August 2005

      * Fixed VERSION in Compress::Gzip::Constants

      * Removed Compress::Gzip::Info from the distribution.

  2.000_00 21 August 2005

      * First Beta relase of Compress::zlib rewrite.

4 files changed, 10 insertions, 28 deletions

diff --git a/devel/p5-Compress-Zlib/DESCR b/devel/p5-Compress-Zlib/DESCR
index a0aed90c2fd..5f5edd75034 100644
--- a/devel/p5-Compress-Zlib/DESCR
+++ b/devel/p5-Compress-Zlib/DESCR
@@ -1,3 +1 @@
-The Compress::Zlib module provides a Perl interface to the zlib compression
-library. Most of the functionality provided by zlib is available in
-Compress::Zlib.
+This module provides a Perl interface to the zlib compression library.
diff --git a/devel/p5-Compress-Zlib/Makefile b/devel/p5-Compress-Zlib/Makefile
index 70dd31c47f3..ef36992ce53 100644
--- a/devel/p5-Compress-Zlib/Makefile
+++ b/devel/p5-Compress-Zlib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2006/11/05 17:49:34 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/02 19:11:17 wiz Exp $
 
-DISTNAME=		Compress-Zlib-1.42
+DISTNAME=		Compress-Zlib-2.003
 PKGNAME=		p5-${DISTNAME}
 SVR4_PKGNAME=		p5czl
 CATEGORIES=		devel perl5
@@ -10,15 +10,13 @@ MAINTAINER=		damon@brodiefamily.org
 HOMEPAGE=		http://search.cpan.org/dist/Compress-Zlib/
 COMMENT=		Perl5 module interface to the zlib compression library
 
+DEPENDS+=		p5-Compress-Raw-Zlib>=2.003:../../devel/p5-Compress-Raw-Zlib
+DEPENDS+=		p5-IO-Compress-Zlib>=2.003:../../devel/p5-IO-Compress-Zlib
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Compress/Zlib/.packlist
-MAKE_ENV+=		BUILD_ZLIB=False
-MAKE_ENV+=		OLD_ZLIB=False
-MAKE_ENV+=		ZLIB_LIB=${BUILDLINK_PREFIX.zlib}/lib
-MAKE_ENV+=		ZLIB_INCLUDE=${BUILDLINK_PREFIX.zlib}/include
 
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Compress-Zlib/distinfo b/devel/p5-Compress-Zlib/distinfo
index e27b721b7af..75ea799dc27 100644
--- a/devel/p5-Compress-Zlib/distinfo
+++ b/devel/p5-Compress-Zlib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2006/07/19 22:36:26 wiz Exp $
+$NetBSD: distinfo,v 1.14 2007/02/02 19:11:17 wiz Exp $
 
-SHA1 (Compress-Zlib-1.42.tar.gz) = b3ee513ba8833f9eb56ea9f0e33de67fa0e3b783
-RMD160 (Compress-Zlib-1.42.tar.gz) = c1212d697401c8e5f778e2d56b1aab6b19d7c1f6
-Size (Compress-Zlib-1.42.tar.gz) = 152085 bytes
-SHA1 (patch-aa) = a4c4638b2a7bbcf8f13512749686dea9030c1464
+SHA1 (Compress-Zlib-2.003.tar.gz) = 54f9a6db3e33af43d52cb63e1944079b9d5f24f4
+RMD160 (Compress-Zlib-2.003.tar.gz) = 5d0fe89dd41455cf75f1b4f101d6531c1ceee269
+Size (Compress-Zlib-2.003.tar.gz) = 62550 bytes
diff --git a/devel/p5-Compress-Zlib/patches/patch-aa b/devel/p5-Compress-Zlib/patches/patch-aa
deleted file mode 100644
index 8395b7db3b8..00000000000
--- a/devel/p5-Compress-Zlib/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/05/30 21:09:44 jschauma Exp $
-
---- Makefile.PL.orig	Wed Jan 14 22:26:52 2004
-+++ Makefile.PL
-@@ -76,7 +76,7 @@ WriteMakefile(	
- 			    },
- 	($BUILD_ZLIB
-           ? zlib_files($ZLIB_LIB)
--	  : (LIBS	=> [ "-L$ZLIB_LIB -lz " ])
-+	  : (LIBS	=> [ "-L$ZLIB_LIB $ENV{'COMPILER_RPATH_FLAG'}$ZLIB_LIB -lz " ])
- 	),  
- 	($] >= 5.005
- 	    ? (ABSTRACT_FROM	=> 'Zlib.pm',