kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try my hand at removing the Perl 5.6.1 dependency. This port now builds

Browse source 
and seems to work just fine out-of-the-box on -STABLE with the built-in
Perl 5.00503.
This commit is contained in:
Joe Marcus Clarke 2003-06-18 23:22:10 +00:00
parent 74de3a3e58
commit f70740038e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=83276
20 changed files with 610 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
www/firefox-devel/Makefile
View file

@ -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

55
www/firefox-devel/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox-esr/Makefile
View file

@ -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

55
www/firefox-esr/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox/Makefile
View file

@ -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

55
www/firefox/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox10/Makefile
View file

@ -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

55
www/firefox10/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox15/Makefile
View file

@ -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

55
www/firefox15/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox3-devel/Makefile
View file

@ -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

55
www/firefox3-devel/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox35/Makefile
View file

@ -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

55
www/firefox35/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/firefox36/Makefile
View file

@ -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

55
www/firefox36/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/flock/Makefile
View file

@ -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

55
www/flock/files/patch-config_preprocess.pl Normal file
View file

@ -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 {

12
www/mozilla-firebird/Makefile
View file

@ -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

55
www/mozilla-firebird/files/patch-config_preprocess.pl Normal file
View file

@ -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 {