PkgSrc changes:

  - removed packages p5-IO-Compress-Base, p5-IO-Compress-Zlib,
    p5-IO-Compress-Bzip2 and p5-Compress-Zlib because they are
    merged into p5-IO-Compress
  - Updated dependend packages to depend on p5-IO-Compress
    and bump PKGREVISION

Upstream changes:
  2.017 30 March 2009

      * Merged IO-Compress-Base, IO-Compress-Bzip2, IO-Compress-Zlib &
        Compress-Zlib into IO-Compress.
      * The interface to Compress-Raw-Zlib now uses the new LimitOutput
        feature. This will make all of the zlib-related IO-Compress modules
        less greedy in their memory consumption.
      * Removed MAN3PODS from Makefile.PL
      * A few changes to get the test harness to work on VMS courtesy of
        Craig. A. Berry.
      * IO::Compress::Base & IO::Uncompress::Base
        Downgraded some croaks in the constructors to just set $! (by letting
        the code attempt to open a file and fail).
        This makes the behavior more consistent to a standard open.
        [RT #42657]
      * IO::Uncompress::Base
        Doing a seek with MultiStream could drop some of the uncompressed
        data. Fixed.
      * IO::Compress::Zip
        - Fixed problem with the uncompressed & uncompressed fields when
          zip64 is enabled. They were set to 0x0000FFFF instead of
          0xFFFFFFFF. Also the ZIP64 extra field was 4 bytes short.
          Problem spotted by Dino Chiesa.
      * IO::Uncompress::Unzip
        - use POSIX::mktime instead of Time::Local::timelocal to convert
          the zip DOS time field into Unix time.
      * Compress::Zlib
        - Documented Compress::Zlib::zlib_version()

34 files changed, 68 insertions, 177 deletions

diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 340aa1cb07d..64eafbc4d05 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/10/20 21:50:50 he Exp $
+# $NetBSD: Makefile,v 1.27 2009/04/11 23:15:19 sno Exp $
 
 DISTNAME=		Archive-Zip-1.26
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 SVR4_PKGNAME=		p5zip
 CATEGORIES=		archivers perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Archive/}
@@ -10,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Archive-Zip/
 COMMENT=		Perl5 module interface to manipulate zip files
 
-DEPENDS+=		p5-Compress-Zlib>=1.14:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index b95436d8b3f..3a99e9c3636 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/10/19 19:17:41 he Exp $
+# $NetBSD: Makefile,v 1.17 2009/04/11 23:15:19 sno Exp $
 
 DISTNAME=	tagged-0.40
 PKGNAME=	p5-MP3-Tag-0.40
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	p5mp3
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MP3/}
@@ -13,7 +13,7 @@ COMMENT=	This is a perl module to read/write tags of mp3-files
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Compress-Zlib>=1.0:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 PERL5_PACKLIST=		auto/MP3/Tag/.packlist
 
