Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17727
Modified Files:
Tag: shlibs
ChangeLog bootstrap.pl fink.8.in fink.in postinstall.pl.in
shlibs.default.in
Log Message:
Sync with head
Index: fink.8.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.8.in,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -d -r1.17.2.2 -r1.17.2.3
--- fink.8.in 1 Feb 2005 02:37:18 -0000 1.17.2.2
+++ fink.8.in 9 Feb 2005 01:44:12 -0000 1.17.2.3
@@ -373,6 +373,10 @@
.It Cm show-deps Ar package...
Displays a human-readable list of the compile-time (build) and
run-time (installation) dependencies of the listed package(s).
+.It Cm snapshot
+Creates a file detailing all of your installed packages. You can move
+this file to a new computer, install it with Fink there, and your
+whole Fink environment will be replicated.
.El
.\"
.\"
Index: shlibs.default.in
===================================================================
RCS file: /cvsroot/fink/fink/shlibs.default.in,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- shlibs.default.in 24 Dec 2002 22:02:57 -0000 1.3
+++ shlibs.default.in 9 Feb 2005 01:44:13 -0000 1.3.4.1
@@ -4,11 +4,7 @@
@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)
[EMAIL PROTECTED]@/lib/libform.dylib.5 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libmenu.dylib.5 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libncurses.dylib.5 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libpanel.dylib.5 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libform.5.dylib 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libmenu.5.dylib 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libncurses.5.dylib 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libpanel.5.dylib 6.0.0 ncurses (>= 5.2-8)
[EMAIL PROTECTED]@/lib/libform.5.dylib 5.0.0 libncurses5-shlibs (>=
5.4-20041023-1)
[EMAIL PROTECTED]@/lib/libmenu.5.dylib 5.0.0 libncurses5-shlibs (>=
5.4-20041023-1)
[EMAIL PROTECTED]@/lib/libncurses.5.dylib 5.0.0 libncurses5-shlibs (>=
5.4-20041023-1)
[EMAIL PROTECTED]@/lib/libpanel.5.dylib 5.0.0 libncurses5-shlibs (>=
5.4-20041023-1)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.143.2.16
retrieving revision 1.143.2.17
diff -u -d -r1.143.2.16 -r1.143.2.17
--- ChangeLog 1 Feb 2005 18:01:44 -0000 1.143.2.16
+++ ChangeLog 9 Feb 2005 01:44:12 -0000 1.143.2.17
@@ -1,3 +1,25 @@
+2005-02-08 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * bootstrap.pl, postinstall.pl.in: Adjust prompt*() calls for new
+ named-parameters API.
+
+2005-02-06 Justin F. Hallett <[EMAIL PROTECTED]>
+
+ * shlibs.default.in: Changed to use new libncurses5-shlibs shlibs
+
+2005-02-05 Daniel Macks <[EMAIL PROTECTED]>
+
+ * fink.in: ...which it now does, so reviving it
+
+2005-02-05 Justin F. Hallett <[EMAIL PROTECTED]>
+
+ * fink.in: backing out last change till it's complete and works
+
+2005-02-05 Daniel Macks <[EMAIL PROTECTED]>
+
+ * fink.in: Instead of decomposing and rebuilding cmdline, just
+ save original @ARGV
+
2005-01-31 Benjamin Reed <[EMAIL PROTECTED]>
* install.sh, fink.conf.5.in: add Fink::Notify modules to install
Index: bootstrap.pl
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap.pl,v
retrieving revision 1.41.2.5
retrieving revision 1.41.2.6
diff -u -d -r1.41.2.5 -r1.41.2.6
--- bootstrap.pl 1 Feb 2005 02:37:18 -0000 1.41.2.5
+++ bootstrap.pl 9 Feb 2005 01:44:12 -0000 1.41.2.6
@@ -84,7 +84,7 @@
require Fink::Services;
import Fink::Services qw(&read_config &execute &get_arch);
require Fink::CLI;
-import Fink::CLI qw(&print_breaking &prompt &prompt_boolean
&prompt_selection_new);
+import Fink::CLI qw(&print_breaking &prompt &prompt_boolean &prompt_selection);
import Fink::Bootstrap qw(&get_packageversion &create_tarball
&fink_packagefiles ©_description);
### get version
@@ -129,11 +129,12 @@
"currently running this script as a
normal user, the ".
"method you choose will also be used
immediately for ".
"this script. Avaliable methods:");
- $answer = &prompt_selection_new("Choose a method:",
- [ value => "sudo" ],
- ( "Use sudo" => "sudo",
+ $answer = &prompt_selection("Choose a method:",
+ default => [ value => "sudo" ],
+ choices => [
+ "Use sudo" => "sudo",
"Use su" => "su",
- "None, fink must be run as root" =>
"none" ) );
+ "None, fink must be run as root" =>
"none" ] );
$cmd = "'$homebase/bootstrap.pl' .$answer";
if ($#ARGV >= 0) {
$cmd .= " '".join("' '", @ARGV)."'";
@@ -158,11 +159,12 @@
"privileges. Fink can
automatically try to become ".
"root when it's run from a user
account. ".
"Avaliable methods:");
- $answer = &prompt_selection_new("Choose a method:",
- [ value => "sudo" ],
- ( "Use sudo" => "sudo",
+ $answer = &prompt_selection("Choose a method:",
+ default => [ value => "sudo" ],
+ choices => [
+ "Use sudo" => "sudo",
"Use su" => "su",
- "None, fink must be run as
root" => "none" ) );
+ "None, fink must be run as
root" => "none" ] );
$rootmethod = $answer;
}
}
@@ -242,7 +244,7 @@
print "\n";
$installto =
&prompt("Please choose the path where Fink should be
installed.",
- "/sw");
+ default => "/sw");
}
print "\n";
@@ -280,7 +282,7 @@
"It may conflict with third
party software also ".
"installed there. It will be
more difficult to get ".
"rid of Fink when something
breaks. Are you sure ".
- "you want to install to
/usr/local?", 0);
+ "you want to install to
/usr/local?", default => 0);
if ($answer) {
&print_breaking("You have been warned. Think twice before
reporting ".
"problems as a bug.");
Index: postinstall.pl.in
===================================================================
RCS file: /cvsroot/fink/fink/postinstall.pl.in,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -d -r1.14.2.4 -r1.14.2.5
--- postinstall.pl.in 1 Feb 2005 02:37:20 -0000 1.14.2.4
+++ postinstall.pl.in 9 Feb 2005 01:44:13 -0000 1.14.2.5
@@ -232,7 +232,8 @@
&print_breaking("\nThis fink version introduces new settings stored in the "
.
"fink configuration file \"$configpath\". You should rerun the " .
"configuration process.\n");
- my $answer = &prompt_boolean("Do you want to configure now?", 0, 60);
+ my $answer = &prompt_boolean("Do you want to configure now?", default => 0,
+ timeout => 60);
if ($answer) {
require Fink::Configure;
Fink::Configure::configure();
Index: fink.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.in,v
retrieving revision 1.23.4.6
retrieving revision 1.23.4.7
diff -u -d -r1.23.4.6 -r1.23.4.7
--- fink.in 1 Feb 2005 02:37:19 -0000 1.23.4.6
+++ fink.in 9 Feb 2005 01:44:13 -0000 1.23.4.7
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# -*- mode: Perl; tab-width: 4; -*-
#
# Fink - a package manager that downloads source and installs it
# Copyright (c) 2001 Christoph Pfisterer
@@ -40,41 +41,23 @@
"use_binary" => 0,
"build_as_nobody" => 0,
);
-my $optionsString = '';
+my @orig_ARGV = @ARGV;
Getopt::Long::Configure(qw(bundling ignore_case require_order));
GetOptions(
- 'yes|y' => sub { $options{dontask} = 1 ;
- $optionsString .= '--yes '
- },
- 'quiet|q' => sub { $options{verbosity} = -1 ;
- $optionsString .= '--quiet '
- },
- 'verbose|v' => sub { $options{verbosity} = 4 ;
- $optionsString .= '--verbose '
- },
- 'keep-build-dir|k' => sub { $options{keep_build} = 1 ;
- $optionsString .= '--keep-build-dir '
- },
- 'keep-root-dir|K' => sub { $options{keep_root} = 1 ;
- $optionsString .= '--keep-root-dir '
- },
- 'use-binary-dist|b' => sub { $options{use_binary} = 1 ;
- $optionsString .= '--use-binary-dist '
- },
- 'no-use-binary-dist' => sub { $options{use_binary} = -1 ;
- $optionsString .= '--no-use-binary-dist '
- },
- 'build-as-nobody' => sub { $options{build_as_nobody} = 1 ;
- $optionsString .= '--build-as-nobody '
- },
-# 'interactive|i' => sub { $options{interactive} = 1 ;
-# $optionsString .= '--interactive '
-# },
- 'version|V' => \&show_version,
- 'help|h' => \&show_help
+ 'yes|y' => sub { $options{dontask} = 1 },
+ 'quiet|q' => sub { $options{verbosity} = -1 },
+ 'verbose|v' => sub { $options{verbosity} = 4 },
+ 'keep-build-dir|k' => sub { $options{keep_build} = 1 },
+ 'keep-root-dir|K' => sub { $options{keep_root} = 1 },
+ 'use-binary-dist|b' => sub { $options{use_binary} = 1 },
+ 'no-use-binary-dist' => sub { $options{use_binary} = -1 },
+ 'build-as-nobody' => sub { $options{build_as_nobody} = 1 },
+# 'interactive|i' => sub { $options{interactive} = 1 },
+ 'version|V' => \&show_version,
+ 'help|h' => \&show_help
)
- or die <<UNKNOWN;
+ or die <<UNKNOWN;
fink: unknown option
Type 'fink --help' for more information.
UNKNOWN
@@ -128,6 +111,7 @@
cleanup - removes obsolete package files if newer versions are available
dumpinfo - show how fink parses parts of a package's .info file
show-deps - list run-time and compile-time package dependencies
+ snapshot - create a file detailing all of your installed packages
Options:
-h, --help - display this help text
@@ -197,7 +181,7 @@
### process the command line (or enter interactive mode)
if ($#ARGV >= 0) {
- exit $engine->process($optionsString,@ARGV);
+ exit $engine->process([EMAIL PROTECTED],@ARGV);
} else {
# TODO: enter interactive mode
# die "fink: no command given.\nType 'fink --help' for usage information.\n";
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
