Update of /cvsroot/fink/fink
In directory vz-cvs-3.sog:/tmp/cvs-serv28253
Modified Files:
bootstrap setup.sh ChangeLog
Log Message:
prepare for possible future
Index: bootstrap
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- bootstrap 21 Mar 2011 20:42:35 -0000 1.44
+++ bootstrap 28 Apr 2011 13:48:32 -0000 1.45
@@ -532,10 +532,14 @@
my $perlexe = "/usr/bin/perl";
-if ($distribution gt "10.5") {
+if ($distribution eq "10.5") {
$perlexe = "/usr/bin/arch -arch $arch /usr/bin/perl5.10.0";
}
+if ($distribution gt "10.6") {
+ $perlexe = "/usr/bin/arch -arch $arch /usr/bin/perl5.12";
+}
+
if (($arch eq "x86_64") and ($distribution eq "10.5")) {
$perlexe = "$bsbase/bin/perl5.8.8";
}
Index: setup.sh
===================================================================
RCS file: /cvsroot/fink/fink/setup.sh,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- setup.sh 15 Jan 2011 22:32:51 -0000 1.42
+++ setup.sh 28 Apr 2011 13:48:32 -0000 1.43
@@ -42,10 +42,14 @@
fi
fi
-if [ $osMajorVer -gt 9 ]; then
+if [ $osMajorVer -eq 9 ]; then
perlexe="/usr/bin/arch -arch $architecture /usr/bin/perl5.10.0"
fi
+if [ $osMajorVer -gt 10 ]; then
+ perlexe="/usr/bin/arch -arch $architecture /usr/bin/perl5.12"
+fi
+
echo "Creating $fink..."
sed -e "s|@BASEPATH@|$basepath|g" -e "s|@PERLEXE@|$perlexe|g" < fink.in > fink
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -d -r1.537 -r1.538
--- ChangeLog 9 Apr 2011 18:54:15 -0000 1.537
+++ ChangeLog 28 Apr 2011 13:48:32 -0000 1.538
@@ -1,3 +1,7 @@
+2011-04-28 Daniel Macks <dma...@netspace.org>
+
+ * bootstrap, setup: Assuming next version will have next version
+
2011-04-09 Daniel Macks <dma...@netspace.org>
* fink.conf.in: No longer use /crypto subtrees.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