diff --git a/devel/p5-Compress-Zlib/DESCR b/devel/p5-Compress-Zlib/DESCR
deleted file mode 100644
index 5f5edd75034..00000000000
--- a/devel/p5-Compress-Zlib/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 5e18b05b1a0..00000000000
--- a/devel/p5-Compress-Zlib/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2008/10/19 19:17:49 he Exp $
-
-DISTNAME=		Compress-Zlib-2.015
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
-SVR4_PKGNAME=		p5czl
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Compress/}
-
-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.015:../../devel/p5-Compress-Raw-Zlib
-DEPENDS+=		p5-IO-Compress-Zlib>=2.015:../../devel/p5-IO-Compress-Zlib
-
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/Compress/Zlib/.packlist
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Compress-Zlib/distinfo b/devel/p5-Compress-Zlib/distinfo
deleted file mode 100644
index 2a26d7b2c9b..00000000000
--- a/devel/p5-Compress-Zlib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.18 2008/10/13 12:42:36 obache Exp $
-
-SHA1 (Compress-Zlib-2.015.tar.gz) = 022daac3d0590b156dde207afdd2c374e6f70ef4
-RMD160 (Compress-Zlib-2.015.tar.gz) = ed09cbf3acc74a058eea007018eff832838ca40b
-Size (Compress-Zlib-2.015.tar.gz) = 64980 bytes
diff --git a/devel/p5-IO-Compress-Base/DESCR b/devel/p5-IO-Compress-Base/DESCR
deleted file mode 100644
index d56d8725d47..00000000000
--- a/devel/p5-IO-Compress-Base/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This module is the base class for all IO::Compress and IO::Uncompress
-modules.
diff --git a/devel/p5-IO-Compress-Base/Makefile b/devel/p5-IO-Compress-Base/Makefile
deleted file mode 100644
index bac00a4e1dc..00000000000
--- a/devel/p5-IO-Compress-Base/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2008/10/19 19:17:55 he Exp $
-
-DISTNAME=		IO-Compress-Base-2.015
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
-SVR4_PKGNAME=		p5icb
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=IO/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://search.cpan.org/dist/IO-Compress-Base/
-COMMENT=		Base class for IO::Compress and IO::Uncompress modules
-
-USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		auto/IO/Compress/Base/.packlist
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-Compress-Base/distinfo b/devel/p5-IO-Compress-Base/distinfo
deleted file mode 100644
index e02aaf22a2e..00000000000
--- a/devel/p5-IO-Compress-Base/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2008/10/13 12:37:58 obache Exp $
-
-SHA1 (IO-Compress-Base-2.015.tar.gz) = 595529168a46e8b195b7b0942c107f5fa2206af2
-RMD160 (IO-Compress-Base-2.015.tar.gz) = 85a9033066a5c030e673c7e328f867608eb29fd6
-Size (IO-Compress-Base-2.015.tar.gz) = 95844 bytes
diff --git a/devel/p5-IO-Compress-Bzip2/DESCR b/devel/p5-IO-Compress-Bzip2/DESCR
deleted file mode 100644
index 20b711dd397..00000000000
--- a/devel/p5-IO-Compress-Bzip2/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This module provides a Perl interface to allow reading and writing
-of bzip2 files/buffers.
diff --git a/devel/p5-IO-Compress-Bzip2/Makefile b/devel/p5-IO-Compress-Bzip2/Makefile
deleted file mode 100644
index 9bdd6adfd02..00000000000
--- a/devel/p5-IO-Compress-Bzip2/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/05 15:41:14 wiz Exp $
-
-DISTNAME=		IO-Compress-Bzip2-2.015
-PKGNAME=		p5-${DISTNAME}
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=IO/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://search.cpan.org/dist/IO-Compress-Bzip2/
-COMMENT=		Perl module to parse bzip2 files and buffers
-
-DEPENDS+=		p5-IO-Compress-Base>=2.015:../../devel/p5-IO-Compress-Base
-DEPENDS+=		p5-Compress-Raw-Bzip2>=2.015:../../devel/p5-Compress-Raw-Bzip2
-
-USE_LANGUAGES=		# empty
-PERL5_PACKLIST=		auto/IO/Compress/Bzip2/.packlist
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-Compress-Bzip2/distinfo b/devel/p5-IO-Compress-Bzip2/distinfo
deleted file mode 100644
index 6168af6efef..00000000000
--- a/devel/p5-IO-Compress-Bzip2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/05 15:41:14 wiz Exp $
-
-SHA1 (IO-Compress-Bzip2-2.015.tar.gz) = 379e8d8d112d1255a3b9974f70f5e1ed78479c7a
-RMD160 (IO-Compress-Bzip2-2.015.tar.gz) = 4b17cb5ae76cd4b24ebcb15d1f928394897030b4
-Size (IO-Compress-Bzip2-2.015.tar.gz) = 75388 bytes
diff --git a/devel/p5-IO-Compress-Zlib/DESCR b/devel/p5-IO-Compress-Zlib/DESCR
deleted file mode 100644
index a6356fe0dd1..00000000000
--- a/devel/p5-IO-Compress-Zlib/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This module provides a Perl interface to allow reading and writing of RFC
-1950, 1951, 1952 (i.e. gzip) and zip files/buffers.
diff --git a/devel/p5-IO-Compress-Zlib/Makefile b/devel/p5-IO-Compress-Zlib/Makefile
deleted file mode 100644
index 1fa92c66ee0..00000000000
--- a/devel/p5-IO-Compress-Zlib/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2008/10/19 19:17:55 he Exp $
-
-DISTNAME=		IO-Compress-Zlib-2.015
-PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
-SVR4_PKGNAME=		p5icz
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=IO/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://search.cpan.org/dist/IO-Compress-Zlib/
-COMMENT=		Perl module to parse gzip and zip files and buffers
-
-DEPENDS+=		p5-IO-Compress-Base>=2.015:../../devel/p5-IO-Compress-Base
-DEPENDS+=		p5-Compress-Raw-Zlib>=2.015:../../devel/p5-Compress-Raw-Zlib
-
-USE_LANGUAGES=	# empty
-PERL5_PACKLIST=		auto/IO/Compress/Zlib/.packlist
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-IO-Compress-Zlib/distinfo b/devel/p5-IO-Compress-Zlib/distinfo
deleted file mode 100644
index 3127a3f9586..00000000000
--- a/devel/p5-IO-Compress-Zlib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2008/10/13 12:40:18 obache Exp $
-
-SHA1 (IO-Compress-Zlib-2.015.tar.gz) = a2dd277f083b53d50d683dcf8bff4c7b9177d295
-RMD160 (IO-Compress-Zlib-2.015.tar.gz) = 6be8bb18881fd8c2b37f6ec6262e0c3b1ec9c41c
-Size (IO-Compress-Zlib-2.015.tar.gz) = 141649 bytes
diff --git a/devel/p5-IO-Zlib/Makefile b/devel/p5-IO-Zlib/Makefile
index d0dab254cb6..00162443e8f 100644
--- a/devel/p5-IO-Zlib/Makefile
+++ b/devel/p5-IO-Zlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/10/19 19:17:56 he Exp $
+# $NetBSD: Makefile,v 1.18 2009/04/11 23:15:19 sno Exp $
 
 DISTNAME=		IO-Zlib-1.09
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		p5izl
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=IO/}
@@ -14,7 +14,7 @@ COMMENT=		Perl5 IO:: style interface to Compress::Zlib
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		p5-Compress-Zlib>=1.16:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 USE_LANGUAGES=		# empty
 
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index 34e9326e34e..bd98e91ad52 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/04/11 20:51:21 sno Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/11 23:15:19 sno Exp $
 #
 
 DISTNAME=		PAR-0.992
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=PAR/}
 
