20 files changed, 610 insertions, 60 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox-devel/files/patch-config_preprocess.pl b/www/firefox-devel/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox-devel/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox-esr/files/patch-config_preprocess.pl b/www/firefox-esr/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox-esr/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox/files/patch-config_preprocess.pl b/www/firefox/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox10/files/patch-config_preprocess.pl b/www/firefox10/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox10/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox15/files/patch-config_preprocess.pl b/www/firefox15/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox15/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox3-devel/files/patch-config_preprocess.pl b/www/firefox3-devel/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox3-devel/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox35/files/patch-config_preprocess.pl b/www/firefox35/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox35/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/firefox36/files/patch-config_preprocess.pl b/www/firefox36/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/firefox36/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/flock/Makefile b/www/flock/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/flock/files/patch-config_preprocess.pl b/www/flock/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/flock/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index aea22c49a05b..21520ae2d258 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -48,12 +48,12 @@ PLUGINSDIR=		${PREFIX}/lib/browser_plugins
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
-.undef NO_IGNORE
-BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
-BROKEN+=If you have installed a Perl port, and are getting this message,
-BROKEN+=please make sure you have given the command \'use.perl port\'.
-.endif # ${PERL_LEVEL} < 500601
+#.if ${PERL_LEVEL} < 500601
+#.undef NO_IGNORE
+#BROKEN=	Mozilla Firebird only supports the ports versions of Perl.
+#BROKEN+=If you have installed a Perl port, and are getting this message,
+#BROKEN+=please make sure you have given the command \'use.perl port\'.
+#.endif # ${PERL_LEVEL} < 500601
 
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
diff --git a/www/mozilla-firebird/files/patch-config_preprocess.pl b/www/mozilla-firebird/files/patch-config_preprocess.pl
new file mode 100644
index 000000000000..0ae1465f6e3c
--- /dev/null
+++ b/www/mozilla-firebird/files/patch-config_preprocess.pl
@@ -0,0 +1,55 @@
+--- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
++++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+@@ -71,15 +71,39 @@
+ ########################################################################
+ 
+ package main;
+-use File::Spec 0.8;
++use File::Spec;
+ use File::Spec::Unix; # on all platforms, because the #include syntax is unix-based
++use File::Basename;
++use Cwd;
++
++# This code is taken from File::Spec::Unix 0.8.
++sub rel2abs {
++    my ($path, $base) = @_;
++
++    if ( ! File::Spec->file_name_is_absolute( $path ) ) {
++	if ( !defined( $base ) || $base eq '' ) {
++	    $base = cwd() ;
++	}
++	elsif ( ! File::Spec->file_name_is_absolute( $base ) ) {
++	    $base = rel2abs( $base );
++	}
++	else {
++	    $base = File::Spec->canonpath( $base );
++	}
++
++	$path = File::Spec->catdir( $base, $path );
++    }
++
++    return File::Spec->canonpath( $path );
++}
++# End code from File::Spec::Unix
+ 
+ sub include {
+     my($stack, $filename) = @_;
+     if ($filename ne '-') {
+-        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
+-        my($volume, $directory) = File::Spec->splitpath($filename);
+-        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
++        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++	my ($directory) = dirname($filename);
++        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+     }
+     local $stack->{'variables'}->{'FILE'} = $filename;
+     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -372,7 +396,7 @@
+     my $stack = shift;
+     return if $stack->disabled;
+     die "argument expected\n" unless @_;
+-    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
++    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
+ }
+ 
+ sub filter {