diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index ed97893a41d..e0309dc655a 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.18 2007/07/04 19:18:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2007/07/31 15:40:56 simon Exp $
 
 SHARED_ONLY=	Yes
 
-COMMENT=	"generate and manipulate images"
+COMMENT=	generate and manipulate images
 
-DISTNAME=	Imager-0.39
-PKGNAME=	p5-${DISTNAME}p0
-CATEGORIES=	graphics perl5
+DISTNAME=	Imager-0.59
+CATEGORIES=	graphics
+MODULES=	cpan
 
 HOMEPAGE=	http://imager.perl.org/
 
@@ -19,28 +19,23 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		m
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AD/ADDI/} \
-		http://www.eecs.umich.edu/~addi/perl/Imager/
-
 FLAVORS=	libs
 FLAVOR?=
 
 .if ${FLAVOR:L} == "libs"
-LIB_DEPENDS=	t1.3::devel/t1lib \
-		png.2::graphics/png \
-		jpeg.62::graphics/jpeg \
-		tiff.35::graphics/tiff
-CONFIGURE_ENV=	IM_LIBPATH="${LOCALBASE}/lib:${X11BASE}/lib" \
-		IM_INCPATH="${LOCALBASE}/include:${X11BASE}/include"
-PATCH_LIST=	patch-libs
+LIB_DEPENDS=	t1.>=3::devel/t1lib \
+		png.>=2::graphics/png \
+		jpeg.>=62::graphics/jpeg \
+		tiff.>=35::graphics/tiff
+CONFIGURE_ARGS=	--enable jpeg,tiff,png,ungif,T1-fonts,freetype2 \
+		--incpath="${LOCALBASE}/include:${X11BASE}/include" \
+		--libpath="${LOCALBASE}/lib:${X11BASE}/lib"
 USE_X11=	Yes
 .else
 # Don't use the libs although they might be installed.
-PATCH_LIST=	patch-no_libs
+CONFIGURE_ARGS=	--disable jpeg,tiff,png,gif,ungif,T1-fonts,TT-fonts,freetype2,w32
 .endif
 
 USE_GMAKE=	Yes
 