@@ -16,7 +17,7 @@ DEPENDS+=		p5-Archive-Zip>=1:../../archivers/p5-Archive-Zip
 DEPENDS+=		p5-Module-ScanDeps>=0.45:../../devel/p5-Module-ScanDeps
 DEPENDS+=		p5-PAR-Dist>=0.32:../../devel/p5-PAR-Dist
 DEPENDS+=		p5-Module-Signature>=0.35:../../security/p5-Module-Signature
-DEPENDS+=		p5-Compress-Zlib>=1.30:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=		p5-AutoLoader>=5.66.02:../../devel/p5-AutoLoader
 
 PERL5_PACKLIST=		auto/PAR/.packlist
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 45a4dcb1984..f2472d8ba67 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 19:17:58 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/11 23:15:20 sno Exp $
 
 DISTNAME=	POE-1.003
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=POE/}
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://poe.perl.org/
 #HOMEPAGE=	http://search.cpan.org/dist/POE/
 COMMENT=	Perl Object Environment
 
-DEPENDS+=	p5-Compress-Zlib>=1.33:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Curses>=1.08:../../devel/p5-Curses
 DEPENDS+=	p5-Event>=1.00:../../devel/p5-Event
 DEPENDS+=	p5-IO-tty>=1.02:../../devel/p5-IO-Tty
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 8f513334de4..37de03505bb 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2008/11/17 23:33:37 bad Exp $
+# $NetBSD: Makefile,v 1.32 2009/04/11 23:15:20 sno Exp $
 
 DISTNAME=	SVK-v2.2.1
 PKGNAME=	svk-2.2.1
+PKGREVISION=	1
 CATEGORIES=	devel perl5 scm
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
 
@@ -23,7 +24,7 @@ DEPENDS+=	p5-App-CLI>=0.07:../../devel/p5-App-CLI
 DEPENDS+=	p5-Class-Accessor>=0.25:../../devel/p5-Class-Accessor
 DEPENDS+=	p5-Class-Autouse>=1.15:../../devel/p5-Class-Autouse
 DEPENDS+=	p5-Class-Data-Inheritable>=0.06:../../devel/p5-Class-Data-Inheritable
