Index: Portfile
===================================================================
--- Portfile	(revision 47914)
+++ Portfile	(working copy)
@@ -13,15 +13,23 @@
                     sha1 b3a66d297459cf9ca6d952af8f87ceb3ad6c54a8 \
                     rmd160 19a69e52d2d7cabd2df47aab976758bd4fd0846b
 
-# Perl searches vendor location last, so this won't
-# override the older version included with perl
-# if we install it in the vendor location
-set perl5.lib   ${prefix}/lib/perl5/${perl5.version}
 
-configure.args  
+# Install into site_perl instead of vendor_perl.
+set perl5.lib ${prefix}/lib/perl5/site_perl/${perl5.version}
+configure.args INSTALLDIRS=site
 
+# Prepend p5- to man pages to avoid conflict with perl modules.
 post-destroot {
-    ui_msg "You must install or activate this package with '-f' (force) as it needs to overwrite files installed by the perl5.8 port"
+    set dir ${prefix}/share/man/man3
+    foreach fl [glob -tails -directory ${destroot}${dir} *] {
+        set nfl  p5-${fl}
+        move ${destroot}${dir}/${fl} ${destroot}${dir}/${nfl}
+        fs-traverse file ${destroot}${perl5.lib} {
+            if {[file tail ${file}] eq ".packlist"} {
+                reinplace "s|${dir}/${fl}|${dir}/${nfl}|" ${file}
+            }
+        }
+    }
 }
 
 universal_variant   no