diff --git a/basicnet/netlibs/curl.xml b/basicnet/netlibs/curl.xml index 54a30eb95e..26df38e1e6 100644 --- a/basicnet/netlibs/curl.xml +++ b/basicnet/netlibs/curl.xml @@ -62,7 +62,7 @@ cURL Dependencies Optional - , + or , , , diff --git a/basicnet/netutils/wireshark.xml b/basicnet/netutils/wireshark.xml index 1e6a71ef23..7a8a79d031 100644 --- a/basicnet/netutils/wireshark.xml +++ b/basicnet/netutils/wireshark.xml @@ -86,7 +86,7 @@ (required to capture data) Optional - , + or (to build the GUI front-end), , or , diff --git a/basicnet/textweb/w3m.xml b/basicnet/textweb/w3m.xml index 67396076fb..4447694512 100644 --- a/basicnet/textweb/w3m.xml +++ b/basicnet/textweb/w3m.xml @@ -60,7 +60,7 @@ Optional - , + , , , diff --git a/general.ent b/general.ent index d35322693f..e5fccea846 100644 --- a/general.ent +++ b/general.ent @@ -204,7 +204,6 @@ $Date$ - @@ -214,6 +213,9 @@ $Date$ + diff --git a/general/genlib/dbus-bindings.xml b/general/genlib/dbus-bindings.xml index f68c75550f..301840d8f6 100644 --- a/general/genlib/dbus-bindings.xml +++ b/general/genlib/dbus-bindings.xml @@ -341,8 +341,8 @@ install -v -m644 api/* \ and - Recommended - + User Notes: diff --git a/general/genlib/glib2.xml b/general/genlib/glib2.xml index 631646db94..d96f8d23d6 100644 --- a/general/genlib/glib2.xml +++ b/general/genlib/glib2.xml @@ -58,8 +58,8 @@ GLib Dependencies - Required - + Recommended diff --git a/general/genlib/libidn.xml b/general/genlib/libidn.xml index 5485fd026f..0ab8f32d71 100644 --- a/general/genlib/libidn.xml +++ b/general/genlib/libidn.xml @@ -74,7 +74,7 @@ Optional , - , + , a Java compiler—one of (looked for in this order) (for gcj and you must also have diff --git a/general/genlib/libusb-compat.xml b/general/genlib/libusb-compat.xml index 474d86b0d1..4425bf30de 100644 --- a/general/genlib/libusb-compat.xml +++ b/general/genlib/libusb-compat.xml @@ -59,7 +59,7 @@ libusb-compat Dependencies Required - and + User Notes: diff --git a/general/genutils/graphviz.xml b/general/genutils/graphviz.xml index b5e1c84448..bdeb208f7e 100644 --- a/general/genutils/graphviz.xml +++ b/general/genutils/graphviz.xml @@ -87,7 +87,7 @@ Graphviz Dependencies Optional - , + , , , diff --git a/general/genutils/gtk-doc.xml b/general/genutils/gtk-doc.xml index 1c6e417f4c..7724b9a000 100644 --- a/general/genutils/gtk-doc.xml +++ b/general/genutils/gtk-doc.xml @@ -71,7 +71,7 @@ Optional - , + , , , diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml index b1f5f403ed..2c09b583a0 100644 --- a/general/genutils/imagemagick.xml +++ b/general/genutils/imagemagick.xml @@ -106,7 +106,7 @@ xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;"> url="http://www.imagemagick.org/script/advanced-unix-installation.php"/>. Optional System Utilities - , + or (or any other print utility that provides an lpr command), dcraw, diff --git a/general/graphlib/fontconfig.xml b/general/graphlib/fontconfig.xml index 7a0523e1fb..5e660e92c4 100644 --- a/general/graphlib/fontconfig.xml +++ b/general/graphlib/fontconfig.xml @@ -66,8 +66,8 @@ Required and either - or (requires - ) + or Optional diff --git a/general/graphlib/poppler.xml b/general/graphlib/poppler.xml index 9e2e094dc6..a12cc50e6a 100644 --- a/general/graphlib/poppler.xml +++ b/general/graphlib/poppler.xml @@ -74,7 +74,7 @@ Poppler Dependencies Required - and + Recommended diff --git a/general/prog/guile.xml b/general/prog/guile.xml index 0b5913738e..ef5612c8d1 100644 --- a/general/prog/guile.xml +++ b/general/prog/guile.xml @@ -193,7 +193,7 @@ install -v -m644 doc/tutorial/guile-tut.html/* \ is a Guile script which provides the information necessary to link your programs against the Guile library, in much the same way - does. + PkgConfig does. guile-config diff --git a/general/prog/pdl.xml b/general/prog/pdl.xml index 15d1397f34..0d77a28af8 100644 --- a/general/prog/pdl.xml +++ b/general/prog/pdl.xml @@ -227,7 +227,7 @@ PLplot - , + , , , diff --git a/general/prog/php.xml b/general/prog/php.xml index 4c9d7c7848..f3b397a42c 100644 --- a/general/prog/php.xml +++ b/general/prog/php.xml @@ -80,7 +80,7 @@ , , - , + , (deprecated alternative to ), OSSP mm, diff --git a/general/sysutils/dbus.xml b/general/sysutils/dbus.xml index 04d93ac218..f00acf7e88 100644 --- a/general/sysutils/dbus.xml +++ b/general/sysutils/dbus.xml @@ -65,8 +65,8 @@ D-BUS Dependencies Required - (preferred) or both - and + (preferred) or Optional and diff --git a/general/sysutils/sysutils.xml b/general/sysutils/sysutils.xml index 3afefd503e..588dd4d0f6 100644 --- a/general/sysutils/sysutils.xml +++ b/general/sysutils/sysutils.xml @@ -28,7 +28,7 @@ $Date$ - + diff --git a/gnome/core/gnome-doc-utils.xml b/gnome/core/gnome-doc-utils.xml index 0800f143e4..057f9ce893 100644 --- a/gnome/core/gnome-doc-utils.xml +++ b/gnome/core/gnome-doc-utils.xml @@ -81,7 +81,7 @@ other GNOME packages. Optional - and + User Notes: diff --git a/gnome/core/gnome-icon-theme.xml b/gnome/core/gnome-icon-theme.xml index d691e0358d..73efd962f6 100644 --- a/gnome/core/gnome-icon-theme.xml +++ b/gnome/core/gnome-icon-theme.xml @@ -62,8 +62,8 @@ Optional - and - + User Notes: diff --git a/gnome/otherlibs/gnome-vfs1.xml b/gnome/otherlibs/gnome-vfs1.xml index cf7c73331a..67c87fe6f0 100644 --- a/gnome/otherlibs/gnome-vfs1.xml +++ b/gnome/otherlibs/gnome-vfs1.xml @@ -70,7 +70,7 @@ Optional - , + , , , diff --git a/gnome/otherlibs/libcapplet.xml b/gnome/otherlibs/libcapplet.xml index 24e4e7dba4..f661e01f7e 100644 --- a/gnome/otherlibs/libcapplet.xml +++ b/gnome/otherlibs/libcapplet.xml @@ -59,8 +59,8 @@ Required - Optional - + User Notes: diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index be477f4f6a..b9bc7a626e 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -40,9 +40,14 @@ --> + July 23rd, 2009 + + [randy] - Removed unnecessary references to pkgconfig as it + is now in LFS. + [gdalziel] - Added new package ePDFView-0.1.7. diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml index d9559aff7e..de3fa772c4 100644 --- a/introduction/welcome/credits.xml +++ b/introduction/welcome/credits.xml @@ -260,7 +260,7 @@ libgnomeprintui, libgnomeui, libgsf, libgtkhtml, libgtop, libIDL, libogg, librep, librsvg, libvorbis, libwnck, libxml2, libxslt, LPRng, Linux-PAM, metacity, MIT Kerberos 5, MPlayer, mutt, nautilus, OpenJade, - OpenSP, OpenSSH, ORBit2, pan, Pango, pcre, pkgconfig, postfix, + OpenSP, OpenSSH, ORBit2, pan, Pango, pcre, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common, sgml-dtd, shadow, startup-notification, unzip, vorbis-tools, vte, wget, XFce, xine, xml-dtd, yelp and zip: diff --git a/kde/add/kdemultimedia.xml b/kde/add/kdemultimedia.xml index e3d8d5f24d..ed0ed8b32d 100644 --- a/kde/add/kdemultimedia.xml +++ b/kde/add/kdemultimedia.xml @@ -94,7 +94,7 @@ Akode Dependencies Optional - , + , , , diff --git a/multimedia/libdriv/alsa-plugins.xml b/multimedia/libdriv/alsa-plugins.xml index d995c4e5ef..2490b3f5a5 100644 --- a/multimedia/libdriv/alsa-plugins.xml +++ b/multimedia/libdriv/alsa-plugins.xml @@ -68,7 +68,7 @@ ALSA Plugins Dependencies Required - and + Optional diff --git a/multimedia/libdriv/alsa-tools.xml b/multimedia/libdriv/alsa-tools.xml index 4bcd549867..f02a3c3524 100644 --- a/multimedia/libdriv/alsa-tools.xml +++ b/multimedia/libdriv/alsa-tools.xml @@ -65,7 +65,7 @@ Optional - and + or (to build echomixer, envy24control and rmedigicontrol), diff --git a/multimedia/libdriv/libdv.xml b/multimedia/libdriv/libdv.xml index 921879a4fa..b462f8eac8 100644 --- a/multimedia/libdriv/libdv.xml +++ b/multimedia/libdriv/libdv.xml @@ -59,7 +59,7 @@ Optional , - , + , , and diff --git a/multimedia/libdriv/libquicktime.xml b/multimedia/libdriv/libquicktime.xml index 34eb88a27b..f38bfaa187 100644 --- a/multimedia/libdriv/libquicktime.xml +++ b/multimedia/libdriv/libquicktime.xml @@ -62,7 +62,7 @@ libquicktime Dependencies Optional - , + , , , diff --git a/multimedia/libdriv/libtheora.xml b/multimedia/libdriv/libtheora.xml index 744061d93e..bd73794c4b 100644 --- a/multimedia/libdriv/libtheora.xml +++ b/multimedia/libdriv/libtheora.xml @@ -59,7 +59,7 @@ Recommended - and + Optional diff --git a/multimedia/libdriv/libvorbis.xml b/multimedia/libdriv/libvorbis.xml index 6eb0917ae0..7bf5e8eeac 100644 --- a/multimedia/libdriv/libvorbis.xml +++ b/multimedia/libdriv/libvorbis.xml @@ -62,7 +62,7 @@ Optional - , and + and PassiveTeX (to build the PDF documentation) diff --git a/multimedia/libdriv/xine-lib.xml b/multimedia/libdriv/xine-lib.xml index ede7cf0ba8..f7c88bbce8 100644 --- a/multimedia/libdriv/xine-lib.xml +++ b/multimedia/libdriv/xine-lib.xml @@ -66,8 +66,8 @@ JACK Recommended - and - (with enabled) + + (with enabled) Optional , diff --git a/multimedia/videoutils/avifile.xml b/multimedia/videoutils/avifile.xml index 14bfb01c01..2106ae682c 100644 --- a/multimedia/videoutils/avifile.xml +++ b/multimedia/videoutils/avifile.xml @@ -93,7 +93,7 @@ Optional - , + , , , diff --git a/multimedia/videoutils/transcode.xml b/multimedia/videoutils/transcode.xml index 730f144d6c..abec0c6e06 100644 --- a/multimedia/videoutils/transcode.xml +++ b/multimedia/videoutils/transcode.xml @@ -75,7 +75,7 @@ the Transcode Wiki at . Optional (Listed in the Order That the configure Script Looks for Them) - , + , , , LIRC and diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml index 609c31849a..b49cc11fda 100644 --- a/pst/printing/cups.xml +++ b/pst/printing/cups.xml @@ -72,7 +72,7 @@ and Optional - , + , , or , diff --git a/server/major/apache.xml b/server/major/apache.xml index 5472b9b2d0..194b47e7ce 100644 --- a/server/major/apache.xml +++ b/server/major/apache.xml @@ -77,7 +77,7 @@ Optional (Only if Using the Bundled APR-util) - , + , , and diff --git a/server/major/nfs-utils.xml b/server/major/nfs-utils.xml index 0ac40232ec..bfcc9051c5 100644 --- a/server/major/nfs-utils.xml +++ b/server/major/nfs-utils.xml @@ -75,13 +75,13 @@ Optional for NFSv4 Support - , - libevent, and - libnsfidmap + + libevent and + libnsfidmap Optional for GSS (RPC Security) Support - , + or or libgssapi, and diff --git a/x/installing/x7lib.xml b/x/installing/x7lib.xml index b4eba42f25..aba537ec30 100644 --- a/x/installing/x7lib.xml +++ b/x/installing/x7lib.xml @@ -73,7 +73,7 @@ Required , , - , + , and diff --git a/x/installing/x7util.xml b/x/installing/x7util.xml index 13ca48aaad..5b81b6a887 100644 --- a/x/installing/x7util.xml +++ b/x/installing/x7util.xml @@ -68,7 +68,7 @@ Xorg Utilities Dependencies Required - and + User Notes: diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml index e46a22ab90..663af51e47 100644 --- a/x/lib/cairo.xml +++ b/x/lib/cairo.xml @@ -68,8 +68,8 @@ cairo Dependencies Required - and - + + Recommended