-DEPENDS+=	p5-Compress-Zlib>=1.33:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Data-Hierarchy>=0.30:../../devel/p5-Data-Hierarchy
 DEPENDS+=	p5-File-Temp>=0.17:../../devel/p5-File-Temp
 DEPENDS+=	p5-File-Type>=0.22:../../devel/p5-File-Type
@@ -31,8 +32,8 @@ DEPENDS+=	p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw
 DEPENDS+=	p5-IO-Digest>=0.10:../../devel/p5-IO-Digest
 DEPENDS+=	p5-IO-Pager>=0.06:../../devel/p5-IO-Pager
 DEPENDS+=	p5-List-MoreUtils>=0.22:../../devel/p5-List-MoreUtils
-DEPENDS+=p5-Locale-Maketext-Lexicon>=0.62:../../misc/p5-Locale-Maketext-Lexicon
-DEPENDS+=p5-Locale-Maketext-Simple>=0.16:../../misc/p5-Locale-Maketext-Simple
+DEPENDS+=	p5-Locale-Maketext-Lexicon>=0.62:../../misc/p5-Locale-Maketext-Lexicon
+DEPENDS+=	p5-Locale-Maketext-Simple>=0.16:../../misc/p5-Locale-Maketext-Simple
 DEPENDS+=	p5-Path-Class>=0.16:../../devel/p5-Path-Class
 DEPENDS+=	p5-PathTools>=3.19:../../devel/p5-PathTools
 DEPENDS+=	p5-PerlIO-eol>=0.13:../../devel/p5-PerlIO-eol
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 7d282d6064a..f8039634f11 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/10/19 19:18:10 he Exp $
+# $NetBSD: Makefile,v 1.24 2009/04/11 23:15:20 sno Exp $
 #
 
 DISTNAME=	Image-Size-3.1.1
@@ -14,7 +14,8 @@ COMMENT=	Read the dimensions of an image in several popular formats
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
-DEPENDS+=	p5-Compress-Zlib>=2:../../devel/p5-Compress-Zlib
+
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 PERL5_PACKLIST=		auto/Image/Size/.packlist
 
diff --git a/graphics/p5-SWF-File/Makefile b/graphics/p5-SWF-File/Makefile
index f61fa96f2e2..7bd5755301f 100644
--- a/graphics/p5-SWF-File/Makefile
+++ b/graphics/p5-SWF-File/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/04/11 21:02:21 sno Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/11 23:15:20 sno Exp $
 #
 
 DISTNAME=	SWF-File-0.42
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/Y/YS/YSAS/}
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://search.cpan.org/dist/SWF-File/
 COMMENT=	Manipulating Flash movie (SWF) files
 
 DEPENDS+=	p5-Data-TemporaryBag-[0-9]*:../../devel/p5-Data-TemporaryBag
-DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 17aeebc23cd..a1d6b4c3463 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2009/03/07 13:25:19 seb Exp $
+# $NetBSD: Makefile,v 1.93 2009/04/11 23:15:20 sno Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.2.5
 PKGNAME=	spamassassin-3.2.5
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -24,7 +24,7 @@ DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 DEPENDS+=	{p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
-DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=	p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
 DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=	p5-DB_File-[0-9]*:../../databases/p5-DB_File
diff --git a/multimedia/p5-xmltv/Makefile b/multimedia/p5-xmltv/Makefile
index 0df20b89158..1e66cc16db5 100644
--- a/multimedia/p5-xmltv/Makefile
+++ b/multimedia/p5-xmltv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2008/10/19 19:18:31 he Exp $
+# $NetBSD: Makefile,v 1.23 2009/04/11 23:15:20 sno Exp $
 
 DISTNAME=	xmltv-0.5.45
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmltv/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,7 +38,7 @@ DEPENDS+=	p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 DEPENDS+=	p5-Text-Kakasi-[0-9]*:../../textproc/p5-Text-Kakasi
 # needed by se grabber
 DEPENDS+=	p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
-DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=	p5-HTTP-Cache-Transparent-[0-9]*:../../www/p5-HTTP-Cache-Transparent
 # needed by pt grabber
 DEPENDS+=	p5-Unicode-UTF8simple-[0-9]*:../../converters/p5-Unicode-UTF8simple
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index a8d0427774c..b2b930580af 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:22 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/04/11 23:15:20 sno Exp $
 #
 
 DISTNAME=		netdisco-0.95_with_mibs
 PKGNAME=		netdisco-0.95
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netdisco/}
 
