diff -r 18dcd0ca5b0c -r 12ebd29ad46c components/imagemagick/imagemagick.p5m
--- a/components/imagemagick/imagemagick.p5m	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/imagemagick/imagemagick.p5m	Wed Jun 01 14:24:54 2011 -0700
@@ -57,25 +57,16 @@
 dir path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/filters
 dir path=usr/lib/pkgconfig
 dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man3
+dir path=usr/perl5/$(PERL_VERSION)
+dir path=usr/perl5/$(PERL_VERSION)/man
+dir path=usr/perl5/$(PERL_VERSION)/man/man3
 dir path=usr/perl5/site_perl
-dir path=usr/perl5/site_perl/5.8.4
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/Image variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image \
-    variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick \
-    variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/Image variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image \
-    variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick \
-    variant.arch=sparc
+dir path=usr/perl5/site_perl/$(PERL_VERSION)
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick
 dir path=usr/share
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config
@@ -548,29 +539,14 @@
 file path=usr/lib/pkgconfig/ImageMagick++.pc
 file path=usr/lib/pkgconfig/ImageMagick.pc
 file path=usr/lib/pkgconfig/Wand.pc
-file path=usr/perl5/5.8.4/man/man3/Image::Magick.3
-file path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/Image/Magick.pm \
-    variant.arch=i386
-file \
-    path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick/Magick.bs \
-    variant.arch=i386
-file \
-    path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick/Magick.so \
-    variant.arch=i386
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Image::Magick.3
+file path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
 file \
-    path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick/autosplit.ix \
-    variant.arch=i386
-file path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/Image/Magick.pm \
-    variant.arch=sparc
+    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.bs
 file \
-    path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick/Magick.bs \
-    variant.arch=sparc
+    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
 file \
-    path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick/Magick.so \
-    variant.arch=sparc
-file \
-    path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick/autosplit.ix \
-    variant.arch=sparc
+    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/ChangeLog
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/LICENSE
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/NEWS