diff --git a/lang/perl5.8/Portfile b/lang/perl5.8/Portfile
index 245e7522c5f5e..10fbcba4853db 100644
--- a/lang/perl5.8/Portfile
+++ b/lang/perl5.8/Portfile
@@ -1,9 +1,9 @@
-# $Id: Portfile,v 1.20 2003/03/12 03:03:46 michaelm Exp $
+# $Id: Portfile,v 1.21 2003/04/07 14:05:50 michaelm Exp $
 
 PortSystem 1.0
 name                       perl5.8
 version                    5.8.0
-revision                   2
+revision                   3
 categories                 lang
 maintainers                michaelm@opendarwin.org
 description                Perl 5.8.0
@@ -11,9 +11,9 @@ platforms                  darwin freebsd
 distname                   perl-${version}
 master_sites               http://www.cpan.org/src/5.0/
 checksums                  md5 d9bdb180620306023fd35901a2878b62
+global                     platform_dir
 configure.cmd              sh Configure
 unset                      configure.pre_args
-variant        darwin    { patchfiles     patch-perlio-darwin.diff }
 configure.post_args        -des -Dinstallprefix=${destroot}/${prefix} \
                              -Dprefix='${prefix}' -Dccflags="-I'${prefix}/include'\
                              -I'${prefix}/include/db4' -Dldflags=-L'${prefix}/lib'"
@@ -21,24 +21,20 @@ configure.post_args        -des -Dinstallprefix=${destroot}/${prefix} \
 variant threads            { configure.args-append -Dusethreads }
 
 
-#fix to set install* variables....
+# set install* variables....
 variant freebsd    {
-                     post-install { 
-                        cd ${destroot}/${prefix}/lib/perl5/${version}/freebsd
-                        system "cat Config.pm |sed s#${destroot}/##g  >Config.pm.new"
-                        system "cat .packlist | sed s#${destroot}/##g >.packlist.new"
-                        system  "mv Config.pm.new Config.pm && \
-                                 mv .packlist.new .packlist"
-                                 }
+                    set platform_dir freebsd
+                   }
+variant darwin     {
+                    set platform_dir darwin
+                    patchfiles     patch-perlio-darwin.diff
                    }
-#fix to set install* variables....
-variant darwin    {
-                    post-install { 
-                       cd ${destroot}/${prefix}/lib/perl5/${version}/darwin
-                       system "cat Config.pm |sed s#${destroot}/##g  >Config.pm.new" 
-                       system "cat .packlist | sed s#${destroot}/##g > .packlist.new"
-                       system  "mv Config.pm.new Config.pm && \
-                                mv .packlist.new .packlist"
-                                 }
-                  }
 
+# fix install variables
+post-install { 
+              cd ${destroot}/${prefix}/lib/perl5/${version}/${platform_dir}
+              system "cat Config.pm |sed s#${destroot}/##g  >Config.pm.new"
+              system "cat .packlist | sed s#${destroot}/##g >.packlist.new"
+              system  "mv Config.pm.new Config.pm && \
+              mv .packlist.new .packlist"
+             }