@@ -19,7 +20,7 @@ DEPENDS+=		p5-MasonX-Request-WithApacheSession-[0-9]*:../../www/p5-MasonX-Reques
 DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=		p5-Graph-[0-9]*:../../devel/p5-Graph
 DEPENDS+=		p5-GraphViz-[0-9]*:../../graphics/p5-GraphViz
-DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=		p5-Net-NBName-[0-9]*:../../net/p5-Net-NBName
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index e4c1c291e01..2b05a667694 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2008/12/20 21:48:23 he Exp $
+# $NetBSD: Makefile,v 1.25 2009/04/11 23:15:20 sno Exp $
 #
 
 DISTNAME=	SOAP-Lite-0.710.08
 PKGNAME=	p5-${DISTNAME:S/710.08/71.08/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SOAP/}
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.soaplite.com/
 #HOMEPAGE=	http://search.cpan.org/dist/SOAP-Lite/
 COMMENT=	Perl5 module providing a lightweight interface to SOAP
 
-DEPENDS+=	p5-Compress-Zlib>=0:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Crypt-SSLeay>=0:../../security/p5-Crypt-SSLeay
 DEPENDS+=	p5-FCGI>=0:../../www/p5-FCGI
 DEPENDS+=	p5-libwww>=0:../../www/p5-libwww
diff --git a/net/p5-eBay-API/Makefile b/net/p5-eBay-API/Makefile
index b92791ebdc6..e0915a7971e 100644
--- a/net/p5-eBay-API/Makefile
+++ b/net/p5-eBay-API/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/26 19:14:48 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/11 23:15:20 sno Exp $
 
 DISTNAME=		eBay-API-0.25
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		net perl5 www
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../../authors/id/T/TK/TKEEFER/}
 
@@ -11,7 +12,7 @@ COMMENT=		Non SOAP based XML schema library for eBay API
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Compress-Zlib>=1.41:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Crypt-SSLeay>=0.51:../../security/p5-Crypt-SSLeay
 DEPENDS+=	p5-Devel-StackTrace>=1.03:../../devel/p5-Devel-StackTrace
 DEPENDS+=	p5-Error>=0.15:../../devel/p5-Error
diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile
index 499fad4d460..38243b4a1f3 100644
--- a/security/amavis-perl/Makefile
+++ b/security/amavis-perl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/04/11 23:15:21 sno Exp $
 
 DISTNAME=	amavisd-${VERSION}
 PKGNAME=	amavis-perl-${VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.amavis.org/dist/perl/ \
 		${MASTER_SITE_SOURCEFORGE:=amavis/}
@@ -29,7 +29,7 @@ DEPENDS+=	freeze-[0-9]*:../../archivers/freeze
 DEPENDS+=	arc-[0-9]*:../../archivers/arc
 DEPENDS+=	p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar
 DEPENDS+=	p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
 DEPENDS+=	p5-Convert-UUlib-[0-9]*:../../converters/p5-Convert-UUlib
 DEPENDS+=	p5-MIME-tools>=5.313:../../mail/p5-MIME-tools
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 1bf896fbc87..a3b7a0e9319 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2009/01/01 14:30:02 obache Exp $
+# $NetBSD: Makefile,v 1.41 2009/04/11 23:15:21 sno Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
+PKGREVISION=	1
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
@@ -21,7 +22,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar
 DEPENDS+=	p5-Archive-Zip>=1.14:../../archivers/p5-Archive-Zip
 DEPENDS+=	p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
-DEPENDS+=	p5-Compress-Zlib>=1.35:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
 DEPENDS+=	p5-Convert-UUlib>=1.05:../../converters/p5-Convert-UUlib
 DEPENDS+=	p5-Digest-MD5>=2.22:../../security/p5-Digest-MD5
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 52a3d5ce12e..7a07bca5ba9 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2008/10/19 19:18:45 he Exp $
+# $NetBSD: Makefile,v 1.19 2009/04/11 23:15:21 sno Exp $
 #
 
 DISTNAME=		Crypt-OpenPGP-1.03
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 SVR4_PKGNAME=		p5pgp
 CATEGORIES=		security perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Crypt/}
