Update of /cvsroot/fink/fink/perlmod/Fink
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27199
Modified Files:
Bootstrap.pm ChangeLog Checksum.pm Notify.pm Validation.pm
Log Message:
Fix up indention in several *.pm files
Index: Bootstrap.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- Bootstrap.pm 6 Jan 2010 23:47:53 -0000 1.189
+++ Bootstrap.pm 16 Mar 2010 11:09:21 -0000 1.190
@@ -63,7 +63,7 @@
my $distribution = check_host($host, $bootstrap);
my $distribution = check_host($host, $bootstrap, $arch);
my $result = inject_package($package, $packagefiles, $info_script,
$param);
- my ($package_list, $perl_is_supported) = additional_packages();
+ my ($package_list, $perl_is_supported) = additional_packages();
bootstrap();
my $bsbase = get_bsbase();
my $result = check_files();
@@ -131,8 +131,8 @@
my ($distribution, $gcc, $build, $transitional);
# We test for an obsolete version of gcc3.3, and refuse to proceed if
- # it is present.
- #
+ # it is present.
+ #
# (Note: the June 2003 Developer Tools had build 1435, the August 2003
ones
# had build 1493.)
@@ -167,80 +167,80 @@
GCC_MSG
$gcc = "-gcc" . $gcc;
} else {
-## 10.2 users who do not have gcc at all are installing binary only, so they
get
-## to move to 10.2-gcc3.3 also
+ ## 10.2 users who do not have gcc at all are installing binary
only, so they get
+ ## to move to 10.2-gcc3.3 also
$gcc = "-gcc3.3";
}
-## for 10.4 users, we need to decide about the transitional tree
-## 1) on i386 you don't get it
-## 2) on bootstrap, default is to not get it but FINK_NOTRANS overrides
-## 3) if not bootstrapping, leave it the way it was
-
-if ($host =~ /^i386/) {
- $transitional = "";
- } elsif ($bootstrap) {
- if (exists $ENV{'FINK_NOTRANS'} and $ENV{'FINK_NOTRANS'} =~
+/^(1|true|yes)$/i) {
- $transitional = "";
- } elsif (exists $ENV{'FINK_NOTRANS'} and $ENV{'FINK_NOTRANS'} =~
+/^(0|false|no)$/i) {
- $transitional = "-transitional";
- } else {
- $transitional = "";
- }
- } else {
- my $old_distribution = $config->param("Distribution");
- if ($old_distribution =~ /^10.4$/) {
- $transitional = "";
- } else {
- $transitional = "-transitional";
- }
-}
+ ## for 10.4 users, we need to decide about the transitional tree
+ ## 1) on i386 you don't get it
+ ## 2) on bootstrap, default is to not get it but FINK_NOTRANS overrides
+ ## 3) if not bootstrapping, leave it the way it was
-my %transitional_message = (
- "-transitional" => "Using the old 10.4-transitional tree...",
- "" => "" # no need to mention the new one anymore
-);
+ if ($host =~ /^i386/) {
+ $transitional = "";
+ } elsif ($bootstrap) {
+ if (exists $ENV{'FINK_NOTRANS'} and $ENV{'FINK_NOTRANS'} =~
+/^(1|true|yes)$/i) {
+ $transitional = "";
+ } elsif (exists $ENV{'FINK_NOTRANS'} and $ENV{'FINK_NOTRANS'}
=~ +/^(0|false|no)$/i) {
+ $transitional = "-transitional";
+ } else {
+ $transitional = "";
+ }
+ } else {
+ my $old_distribution = $config->param("Distribution");
+ if ($old_distribution =~ /^10.4$/) {
+ $transitional = "";
+ } else {
+ $transitional = "-transitional";
+ }
+ }
-# if we are not using the transitional tree, and gcc-4.0 is present, it
-# must be build 5247 (from XCode 2.2.1)
+ my %transitional_message = (
+ "-transitional" => "Using the old 10.4-transitional tree...",
+ "" => "" # no need to mention the new one anymore
+ );
-if ($transitional eq "") {
- if (-x '/usr/bin/gcc-4.0') {
- foreach(`/usr/bin/gcc-4.0 --version 2>&1`) {
- if (/build (\d+)\)/) {
- $build = $1;
- last;
+ # if we are not using the transitional tree, and gcc-4.0 is present, it
+ # must be build 5247 (from XCode 2.2.1)
+
+ if ($transitional eq "") {
+ if (-x '/usr/bin/gcc-4.0') {
+ foreach(`/usr/bin/gcc-4.0 --version 2>&1`) {
+ if (/build (\d+)\)/) {
+ $build = $1;
+ last;
+ }
}
- }
- ($build >= 5247) or die <<END;
+ ($build >= 5247) or die <<END;
You are attempting to use the new 10.4 tree with an old version (build $build)
of the gcc 4.0 compiler, which is not supported. Please update your XCode to
XCode 2.2.1 or later, and try again.
END
+ }
}
-}
if ($host =~ /^powerpc-apple-darwin1\.[34]/) {
&print_breaking("\nThis system is no longer supported " .
-"for current versions of fink. Please use fink 0.12.1 or earlier.\n");
+ "for current versions of fink. Please use fink 0.12.1
or earlier.\n");
$distribution = "10.1";
} elsif ($host =~ /^powerpc-apple-darwin5\.[0-5]/) {
&print_breaking("\nThis system is no longer supported " .
-"for current versions of fink. Please use fink 0.12.1 or earlier.\n");
+ "for current versions of fink. Please use fink 0.12.1
or earlier.\n");
$distribution = "10.1";
} elsif ($host =~ /^(powerpc|i386)-apple-darwin6\..*/) {
&print_breaking("\nThis system is no longer supported " .
-"for current versions of fink. Please use fink 0.24.7 or earlier.\n");
+ "for current versions of fink. Please use fink 0.24.7
or earlier.\n");
$distribution = "10.2$gcc";
} elsif ($host =~ /^powerpc-apple-darwin7\.[0-9]\.0/) {
&print_breaking("This system no longer supported " .
-"for current versions of fink. Please use fink 0.28.5 or earlier.\n");
+ "for current versions of fink. Please use fink 0.28.5
or earlier.\n");
$distribution = "10.3";
} elsif ($host =~ /^powerpc-apple-darwin7\..*/) {
&print_breaking("This system no longer supported " .
-"for current versions of fink. Please use fink 0.28.5 or earlier.\n");
+ "for current versions of fink. Please use fink 0.28.5
or earlier.\n");
$distribution = "10.3";
} elsif ($host =~ /^i386-apple-darwin7\..*/) {
&print_breaking("Fink is currently not supported on x86 ".
@@ -261,7 +261,7 @@
$distribution = "10.4$transitional";
} elsif ($host =~ /^(powerpc|i386)-apple-darwin9\.[0-8]\.[0-2]/) {
&print_breaking("\nThis version of fink supports bootstrapping
under Mac OS X 10.5, " .
- "as well as upgrading from 10.4. However, DIRECT UPGRADING FROM " .
+ "as well as upgrading from 10.4. However, DIRECT
UPGRADING FROM " .
"10.4-transitional, 10.3 OR EARLIER IS NOT
SUPPORTED.\n\n") unless ($arch eq "x86_64");
$distribution = "10.5";
} elsif ($host =~ /^(powerpc|i386)-apple-darwin9\./) {
@@ -314,10 +314,10 @@
import Fink::Services qw(&read_config);
require Fink::Config;
-### Note to developers: Fink::Config loads Fink::FinkVersion, but it is
-### important not to call Fink::FinkVersion::fink_version or
-### Fink::FinkVersion::get_arch during inject_package, because inject.pl
-### may be running a version of fink in which those values are incorrect.
+ ### Note to developers: Fink::Config loads Fink::FinkVersion, but it is
+ ### important not to call Fink::FinkVersion::fink_version or
+ ### Fink::FinkVersion::get_arch during inject_package, because inject.pl
+ ### may be running a version of fink in which those values are
incorrect.
my $package = shift;
my $packagefiles = shift;
@@ -327,13 +327,13 @@
my $param = shift;
-my ($notlocated, $bpath) = &locate_Fink($param);
+ my ($notlocated, $bpath) = &locate_Fink($param);
if ($notlocated) {
return 1;
}
- ### determine $distribution
+ ### determine $distribution
my $distribution = readlink("$bpath/fink/dists");
# print "DISTRIBUTION $distribution\n";
@@ -938,10 +938,10 @@
# remove the entire line if the condition fails)
if ($_ =~ s/%\{Distribution\}/$distribution/) {
if (s/^(\s*)\((.*?)\)\s*(.*)/$1$3/) {
- # we have a conditional; remove the cond expression,
+ # we have a conditional; remove the cond
expression,
my $cond = $2;
# print "\tfound conditional '$cond'\n";
- # if cond is false, clear entire line
+ # if cond is false, clear entire line
undef $_ unless &eval_conditional($cond,
"modify_description");
}
}
@@ -1004,7 +1004,7 @@
$revisions = \%revision_data;
} else {
$packagerevision = "1";
- $revisions = {"all" => $packagerevision};
+ $revisions = {"all" => $packagerevision};
}
return ($packageversion, $revisions);
}
@@ -1051,12 +1051,12 @@
my $distribution = shift;
-my %selfupdatetrees = (
- "10.3" => "10.3",
- "10.4" => "10.4",
- "10.5" => "10.4",
- "10.6" => "10.4"
- );
+ my %selfupdatetrees = (
+ "10.3" => "10.3",
+ "10.4" => "10.4",
+ "10.5" => "10.4",
+ "10.6" => "10.4"
+ );
return $selfupdatetrees{$distribution};
}
Index: Notify.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Notify.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Notify.pm 6 Jan 2010 23:47:53 -0000 1.24
+++ Notify.pm 16 Mar 2010 11:09:21 -0000 1.25
@@ -29,16 +29,16 @@
use Fink::Services qw(&find_subpackages);
BEGIN {
- use Exporter ();
- our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
- $VERSION = ( qw$Revision$ )[-1];
- @ISA = qw(Exporter);
- @EXPORT = qw();
- %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2!
],
+ use Exporter ();
+ our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+ $VERSION = ( qw$Revision$ )[-1];
+ @ISA = qw(Exporter);
+ @EXPORT = qw();
+ %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2!
],
- # your exported package globals go here,
- # as well as any optionally exported functions
- @EXPORT_OK = qw();
+ # your exported package globals go here,
+ # as well as any optionally exported functions
+ @EXPORT_OK = qw();
}
END { } # module clean-up code here (global destructor)
@@ -210,7 +210,7 @@
);
sub events {
- my @eventlist = @events; # return a copy so caller can't modify original
+ my @eventlist = @events; # return a copy so caller can't modify
original
return wantarray? @eventlist : \...@eventlist;
}
Index: Checksum.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Checksum.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Checksum.pm 6 Jan 2010 23:47:53 -0000 1.16
+++ Checksum.pm 16 Mar 2010 11:09:21 -0000 1.17
@@ -27,16 +27,16 @@
use UNIVERSAL qw(isa);
BEGIN {
- use Exporter ();
- our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
- $VERSION = ( qw$Revision$ )[-1];
- @ISA = qw(Exporter);
- @EXPORT = qw();
- %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2!
],
+ use Exporter ();
+ our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+ $VERSION = ( qw$Revision$ )[-1];
+ @ISA = qw(Exporter);
+ @EXPORT = qw();
+ %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2!
],
- # your exported package globals go here,
- # as well as any optionally exported functions
- @EXPORT_OK = qw();
+ # your exported package globals go here,
+ # as well as any optionally exported functions
+ @EXPORT_OK = qw();
}
END { } # module clean-up code here (global destructor)
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- Validation.pm 27 Feb 2010 22:28:57 -0000 1.321
+++ Validation.pm 16 Mar 2010 11:09:21 -0000 1.322
@@ -433,16 +433,16 @@
}
}
- # make sure have InfoN (N>=4) if use Info4 features
-if ($info_level < 4) {
- # fink-0.26.1 can't even index if unknown %-exp in
ConfigureParams field!
- if (exists $properties->{configureparams}) {
- if ($properties->{configureparams} =~ /\%lib/) {
- print "Error: Use of %lib expansion in
ConfigureParams field requires InfoN level 4 or higher. ($filename)\n";
- return 0;
- }
- }
-}
+ # make sure have InfoN (N>=4) if using Info4 features
+ if ($info_level < 4) {
+ # fink-0.26.1 can't even index if unknown %-exp in
ConfigureParams field!
+ if (exists $properties->{configureparams}) {
+ if ($properties->{configureparams} =~ /\%lib/) {
+ print "Error: Use of %lib expansion in
ConfigureParams field requires InfoN level 4 or higher. ($filename)\n";
+ return 0;
+ }
+ }
+ }
# figure out %-exp map for canonical Type representation
if (defined ($type = $properties->{type})) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -d -r1.1652 -r1.1653
--- ChangeLog 27 Feb 2010 22:27:35 -0000 1.1652
+++ ChangeLog 16 Mar 2010 11:09:21 -0000 1.1653
@@ -1,3 +1,7 @@
+2010-03-16 Max Horn <m...@quendi.de>
+
+ * Fix up indention in several *.pm files
+
2010-02-27 Daniel Macks <dma...@netspace.org>
* PkgVersion.pm: Newline before msg that may be emitted during
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