-CONFIGURE_STYLE= perl
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-Imager/distinfo b/graphics/p5-Imager/distinfo
index 8bcd6ad9341..1b2777d682e 100644
--- a/graphics/p5-Imager/distinfo
+++ b/graphics/p5-Imager/distinfo
@@ -1,5 +1,5 @@
-MD5 (Imager-0.39.tar.gz) = RZeRUt65picPZtpbqZWm1A==
-RMD160 (Imager-0.39.tar.gz) = YYuLUWSBF1Cwt8E0LrJXgsYjkKc=
-SHA1 (Imager-0.39.tar.gz) = wrfeqEizOSWYPUH9icVEMa0E8o4=
-SHA256 (Imager-0.39.tar.gz) = sJLrd1TAL2JfNH419+niUuFmIA0/NeH727mjg6ZerYU=
-SIZE (Imager-0.39.tar.gz) = 484560
+MD5 (Imager-0.59.tar.gz) = FgTWMX/2QB/TSVqf0c5NsQ==
+RMD160 (Imager-0.59.tar.gz) = xsvrvPK1AYO8PzLvuevj60Bwc94=
+SHA1 (Imager-0.59.tar.gz) = amgu2pBkZ/LMz96Qly2PwKD3mNk=
+SHA256 (Imager-0.59.tar.gz) = TreJ+iqOnQnlkrzWSCZsR1TsWPOdGxGAlcR8rFBQ2OA=
+SIZE (Imager-0.59.tar.gz) = 849377
diff --git a/graphics/p5-Imager/patches/patch-libs b/graphics/p5-Imager/patches/patch-libs
deleted file mode 100644
index 3623f156481..00000000000
--- a/graphics/p5-Imager/patches/patch-libs
+++ /dev/null
@@ -1,45 +0,0 @@
-$OpenBSD: patch-libs,v 1.1 2001/11/17 08:16:53 pvalchev Exp $
---- Makefile.PL.orig	Tue Oct 30 01:32:44 2001
-+++ Makefile.PL	Sat Nov 17 00:43:43 2001
-@@ -151,9 +151,9 @@ bugs.  Imager can crash or display other
- reading or writing gif images.  Some of the gif tests can even fail
- since they stress some parts of the buggy code.
- 
--Do you want to remove gif support? [Y/n]
-+I am deleting gif support.
- EOFF
--    my $resp = <STDIN>;
-+    my $resp = "y";
-     chomp($resp);
-     if ($resp ne "n") {
-       delete $formats{'gif'};
-@@ -263,7 +263,7 @@ sub pathcheck {
- sub init {
- 
-   @definc{'/usr/include'}=();
--  @incs=(qw(/usr/include/freetype2 /usr/local/include/freetype2 /usr/include /usr/local/include /usr/include/freetype /usr/local/include/freetype), split /:/, $INCPATH );
-+  @incs=(qw(/usr/include/freetype2 /usr/X11R6/include/freetype2 /usr/include /usr/local/include /usr/include/freetype /usr/local/include/freetype), split /:/, $INCPATH );
-   @libs=(split(/ /, $Config{'libpth'}), split(/:/, $LIBPATH) );
-   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
-     push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
-@@ -354,20 +354,6 @@ sub init {
- 				for use in images.}
- 		       };
- 
--  $formats{'TT-fonts'}={
--			order=>'31',
--			def=>'HAVE_LIBTT',
--			inccheck=>sub { $_[0] eq 'freetype.h' },
--			libcheck=>sub { $_[0] eq "libttf$aext" or $_[0] eq "libttf.$lext" },
--			libfiles=>'-lttf',
--			objfiles=>'',
--			docs=>q{
--				Truetype fonts are scalable fonts. They can include 
--				kerning and hinting information and generally yield good
--				visual quality esp on low resultions. The freetype library is
--				used to rasterize for us. The only drawback is that there
--				are alot of badly designed fonts out there.}
--		       };
-   $formats{'w32'} = {
- 		     order=>40,
- 		     def=>'HAVE_WIN32',
diff --git a/graphics/p5-Imager/patches/patch-no_libs b/graphics/p5-Imager/patches/patch-no_libs
deleted file mode 100644
index 57d57821705..00000000000
--- a/graphics/p5-Imager/patches/patch-no_libs
+++ /dev/null
@@ -1,150 +0,0 @@
---- Makefile.PL.orig	Tue Oct 30 01:32:44 2001
-+++ Makefile.PL	Thu Nov 15 23:32:02 2001
-@@ -151,9 +151,9 @@ bugs.  Imager can crash or display other
- reading or writing gif images.  Some of the gif tests can even fail
- since they stress some parts of the buggy code.
- 
--Do you want to remove gif support? [Y/n]
-+I am deleting gif/ungif support.
- EOFF
--    my $resp = <STDIN>;
-+    my $resp = "y";
-     chomp($resp);
-     if ($resp ne "n") {
-       delete $formats{'gif'};
-@@ -263,7 +263,7 @@ sub pathcheck {
- sub init {
- 
-   @definc{'/usr/include'}=();
--  @incs=(qw(/usr/include/freetype2 /usr/local/include/freetype2 /usr/include /usr/local/include /usr/include/freetype /usr/local/include/freetype), split /:/, $INCPATH );
-+  @incs=(qw(/usr/include), split /:/, $INCPATH );
-   @libs=(split(/ /, $Config{'libpth'}), split(/:/, $LIBPATH) );
-   if ($^O =~ /win32/i && $Config{cc} =~ /\bcl\b/i) {
-     push(@incs, split /;/, $ENV{INCLUDE}) if exists $ENV{INCLUDE};
-@@ -274,126 +274,6 @@ sub init {
-     push(@incs, '/usr/include/w32api') if -d '/usr/lib/w32api';
-   }
- 
--  $formats{'jpeg'}={
--		    order=>'21',
--		    def=>'HAVE_LIBJPEG',
--		    inccheck=>sub { $_[0] eq 'jpeglib.h' },
--		    libcheck=>sub { $_[0] eq "libjpeg$aext" or $_ eq "libjpeg.$lext" },
--		    libfiles=>'-ljpeg',
--		    objfiles=>'jpeg.o',
--		    docs=>q{
--			    In order to use jpeg with this module you need to have libjpeg
--			    installed on your computer}
--		   };
--
--  $formats{'tiff'}={
--		    order=>'23',
--		    def=>'HAVE_LIBTIFF',
--		    inccheck=>sub { $_[0] eq 'tiffio.h' },
--		    libcheck=>sub { $_[0] eq "libtiff$aext" or $_ eq "libtiff.$lext" },
--		    libfiles=>'-ltiff',
--		    objfiles=>'tiff.o',
--		    docs=>q{
--			    In order to use tiff with this module you need to have libtiff
--			    installed on your computer}
--		   };
--
--  $formats{'png'}={
--		   order=>'22',
--		   def=>'HAVE_LIBPNG',
--		   inccheck=>sub { $_[0] eq 'png.h' },
--		   libcheck=>sub { $_[0] eq "libpng$aext" or $_[0] eq "libpng.$lext" },
--		   libfiles=>'-lpng -lz',
--		   objfiles=>'png.o',
--		   docs=>q{
--			   Png stands for Portable Network Graphics and is intended as
--			   a replacement for gif on the web. It is patent free and
--			   is recommended by the w3c, you need libpng to use these formats}
--		  };
--
--  $formats{'gif'}={
--		   order=>'20',
--		   def=>'HAVE_LIBGIF',
--		   inccheck=>sub { $_[0] eq 'gif_lib.h' },
--		   libcheck=>sub { $_[0] eq "libgif$aext" or $_[0] eq "libgif.$lext" },
--		   libfiles=>'-lgif',
--		   objfiles=>'gif.o',
--		   docs=>q{
--			   gif is the de facto standard for webgraphics at the moment,
--			   it does have some patent problems. If you have giflib and
--			   are not in violation with the unisys patent you should use
--			   this instead of the 'ungif' option.  Note that they cannot
--			   be in use at the same time}
--		  };
--
--  $formats{'ungif'}={
--		     order=>'21',
--		     def=>'HAVE_LIBGIF',
--		     inccheck=>sub { $_[0] eq 'gif_lib.h' },
--		     libcheck=>sub { $_[0] eq "libungif$aext" or $_[0] eq "libungif.$lext" },
--		     libfiles=>'-lungif',
--		     objfiles=>'gif.o',
--		     docs=>q{
--			     gif is the de facto standard for webgraphics at the moment,
--			     it does have some patent problems. If you have libungif and
--			     want to create images free from LZW patented compression you
--			     should use this option instead of the 'gif' option}
--		    };
--
--  $formats{'T1-fonts'}={
--			order=>'30',
--			def=>'HAVE_LIBT1',
--			inccheck=>sub { $_[0] eq 't1lib.h' },
--			libcheck=>sub { $_[0] eq "libt1$aext" or $_[0] eq "libt1.$lext" },
--			libfiles=>'-lt1',
--			objfiles=>'',
--			docs=>q{
--				postscript t1 fonts are scalable fonts. They can include 
--				ligatures and kerning information and generally yield good
--				visual quality. We depend on libt1 to rasterize the fonts
--				for use in images.}
--		       };
--
--  $formats{'TT-fonts'}={
--			order=>'31',
--			def=>'HAVE_LIBTT',
--			inccheck=>sub { $_[0] eq 'freetype.h' },
--			libcheck=>sub { $_[0] eq "libttf$aext" or $_[0] eq "libttf.$lext" },
--			libfiles=>'-lttf',
--			objfiles=>'',
--			docs=>q{
--				Truetype fonts are scalable fonts. They can include 
--				kerning and hinting information and generally yield good
--				visual quality esp on low resultions. The freetype library is
--				used to rasterize for us. The only drawback is that there
--				are alot of badly designed fonts out there.}
--		       };
--  $formats{'w32'} = {
--		     order=>40,
--		     def=>'HAVE_WIN32',
--		     inccheck=>sub { lc $_[0] eq 'windows.h' },
--		     libcheck=>sub { lc $_[0] eq 'gdi32.lib' 
--				       || lc $_[0] eq 'libgdi32.a' },
--		     libfiles=>$^O eq 'cygwin' ? '-lgdi32' : '',
--		     objfiles=>'win32.o',
--		     docs => <<DOCS
--Uses the Win32 GDI for rendering text.
--
--This currently only works on under normal Win32 and cygwin.
--DOCS
--		    };
--  $formats{'freetype2'} = {
--                           order=>'29',
--                           def=>'HAVE_FT2',
--                           inccheck=>sub { lc $_[0] eq 'ft2build.h' },
--                           libcheck=>sub { $_[0] eq "libfreetype$aext" or $_[0] eq "libfreetype.$lext" },
--                           libfiles=>'-lfreetype',
--                           objfiles=>'freetyp2.o',
--                           docs=><<DOCS
--Freetype 2 supports both Truetype and Type 1 fonts, both of which are
--scalable.
--DOCS
--                          };
-   # Make fix indent
-   for (keys %formats) { $formats{$_}->{docs} =~ s/^\s+/  /mg; }
- }
diff --git a/graphics/p5-Imager/pkg/PLIST b/graphics/p5-Imager/pkg/PLIST
index 22bf7d72a4d..c3c1b4a4a38 100644
--- a/graphics/p5-Imager/pkg/PLIST
+++ b/graphics/p5-Imager/pkg/PLIST
@@ -1,44 +1,134 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/09/15 00:50:10 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2007/07/31 15:40:56 simon Exp $
 ${P5ARCH}/
 ${P5ARCH}/Imager/
 ${P5ARCH}/Imager.pm
+${P5ARCH}/Imager/API.pod
+${P5ARCH}/Imager/APIRef.pod
 @comment ${P5ARCH}/Imager/Color/
 ${P5ARCH}/Imager/Color.pm
 @comment ${P5ARCH}/Imager/Color/Float.pm
+${P5ARCH}/Imager/Color/Table.pm
+${P5ARCH}/Imager/Cookbook.pod
+${P5ARCH}/Imager/CountColor.pm
+${P5ARCH}/Imager/Draw.pod
+${P5ARCH}/Imager/Engines.pod
 ${P5ARCH}/Imager/Expr/
 ${P5ARCH}/Imager/Expr.pm
 ${P5ARCH}/Imager/Expr/Assem.pm
+${P5ARCH}/Imager/ExtUtils.pm
+${P5ARCH}/Imager/File/
+${P5ARCH}/Imager/File/CUR.pm
+${P5ARCH}/Imager/File/ICO.pm
+${P5ARCH}/Imager/Files.pod
 @comment ${P5ARCH}/Imager/Fill.pm
+${P5ARCH}/Imager/Filter/
+${P5ARCH}/Imager/Filter/DynTest.pm
+${P5ARCH}/Imager/Filter/Flines.pm
+${P5ARCH}/Imager/Filter/Mandelbrot.pm
+${P5ARCH}/Imager/Filters.pod
 @comment ${P5ARCH}/Imager/Font/
 ${P5ARCH}/Imager/Font.pm
+${P5ARCH}/Imager/Font/BBox.pm
 @comment ${P5ARCH}/Imager/Font/FreeType2.pm
+${P5ARCH}/Imager/Font/Image.pm
 @comment ${P5ARCH}/Imager/Font/Truetype.pm
 @comment ${P5ARCH}/Imager/Font/Type1.pm
 @comment ${P5ARCH}/Imager/Font/Win32.pm
+${P5ARCH}/Imager/Font/Wrap.pm
 @comment ${P5ARCH}/Imager/Fountain.pm
+${P5ARCH}/Imager/Handy.pod
+${P5ARCH}/Imager/ImageTypes.pod
+${P5ARCH}/Imager/Inline.pod
 @comment ${P5ARCH}/Imager/Matrix2d.pm
 ${P5ARCH}/Imager/Regops.pm
+${P5ARCH}/Imager/Test.pm
 ${P5ARCH}/Imager/Transform.pm
+${P5ARCH}/Imager/Transformations.pod
+${P5ARCH}/Imager/Tutorial.pod
+${P5ARCH}/Imager/include/
+${P5ARCH}/Imager/include/draw.h
+${P5ARCH}/Imager/include/dynaload.h
+${P5ARCH}/Imager/include/ext.h
+${P5ARCH}/Imager/include/feat.h
+${P5ARCH}/Imager/include/imager.h
+${P5ARCH}/Imager/include/imageri.h
+${P5ARCH}/Imager/include/imconfig.h
+${P5ARCH}/Imager/include/imdatatypes.h
+${P5ARCH}/Imager/include/imerror.h
+${P5ARCH}/Imager/include/imexif.h
+${P5ARCH}/Imager/include/imext.h
+${P5ARCH}/Imager/include/imextdef.h
+${P5ARCH}/Imager/include/imexttypes.h
+${P5ARCH}/Imager/include/imio.h
+${P5ARCH}/Imager/include/imperl.h
+${P5ARCH}/Imager/include/imrender.h
+${P5ARCH}/Imager/include/iolayer.h
+${P5ARCH}/Imager/include/iolayert.h
+${P5ARCH}/Imager/include/log.h
+${P5ARCH}/Imager/include/plug.h
+${P5ARCH}/Imager/include/ppport.h
+${P5ARCH}/Imager/include/regmach.h
+${P5ARCH}/Imager/include/rendert.h
+${P5ARCH}/Imager/include/stackmach.h
 ${P5ARCH}/Imager/interface.pod
 ${P5ARCH}/Imager/regmach.pod
+${P5ARCH}/Imager/typemap
 ${P5ARCH}/auto/
 ${P5ARCH}/auto/Imager/
+${P5ARCH}/auto/Imager/CountColor/
+${P5ARCH}/auto/Imager/CountColor/CountColor.bs
+${P5ARCH}/auto/Imager/CountColor/CountColor.so
+${P5ARCH}/auto/Imager/File/
+${P5ARCH}/auto/Imager/File/ICO/
+${P5ARCH}/auto/Imager/File/ICO/ICO.bs
+${P5ARCH}/auto/Imager/File/ICO/ICO.so
+${P5ARCH}/auto/Imager/Filter/
+${P5ARCH}/auto/Imager/Filter/DynTest/
+${P5ARCH}/auto/Imager/Filter/DynTest/DynTest.bs
+${P5ARCH}/auto/Imager/Filter/DynTest/DynTest.so
+${P5ARCH}/auto/Imager/Filter/Flines/
+${P5ARCH}/auto/Imager/Filter/Flines/Flines.bs
+${P5ARCH}/auto/Imager/Filter/Flines/Flines.so
+${P5ARCH}/auto/Imager/Filter/Mandelbrot/
+${P5ARCH}/auto/Imager/Filter/Mandelbrot/Mandelbrot.bs
+${P5ARCH}/auto/Imager/Filter/Mandelbrot/Mandelbrot.so
 ${P5ARCH}/auto/Imager/Imager.bs
 ${P5ARCH}/auto/Imager/Imager.so
 @man man/man3p/Imager.3p
+@man man/man3p/Imager::API.3p
+@man man/man3p/Imager::APIRef.3p
 @man man/man3p/Imager::Color.3p
 @man man/man3p/Imager::Color::Float.3p
+@man man/man3p/Imager::Color::Table.3p
+@man man/man3p/Imager::Cookbook.3p
+@man man/man3p/Imager::CountColor.3p
+@man man/man3p/Imager::Draw.3p
+@man man/man3p/Imager::Engines.3p
 @man man/man3p/Imager::Expr.3p
 @man man/man3p/Imager::Expr::Assem.3p
+@man man/man3p/Imager::ExtUtils.3p
+@man man/man3p/Imager::File::ICO.3p
+@man man/man3p/Imager::Files.3p
 @man man/man3p/Imager::Fill.3p
+@man man/man3p/Imager::Filter::Flines.3p
+@man man/man3p/Imager::Filter::Mandelbrot.3p
+@man man/man3p/Imager::Filters.3p
 @man man/man3p/Imager::Font.3p
+@man man/man3p/Imager::Font::BBox.3p
 @man man/man3p/Imager::Font::FreeType2.3p
 @man man/man3p/Imager::Font::Truetype.3p
 @man man/man3p/Imager::Font::Type1.3p
 @man man/man3p/Imager::Font::Win32.3p
+@man man/man3p/Imager::Font::Wrap.3p
 @man man/man3p/Imager::Fountain.3p
+@man man/man3p/Imager::Handy.3p
+@man man/man3p/Imager::ImageTypes.3p
+@man man/man3p/Imager::Inline.3p
 @man man/man3p/Imager::Matrix2d.3p
 @man man/man3p/Imager::Regops.3p
+@man man/man3p/Imager::Test.3p
 @man man/man3p/Imager::Transform.3p
+@man man/man3p/Imager::Transformations.3p
+@man man/man3p/Imager::Tutorial.3p
 @man man/man3p/Imager::interface.3p
 @man man/man3p/Imager::regmach.3p