Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16063
Modified Files:
ChangeLog fink.8.in fink.conf.5.in
Log Message:
document tree options
Index: fink.conf.5.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.conf.5.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- fink.conf.5.in 6 Dec 2005 16:09:15 -0000 1.35
+++ fink.conf.5.in 30 Jan 2006 22:13:48 -0000 1.36
@@ -94,6 +94,9 @@
but this is not necessary in most circumstances. The default trees are
"local/main local/bootstrap stable/main". This list should be kept in sync
with
.Pa @PREFIX@/etc/apt/sources.list.
+.Pp
+The order of trees is meaningful, as packages from later trees may override
+packages from earlier ones.
.It Cm Distribution: Ar 10.3 or 10.4-transitional
Fink needs to know which version of Mac OS X you are running. Mac OS X 10.0
and earlier are not supported, and 10.1 and 10.2 are no longer supported by
this version of fink. This field is set by running the
.Cm @PREFIX@/lib/fink/postinstall.pl
Index: fink.8.in
===================================================================
RCS file: /cvsroot/fink/fink/fink.8.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- fink.8.in 6 Dec 2005 16:09:15 -0000 1.52
+++ fink.8.in 30 Jan 2006 22:13:48 -0000 1.53
@@ -91,7 +91,7 @@
but one can use the
.Cm --logfile
flag to specify an alternate filename.
-.It Cm --no-log-outut
+.It Cm --no-log-output
Don't save a copy of the output during package-building, opposite of the
.Cm --log-output
flag. This is the default.
@@ -114,6 +114,82 @@
.It Cm %r
package revision
.El
+.It Cm -t, --trees=expr
+Consider only packages in trees matching
+.Pa expr .
+.Pp
+The format of
+.Pa expr
+is a comma-delimited list of tree specifications. Trees listed in
+.Pa fink.conf
+are compared against
+.Pa expr .
+Only those which match at
+least one tree specification are considered by fink, in the order of the first
+specifications which they match. If no
+.Cm --trees
+option is used, all trees listed in
+.Pa fink.conf
+are included in order.
+.Pp
+A tree specification
+may contain a slash
+.Pq /
+character, in which case it requires an exact match with a tree. Otherwise, it
+matches against the first path-element of a tree. For example,
+.Cm --trees=unstable/main
+would match only the
+.Cm unstable/main
+tree, while
+.Cm --trees=unstable
+would match both
+.Cm unstable/main
+and
+.Cm unstable/crypto .
+.Pp
+There exist magic tree specifications which can be included in
+.Pa expr :
+.Bl -tag -width flag -offset indent
+.It Cm status
+Includes packages in the dpkg status database.
+.It Cm virtual
+Includes virtual packages which reflect the capabilities of the system.
+.El
+.Pp
+Exclusion (or failure to include) these magic trees is currently only supported
+for operations which do not install or remove packages.
+.It Cm -T, --exclude-trees=expr
+Consider only packages in trees not matching
+.Pa expr .
+.Pp
+The syntax of
+.Pa expr
+is the same as for
+.Cm --trees ,
+including the magic tree specifications. However, matching trees are here
+excluded rather than included. Note that trees matching both
+.Cm --trees
+and
+.Cm --exclude-trees
+are excluded.
+.Pp
+Examples of
+.Cm --trees
+and
+.Cm --exclude-trees :
+.Bl -tag -width flag -offset indent
+.It Cm fink --trees=stable,virtual,status install foo
+Install
+.Cm foo
+as if fink was using the stable tree, even if unstable is enabled in
+.Pa fink.conf .
+.It Cm fink --exclude-trees=local install foo
+Install the version of
+.Cm foo
+in fink, not the locally modified version.
+.It Cm fink --trees=local/main list -i
+List the locally modified packages which are installed.
+.El
.El
.\"
.\"
@@ -234,8 +310,6 @@
Show only packages in the sections matching the regular expression expr.
.It Cm -m expr,--maintainer=expr
Show only packages with the maintainer matching the regular expression expr.
-.It Cm -r expr,--tree=expr
-Show only packages in the trees matching the regular expression expr.
.It Cm -w xyz,--width=xyz
Sets the width of the display you would like the output
formatted for. xyz is either a numeric value or auto.
@@ -255,7 +329,7 @@
list the packages in the kde section.
.It Cm fink list --maintainer=fink-devel
list the packages with no maintainer.
-.It Cm fink list --tree=unstable --maintainer=fink-devel
+.It Cm fink --trees=unstable list --maintainer=fink-devel
list the packages with no maintainer, but only in the unstable tree.
.It Cm fink list Qq "gnome*"
list all packages that start with 'gnome'.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- ChangeLog 22 Jan 2006 00:11:09 -0000 1.391
+++ ChangeLog 30 Jan 2006 22:13:48 -0000 1.392
@@ -1,3 +1,7 @@
+2006-01-30 Dave Vasilevsky <[EMAIL PROTECTED]>
+ * fink.8.in, fink.conf.5.in: Document the new --trees and
--exclude-trees
+ options.
+
2006-01-21 Dave Morrison
* bootstrap.pl: add an optional argument to check_host telling us
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
