Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11760

Modified Files:
      Tag: dist-up-branch
        ChangeLog bootstrap.pl fink.8.in fink.conf.5.in 
        postinstall.pl.in 
Log Message:
synced up to dist-up-branch-5 (HEAD)
Ready for testing, phase 1 done. Also fixed selfupdate logic.


Index: bootstrap.pl
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap.pl,v
retrieving revision 1.62.2.1
retrieving revision 1.62.2.2
diff -u -d -r1.62.2.1 -r1.62.2.2
--- bootstrap.pl        27 Apr 2005 16:11:15 -0000      1.62.2.1
+++ bootstrap.pl        28 May 2005 23:28:23 -0000      1.62.2.2
@@ -453,11 +453,14 @@
 print "\n";
 &print_breaking($endmsg);
 print "\n";
-&print_breaking("Run 'source $installto/bin/init.csh ; rehash' to set ".
-                               "up this Terminal's environment to use Fink. To 
make the ".
-                               "software installed by Fink available in all of 
your ".
-                               "shells, add 'source $installto/bin/init.csh' 
to the ".
-                               "init script '.cshrc' in your home directory. 
Enjoy.");
+&print_breaking(
+    "Run '. $installto/bin/init.sh' to set up this terminal session ".
+    "environment to use Fink. To make the software installed by Fink ".
+    "available in all of your future terminal shells, add ".
+    "'. $installto/bin/init.sh' to the init script '.profile' or ".
+    "'.bash_profile' in your home directory. The program ".
+    "$installto/bin/pathsetup.sh can help with this. Enjoy."
+);
 print "\n";
 
 ### eof

Index: fink.conf.5.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.conf.5.in,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -d -r1.24.2.1 -r1.24.2.2
--- fink.conf.5.in      11 May 2005 20:07:09 -0000      1.24.2.1
+++ fink.conf.5.in      28 May 2005 23:28:23 -0000      1.24.2.2
@@ -213,6 +213,16 @@
 access from the fink repository. This has the disadvantage that cvs can not 
switch mirrors, if the server is unavailable you will not be able to update.
 .Nm point
 will download only the latest released version of the packages. It is not 
recommended as your packages may be quite out of date.
+.It Cm SelfUpdateCVSTrees: Ar list of trees
+By default, the CVS selfupdate method will update only the current
+distribution's tree.  This option overrides the list of distribution
+versions that will be updated during a selfupdate.
+.Pp
+Please note that you will need a recent "cvs" binary installed if you
+wish to include directories that do not have CVS/ directories in their
+entire path (e.g.,
+.Nm dists/local/main
+or similar).
 .It Cm UseBinaryDist: Ar boolean
 Causes fink to try to download pre-compiled binary packages from the binary 
 distribution if available and if deb is not already on the system.

Index: postinstall.pl.in
===================================================================
RCS file: /cvsroot/fink/fink/postinstall.pl.in,v
retrieving revision 1.27.4.5
retrieving revision 1.27.4.6
diff -u -d -r1.27.4.5 -r1.27.4.6
--- postinstall.pl.in   28 May 2005 23:06:38 -0000      1.27.4.5
+++ postinstall.pl.in   28 May 2005 23:28:23 -0000      1.27.4.6
@@ -33,8 +33,8 @@
 use Fink::Services qw(&read_config &execute);
 use Fink::CLI qw(&print_breaking &prompt_boolean);
 
-use Fink::Config qw($config &get_option);
-use Fink::Configure qw($conf_file_compat_version);
+use Fink::Config qw($config);
+use Fink::Configure qw($conf_file_compat_version &spotlight_warning);
 
 use File::Find;
 use File::Basename;
@@ -261,6 +261,11 @@
   else {
     print "Please remember to call 'fink configure' later!\n\n";
   }
+} else {
+       # Only ask if not configuring, configure will ask later
+       if (&spotlight_warning()) {
+               $config->save;
+       }
 }
 
 

Index: fink.8.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.8.in,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -u -d -r1.41.2.1 -r1.41.2.2
--- fink.8.in   11 May 2005 20:07:09 -0000      1.41.2.1
+++ fink.8.in   28 May 2005 23:28:23 -0000      1.41.2.2
@@ -21,6 +21,8 @@
 .Pp
 With the help of
 .Xr dpkg 8
+and
+.Xr apt 8
 it maintains a separate directory hierarchy. It
 downloads original source releases, patches them if neccessary, configures
 them for Darwin and compiles and installs them. The information about
@@ -83,8 +85,10 @@
 .\" List of commands
 .Bl -tag -width flag
 .It Cm install Ar package...
-The install command is used to install packages. It downloads, configure,
-builds and installs the packages you name. It will also install required
+The install command is used to install packages. It downloads, configures,
+and builds, or downloads prebuilt (see the
+.Cm Ar --use-binary-dist
+flag) and installs the packages you name. It will also install required
 dependencies automatically, but will ask you for confirmation before it
 does so.
 .Pp
@@ -152,11 +156,17 @@
 .It \ i
 latest version is installed
 .It (i)
-installed, but a newer version is available
+some version is installed, but a newer version is available
 .It \ p
 a virtual package provided by a package that is installed
 .El
 .Pp
+The version column always lists the latest (highest) version known for
+the package, regardless of what version (if any) you have
+installed. To see all versions of a package available on your system
+along with more detailed status information about each, use
+.Cm fink dumpinfo -fallversions
+.Pp
 There are also some flags for the 
 .Cm fink list
 command
@@ -228,7 +238,7 @@
 the available notification plugins.
 .Pp
 .It Cm fetch Ar package...
-Downloads the named packages, but does not install it. This command will
+Downloads the named packages, but does not install them. This command will
 download the tarballs even if they were downloaded before.
 .Pp
 These flags can be used with the 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.323.2.4
retrieving revision 1.323.2.5
diff -u -d -r1.323.2.4 -r1.323.2.5
--- ChangeLog   17 May 2005 18:09:46 -0000      1.323.2.4
+++ ChangeLog   28 May 2005 23:28:23 -0000      1.323.2.5
@@ -1,3 +1,29 @@
+2005-05-25  Dave Vasilevsky  <[EMAIL PROTECTED]>
+
+       * postinstall.pl.in: Also warn about Spotlight in the postinstall.
+
+2005-05-24  Benjamin Reed  <[EMAIL PROTECTED]>
+
+       * fink.conf.5.in: added SelfUpdateCVSTrees doc
+
+2005-05-23  Daniel Macks  <[EMAIL PROTECTED]>
+
+       * bootstrap.pl: Suggest the bash shell setups instead of csh.
+
+2005-05-23  Daniel Macks  <[EMAIL PROTECTED]>
+
+       * fink.in, postinstall.pl.in: Roll back last commit.
+
+2005-05-23  Daniel Macks  <[EMAIL PROTECTED]>
+
+       * fink.in, postinstall.pl.in: Adjust Fink:: importing to match
+       what is used.
+
+2005-05-20  Daniel Macks  <[EMAIL PROTECTED]>
+
+       * fink.8.in: Add notes about prebuilt binaries and version status
+       given by list vs. dumpinfo. Grammar cleanups.
+
 2005-05-16  Matthew Sachs  <[EMAIL PROTECTED]>
 
        * postinstall.pl.in: Use ln -sf instead of ln -s



-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to