Update of /cvsroot/fink/experimental/thesin/finkmods
In directory sc8-pr-cvs1:/tmp/cvs-serv7532
Modified Files:
fink-mirror-update.patch
Log Message:
Changed to use mirrors module and changed location of some files to avoid the \? cvs
lines
Index: fink-mirror-update.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkmods/fink-mirror-update.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fink-mirror-update.patch 24 Dec 2002 18:30:18 -0000 1.5
+++ fink-mirror-update.patch 30 Dec 2002 06:13:43 -0000 1.6
@@ -1,3 +1,32 @@
+diff -ruN fink/CVS/Entries fink-mirrors/CVS/Entries
+--- fink/CVS/Entries 2002-12-28 20:01:25.000000000 -0700
++++ fink-mirrors/CVS/Entries 2002-12-24 09:43:13.000000000 -0700
+@@ -20,11 +20,11 @@
+ /fink.in/1.18/Thu Nov 21 15:00:53 2002//
+ /install.sh/1.13/Thu Nov 21 15:00:53 2002//
+ /setup.sh/1.9/Thu Nov 21 15:00:54 2002//
++/shlibs.default.in/1.2/Thu Nov 21 15:00:54 2002//
+ /update-fink.sh/1.2/Thu Nov 21 15:00:54 2002//
+ /VERSION/1.25/Mon Dec 9 05:29:55 2002//
+ /fink.info.in/1.5/Mon Dec 23 15:12:42 2002//
+ /inject.pl/1.10/Mon Dec 23 15:12:43 2002//
++/ChangeLog/1.103/Tue Dec 24 16:25:02 2002//
+ /bootstrap.pl/1.25/Tue Dec 24 16:25:03 2002//
+ /postinstall.pl.in/1.5/Tue Dec 24 16:25:03 2002//
+-/ChangeLog/1.104/Wed Dec 25 05:25:29 2002//
+-/shlibs.default.in/1.3/Wed Dec 25 05:25:29 2002//
+diff -ruN fink/ChangeLog fink-mirrors/ChangeLog
+--- fink/ChangeLog 2002-12-24 22:25:29.000000000 -0700
++++ fink-mirrors/ChangeLog 2002-12-24 09:43:13.000000000 -0700
+@@ -2,8 +2,6 @@
+
+ * bootstrap.pl, postinstall.pl.in: Simplify the symlink to point
+ from %p/fink/dists to 10.1 or 10.2 (suggested by Ben Hines)
+-
+- * shlibs.default.in: Update to latest format for Shlibs field
+
+
+ 2002-12-23 Dave Morrison <[EMAIL PROTECTED]>
diff -ruN fink/fink.in fink-mirrors/fink.in
--- fink/fink.in 2002-11-21 08:00:53.000000000 -0700
+++ fink-mirrors/fink.in 2002-12-24 09:43:26.000000000 -0700
@@ -11,7 +40,7 @@
}
diff -ruN fink/perlmod/Fink/FinkVersion.pm.in
fink-mirrors/perlmod/Fink/FinkVersion.pm.in
--- fink/perlmod/Fink/FinkVersion.pm.in 2002-11-21 08:00:54.000000000 -0700
-+++ fink-mirrors/perlmod/Fink/FinkVersion.pm.in 2002-12-24 09:43:26.000000000
-0700
++++ fink-mirrors/perlmod/Fink/FinkVersion.pm.in 2002-12-29 22:40:25.000000000
+-0700
@@ -31,7 +31,8 @@
$VERSION = 1.00;
@ISA = qw(Exporter);
@@ -22,7 +51,7 @@
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ],
}
our @EXPORT_OK;
-@@ -81,6 +82,22 @@
+@@ -81,6 +82,29 @@
return $pv;
}
@@ -31,15 +60,22 @@
+sub mirror_version {
+ my $pv = "0";
+ my ($fn, $v);
-+ foreach $fn (glob("@BASEPATH@/lib/fink/mirror/stamp-*")) {
++ my $dv = &distribution_version();
++ if (-f "@BASEPATH@/lib/fink/MIRROR-VERSION") {
++ chomp($dv = `cat @BASEPATH@/lib/fink/MIRROR-VERSION`);
++ }
++ foreach $fn (glob("@BASEPATH@/lib/fink/stamp-*")) {
+ if ($fn =~ /\/stamp-cvs/) {
-+ return "cvs";
++ if (not $dv =~ m/cvs/i) {
++ $dv .= ".cvs";
++ }
++ return $dv;
+ } elsif ($fn =~ /\/stamp-rel-(.+)$/) {
+ $v = $1;
+ $pv = $v if ($v gt $pv);
+ }
+ }
-+ $pv = &fink_version() if $pv eq "0";
++ $pv = $dv if $pv eq "0";
+ return $pv;
+}
@@ -47,7 +83,7 @@
1;
diff -ruN fink/perlmod/Fink/SelfUpdate.pm fink-mirrors/perlmod/Fink/SelfUpdate.pm
--- fink/perlmod/Fink/SelfUpdate.pm 2002-12-08 22:29:56.000000000 -0700
-+++ fink-mirrors/perlmod/Fink/SelfUpdate.pm 2002-12-24 11:25:27.000000000 -0700
++++ fink-mirrors/perlmod/Fink/SelfUpdate.pm 2002-12-29 22:38:04.000000000 -0700
@@ -28,7 +28,7 @@
use Fink::NetAccess qw(&fetch_url);
use Fink::Engine;
@@ -147,7 +183,7 @@
### if we are in 10.1, need to use "LATEST-FINK" not "CURRENT-FINK"
if ($Fink::Config::distribution =~ /10.1/) {
$currentfink = "LATEST-FINK";
-@@ -140,37 +176,58 @@
+@@ -140,37 +176,60 @@
die "Can't get latest version info\n";
}
@@ -191,8 +227,8 @@
### set up direct cvs
sub setup_direct_cvs {
-- my ($finkdir, $tempdir, $tempfinkdir);
-+ my ($finkdir, $tempdir, $tempfinkdir, $mirrordir, $tempmirrordir);
+ my ($finkdir, $tempdir, $tempfinkdir);
++ my ($mirrordir, $tempmirrordir, $realmirrordir);
my ($username, $cvsuser, @testlist);
my ($use_hardlinks, $cutoff, $cmd);
- my ($cmdd);
@@ -207,17 +243,18 @@
+ # start by creating a temporary directory with the right permissions
+ $finkdir = "$basepath/fink";
-+ $mirrordir = "$basepath/lib/fink/mirror";
++ $mirrordir = "$basepath/lib/fink/mirrors";
++ $realmirrordir = "$basepath/lib/fink/mirror";
+ $tempdir = "$finkdir.tmp";
+ $tempfinkdir = "$tempdir/fink";
-+ $tempmirrordir = "$tempdir/mirror/mirror";
++ $tempmirrordir = "$tempdir/mirrors";
+
print "\n";
+ if (not -d "$finkdir/CVS" && not -d "$mirrordir/CVS") {
$username =
&prompt("Fink has the capability to run the CVS commands as a ".
"normal user. That has some advantages - it uses that ".
-@@ -179,6 +236,19 @@
+@@ -179,6 +238,19 @@
"root. Please specify the user login name that should be ".
"used:",
$username);
@@ -237,7 +274,7 @@
# sanity check
@testlist = getpwnam($username);
-@@ -195,11 +265,6 @@
+@@ -195,11 +267,6 @@
"anonymous");
print "\n";
@@ -249,7 +286,7 @@
if (-d $tempdir) {
if (&execute("rm -rf $tempdir")) {
die "Can't remove left-over temporary directory '$tempdir'\n";
-@@ -244,15 +309,30 @@
+@@ -244,15 +311,30 @@
$cmd = "cvs -z3 -d:ext:$cvsuser\@cvs.sourceforge.net:/cvsroot/fink";
$ENV{CVS_RSH} = "ssh";
}
@@ -261,7 +298,7 @@
- if (&execute($cmdd)) {
- die "Downloading package descriptions from CVS failed.\n";
+ unless (-d "$mirrordir/CVS") {
-+ $cmdd = "$cmd checkout -d mirror fink";
++ $cmdd = "$cmd checkout -d mirrors mirrors";
+ if ($username ne "root") {
+ $cmdd = "su $username -c '$cmdd'";
+ }
@@ -288,65 +325,22 @@
chdir "fink" or die "Can't cd to fink\n";
$cmdd = "$cmd checkout -d 10.1 packages/dists";
if ($username ne "root") {
-@@ -263,54 +343,99 @@
+@@ -263,55 +345,95 @@
die "Downloading package descriptions from CVS failed.\n";
}
chdir $tempdir or die "Can't cd to $tempdir: $!\n";
-+ }
-+ if (not -d $tempfinkdir) {
-+ die "The CVS didn't report an error, but the directory '$tempfinkdir' ".
-+ "doesn't exist as expected. Strange.\n";
-+ }
- }
+- }
- if (not -d $tempfinkdir) {
- die "The CVS didn't report an error, but the directory '$tempfinkdir' ".
- "doesn't exist as expected. Strange.\n";
-+
-+ # merge the old mirrors
-+ unless (-d "$mirrordir/CVS") {
-+ $cutoff = length($mirrordir)+1;
-+ find(sub {
-+ if ($_ eq "CVS") {
-+ $File::Find::prune = 1;
-+ return;
-+ }
-+ return if (length($File::Find::name) <= $cutoff);
-+ $rel = substr($File::Find::name, $cutoff);
-+ if (-l and not -e "$tempmirrordir/$rel") {
-+ $linkto = readlink($_)
-+ or die "Can't read target of symlink $File::Find::name: $!\n";
-+ if (&execute("ln -s '$linkto' '$tempmirrordir/$rel'")) {
-+ die "Can't create symlink \"$tempmirrordir/$rel\"\n";
-+ }
-+ } elsif (-d and not -d "$tempmirrordir/$rel") {
-+ if (&execute("mkdir '$tempmirrordir/$rel'")) {
-+ die "Can't create directory \"$tempmirrordir/$rel\"\n";
-+ }
-+ } elsif (-f and not -f "$tempmirrordir/$rel") {
-+ if ($use_hardlinks) {
-+ $cmd = "ln";
-+ } else {
-+ $cmd = "cp -p"
-+ }
-+ $cmd .= " '$_' '$tempmirrordir/$rel'";
-+ if (&execute($cmd)) {
-+ die "Can't copy file \"$tempmirrordir/$rel\"\n";
-+ }
-+ }
-+ }, $mirrordir);
-+
-+ # switch $tempmirrordir to $mirrordir
-+ chdir $basepath or die "Can't cd to $basepath: $!\n";
-+ if (&execute("mv $mirrordir $mirrordir.old")) {
-+ die "Can't move \"$mirrordir\" out of the way\n";
+ }
-+ if (&execute("mv $tempmirrordir $mirrordir")) {
-+ die "Can't move new tree \"$tempmirrordir\" into place at \"$mirrordir\". ".
-+ "Warning: Your Fink installation is in an inconsistent state now.\n";
++ if (not -d $tempfinkdir) {
++ die "The CVS didn't report an error, but the directory '$tempfinkdir' ".
++ "doesn't exist as expected. Strange.\n";
+ }
}
- # merge the old tree
+- # merge the old tree
- $cutoff = length($finkdir)+1;
- find(sub {
- if ($_ eq "CVS") {
@@ -381,13 +375,50 @@
- }, $finkdir);
-
- # switch $tempfinkdir to $finkdir
-- chdir $basepath or die "Can't cd to $basepath: $!\n";
++ # switch $tempmirrordir to $mirrordir
+ chdir $basepath or die "Can't cd to $basepath: $!\n";
- if (&execute("mv $finkdir $finkdir.old")) {
- die "Can't move \"$finkdir\" out of the way\n";
-- }
++ if (&execute("mv $realmirrordir $realmirrordir.old")) {
++ die "Can't move \"$realmirrordir\" out of the way\n";
+ }
- if (&execute("mv $tempfinkdir $finkdir")) {
- die "Can't move new tree \"$tempfinkdir\" into place at \"$finkdir\". ".
-- "Warning: Your Fink installation is in an inconsistent state now.\n";
++ if (&execute("mv $tempmirrordir $mirrordir")) {
++ die "Can't move new tree \"$tempmirrordir\" into place at \"$mirrordir\". ".
+ "Warning: Your Fink installation is in an inconsistent state now.\n";
+ }
++ if (&execute("ln -s $mirrordir/mirror $realmirrordir")) {
++ die "Can't link \"$realmirrordir\" to \"$mirrordir/mirror\".\n";
++ }
++ if (-d "$realmirrordir/CVS") {
++ if (-f "$mirrordir/../README.mirror") {
++ if (&execute("rm -f $mirrordir/../README.mirror")) {
++ die "Can't remove \"$mirrordir/../README.mirror\".\n";
++ }
++ }
++ if (&execute("ln -s $mirrordir/README $mirrordir/../README.mirror")) {
++ die "Can't link \"$mirrordir/../README.mirror\" to \"$mirrordir/README\".\n";
++ }
++ if (-f "$mirrordir/../MIRROR-VERSION") {
++ if (&execute("rm -f $mirrordir/../MIRROR-VERSION")) {
++ die "Can't remove \"$mirrordir/../MIRROR-VERSION\".\n";
++ }
++ }
++ if (&execute("ln -s $mirrordir/VERSION $mirrordir/../MIRROR-VERSION")) {
++ die "Can't link \"mirrordir/../MIRROR-VERSION\" to \"$mirrordir/VERSION\".\n";
++ }
++ if (-f "$mirrordir/../stamp*") {
++ if (&execute("rm -f $mirrordir/../stamp*")) {
++ die "Can't remove \"$mirrordir/../stamp\*\".\n";
++ }
++ }
++ if (&execute("ln -s $mirrordir/stamp-cvs-live $mirrordir/../stamp-cvs-live")) {
++ die "Can't link \"$mirrordir/../stamp-cvs-live\" to
+\"$mirrordir/stamp-cvs-live\".\n";
++ }
++ }
++
++ # merge the old tree
+ unless (-d "$finkdir/CVS") {
+ $cutoff = length($finkdir)+1;
+ find(sub {
@@ -429,10 +460,11 @@
+ die "Can't move new tree \"$tempfinkdir\" into place at \"$finkdir\". ".
+ "Warning: Your Fink installation is in an inconsistent state now.\n";
+ }
- }
++ }
&execute("rm -rf $tempdir");
-@@ -327,21 +452,27 @@
+ print "\n";
+@@ -327,21 +449,27 @@
### call cvs update
sub do_direct_cvs {
@@ -443,7 +475,7 @@
+ my (@sb, $mirrordir, $finkdir, $cmd, $cmdd, $username, $msg);
- @sb = stat("$descdir/CVS");
-+ $mirrordir = "$basepath/lib/fink/mirror";
++ $mirrordir = "$basepath/lib/fink/mirrors";
+ $finkdir = "$basepath/fink";
$cmd = "cvs -z3 update -d -P";
- $msg = "I will now run the cvs command to retrieve the latest package ".
@@ -469,7 +501,7 @@
}
$msg .= "After that, the core packages will be updated right away; ".
-@@ -350,10 +481,20 @@
+@@ -350,10 +478,20 @@
print "\n";
&print_breaking($msg);
@@ -492,7 +524,7 @@
die "Updating using CVS failed. Check the error messages above.\n";
}
}
-@@ -363,26 +504,37 @@
+@@ -363,26 +501,37 @@
sub do_tarball {
my $newversion = shift;
@@ -541,3 +573,31 @@
}
$pkgtarball = "$dir.tar.gz";
+diff -ruN fink/shlibs.default.in fink-mirrors/shlibs.default.in
+--- fink/shlibs.default.in 2002-12-24 22:25:29.000000000 -0700
++++ fink-mirrors/shlibs.default.in 2002-12-24 09:43:14.000000000 -0700
+@@ -1,14 +1,10 @@
+-@PREFIX@/lib/libapt-inst.1.0.dylib 1.0.0 apt-shlibs (>= 0.5.4-5)
+-@PREFIX@/lib/libapt-pkg.3.2.dylib 3.2.0 apt-shlibs (>= 0.5.4-5)
+-@PREFIX@/lib/libbz2.1.dylib 1.0.1 bzip2 (>= 1.0.2-1)
+-@PREFIX@/lib/libintl.1.dylib 2.0.0 gettext (>= 0.10.40-3)
+-@PREFIX@/lib/libcharset.1.dylib 2.0.0 libiconv (>= 1.7-5)
+-@PREFIX@/lib/libiconv.2.dylib 3.0.0 libiconv (>= 1.7-5)
+-@PREFIX@/lib/libform.dylib.5 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libmenu.dylib.5 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libncurses.dylib.5 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libpanel.dylib.5 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libform.5.dylib 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libmenu.5.dylib 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libncurses.5.dylib 6.0.0 ncurses (>= 5.2-8)
+-@PREFIX@/lib/libpanel.5.dylib 6.0.0 ncurses (>= 5.2-8)
++@PREFIX@/lib/libapt-inst.1.0.dylib apt-shlibs (>= 0.5.4-5)
++@PREFIX@/lib/libapt-pkg.3.2.dylib apt-shlibs (>= 0.5.4-5)
++@PREFIX@/lib/libbz2.1.dylib bzip2 (>= 1.0.2-1)
++@PREFIX@/lib/libintl.1.dylib gettext (>= 0.10.40-3)
++@PREFIX@/lib/libcharset.1.dylib libiconv (>= 1.7-5)
++@PREFIX@/lib/libiconv.2.dylib libiconv (>= 1.7-5)
++@PREFIX@/lib/libform.dylib.5 ncurses (>= 5.2-8)
++@PREFIX@/lib/libmenu.dylib.5 ncurses (>= 5.2-8)
++@PREFIX@/lib/libncurses.dylib.5 ncurses (>= 5.2-8)
++@PREFIX@/lib/libpanel.dylib.5 ncurses (>= 5.2-8)
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