@@ -14,7 +14,7 @@ COMMENT=		Perl5 module for OpenPGP support
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=		p5-Crypt-Blowfish-[0-9]*:../../security/p5-Crypt-Blowfish
 DEPENDS+=		p5-Crypt-CAST5_PP-[0-9]*:../../security/p5-Crypt-CAST5_PP
 DEPENDS+=		p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES
diff --git a/textproc/p5-Convert-ASCII-Armour/Makefile b/textproc/p5-Convert-ASCII-Armour/Makefile
index d06a8af6fa3..751142be150 100644
--- a/textproc/p5-Convert-ASCII-Armour/Makefile
+++ b/textproc/p5-Convert-ASCII-Armour/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2008/10/19 19:18:47 he Exp $
+# $NetBSD: Makefile,v 1.17 2009/04/11 23:15:21 sno Exp $
 #
 
 DISTNAME=		Convert-ASCII-Armour-1.4
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 SVR4_PKGNAME=		p5cas
 CATEGORIES=		converters perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Convert/}
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress-[0-9]:../../devel/p5-IO-Compress
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Convert/ASCII/Armour/.packlist
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 56d337fb336..12a363e37aa 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/01/11 16:01:29 he Exp $
+# $NetBSD: Makefile,v 1.20 2009/04/11 23:15:21 sno Exp $
 
 DISTNAME=	PDF-API2-0.72.003
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AR/AREIBENS/}
 
@@ -11,7 +12,7 @@ COMMENT=	Perl5 module for next generation api for pdf
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Compress-Zlib>=1.0:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 PERL5_PACKLIST=	auto/PDF/API2/.packlist
 
diff --git a/textproc/p5-Text-PDF/Makefile b/textproc/p5-Text-PDF/Makefile
index 0830a04e52f..520e1466cbb 100644
--- a/textproc/p5-Text-PDF/Makefile
+++ b/textproc/p5-Text-PDF/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/10/19 19:18:56 he Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/11 23:15:21 sno Exp $
 #
 
 DISTNAME=	Text-PDF-0.29a
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/Text-PDF-0.29
 USE_LANGUAGES=	# empty
 
-DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 
 PERL5_PACKLIST=	auto/Text/PDF/.packlist
 
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 0450daf37a2..ff466cf7f24 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2008/10/19 19:19:02 he Exp $
+# $NetBSD: Makefile,v 1.33 2009/04/11 23:15:21 sno Exp $
 #
 
 DISTNAME=	Apache-ASP-2.61
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	p5aas
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-Apache-Filter>=1.019:../../www/p5-Apache-Filter
 DEPENDS+=	p5-Apache-SSI>=2.16:../../www/p5-Apache-SSI
-DEPENDS+=	p5-Compress-Zlib>=1.14:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Devel-Symdump>=2.00:../../devel/p5-Devel-Symdump
 DEPENDS+=	p5-HTML-Clean>=0.8:../../www/p5-HTML-Clean
 DEPENDS+=	p5-HTML-FillInForm>=0.8:../../www/p5-HTML-FillInForm
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index ea82832eecf..b83552fb0ab 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:19:24 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/11 23:15:21 sno Exp $
 #
 
 DISTNAME=		URI-Fetch-0.08
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		p5urf
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=URI/}
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=		p5-Class-ErrorHandler-[0-9]*:../../devel/p5-Class-ErrorHandler
-DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=		p5-Storable-[0-9]*:../../devel/p5-Storable
 DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
 
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index be24bb83746..d9fc3098072 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2009/02/22 15:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/04/11 23:15:21 sno Exp $
 
 DISTNAME=	libwww-perl-5.825
 PKGNAME=	p5-${DISTNAME:S/-perl-/-/}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5lww
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
@@ -13,7 +14,7 @@ COMMENT=	Perl5 library for WWW access
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Compress-Zlib>=1.10:../../devel/p5-Compress-Zlib
+DEPENDS+=	p5-IO-Compress>=2.017:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Crypt-SSLeay>=0:../../security/p5-Crypt-SSLeay
 DEPENDS+=	p5-HTML-Parser>=3.33:../../www/p5-HTML-Parser
 DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL