[lfs-fr] r6494 - in trunk/blfs: general/genlib general/genutils general/graphlib general/prog general/sysutils gnome/applications gnome/platform introduction/welcome kde/core lxde/desktop multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils networking/connect networking/netlibs networking/netprogs networking/netutils postlfs/editors postlfs/filesystems postlfs/security pst/printing pst/typesetting server/databases x/installing x/lib xincludes xsoft/office xsoft/other

myou72 at orange.fr myou72 at orange.fr
Ven 25 Juil 04:34:51 PDT 2014


Author: myou72
Date: 2014-07-25 13:34:51 +0200 (Fri, 25 Jul 2014)
New Revision: 6494

Modified:
   trunk/blfs/general/genlib/lzo.xml
   trunk/blfs/general/genutils/iso-codes.xml
   trunk/blfs/general/graphlib/newt.xml
   trunk/blfs/general/prog/gcc-ada.xml
   trunk/blfs/general/prog/gcc-java.xml
   trunk/blfs/general/prog/gcc.xml
   trunk/blfs/general/prog/git.xml
   trunk/blfs/general/prog/mercurial.xml
   trunk/blfs/general/prog/openjdk.xml
   trunk/blfs/general/prog/php.xml
   trunk/blfs/general/prog/python2.xml
   trunk/blfs/general/prog/scons.xml
   trunk/blfs/general/sysutils/bluez.xml
   trunk/blfs/general/sysutils/dbus.xml
   trunk/blfs/general/sysutils/fcron.xml
   trunk/blfs/general/sysutils/logrotate.xml
   trunk/blfs/gnome/applications/cheese.xml
   trunk/blfs/gnome/applications/gnome-terminal.xml
   trunk/blfs/gnome/applications/network-manager-applet.xml
   trunk/blfs/gnome/platform/vte.xml
   trunk/blfs/introduction/welcome/changelog.xml
   trunk/blfs/kde/core/phonon-backend-gstreamer.xml
   trunk/blfs/kde/core/phonon-backend-vlc.xml
   trunk/blfs/kde/core/phonon.xml
   trunk/blfs/kde/core/polkit-qt.xml
   trunk/blfs/lxde/desktop/libfm.xml
   trunk/blfs/multimedia/cdwriteutils/libisoburn.xml
   trunk/blfs/multimedia/libdriv/x264.xml
   trunk/blfs/multimedia/libdriv/xine-lib.xml
   trunk/blfs/multimedia/libdriv/xvid.xml
   trunk/blfs/multimedia/videoutils/ffmpeg.xml
   trunk/blfs/multimedia/videoutils/mplayer.xml
   trunk/blfs/networking/connect/dhcpcd.xml
   trunk/blfs/networking/netlibs/curl.xml
   trunk/blfs/networking/netlibs/libndp.xml
   trunk/blfs/networking/netlibs/libnl.xml
   trunk/blfs/networking/netprogs/cifsutils.xml
   trunk/blfs/networking/netprogs/rsync.xml
   trunk/blfs/networking/netprogs/samba.xml
   trunk/blfs/networking/netutils/networkmanager.xml
   trunk/blfs/postlfs/editors/nano.xml
   trunk/blfs/postlfs/filesystems/lvm2.xml
   trunk/blfs/postlfs/filesystems/xfsprogs.xml
   trunk/blfs/postlfs/security/gnupg2.xml
   trunk/blfs/postlfs/security/gnutls.xml
   trunk/blfs/postlfs/security/nss.xml
   trunk/blfs/pst/printing/cups.xml
   trunk/blfs/pst/typesetting/texlive.xml
   trunk/blfs/pst/typesetting/tl-installer.xml
   trunk/blfs/server/databases/db.xml
   trunk/blfs/x/installing/libvdpau.xml
   trunk/blfs/x/installing/libxcb.xml
   trunk/blfs/x/installing/mesalib.xml
   trunk/blfs/x/installing/x7lib.xml
   trunk/blfs/x/installing/xorg-server.xml
   trunk/blfs/x/installing/xterm.xml
   trunk/blfs/x/lib/cairo.xml
   trunk/blfs/x/lib/gtk+2.xml
   trunk/blfs/x/lib/pango.xml
   trunk/blfs/x/lib/qt5.xml
   trunk/blfs/x/lib/webkitgtk2.xml
   trunk/blfs/x/lib/xulrunner.xml
   trunk/blfs/xincludes/texprogs.xml
   trunk/blfs/xsoft/office/libreoffice.xml
   trunk/blfs/xsoft/other/fontforge.xml
   trunk/blfs/xsoft/other/gparted.xml
   trunk/blfs/xsoft/other/inkscape.xml
   trunk/blfs/xsoft/other/tigervnc.xml
Log:
synchro screen

Modified: trunk/blfs/general/genlib/lzo.xml
===================================================================
--- trunk/blfs/general/genlib/lzo.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/genlib/lzo.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -55,7 +55,10 @@
     <para>Installez <application>lzo</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                                --enable-shared                              --disable-static                             --docdir=/usr/share/doc/lzo-&lzo-version; &&
+<userinput>./configure --prefix=/usr                    \
+            --enable-shared                  \
+            --disable-static                 \
+            --docdir=/usr/share/doc/lzo-&lzo-version; &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>. Tous les

Modified: trunk/blfs/general/genutils/iso-codes.xml
===================================================================
--- trunk/blfs/general/genutils/iso-codes.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/genutils/iso-codes.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -3,9 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--
-<!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
--->
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
   <!ENTITY iso-codes-md5sum        "390291fa7ef954ca1feb4b3340d26c28">

Modified: trunk/blfs/general/graphlib/newt.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/prog/gcc-ada.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/prog/gcc-java.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/general/prog/gcc.xml
===================================================================
--- trunk/blfs/general/prog/gcc.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/gcc.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -133,12 +133,19 @@
     <command>./configure</command> ci-dessous.</para>
    <para>Installez <application>GCC</application> en lançant les commandes suivantes:</para>
 <screen>
-<userinput>sed -i 's/(install.*:) install-.*recursive/1/' libffi/Makefile.in         &&
-sed -i 's/(install-data-am:).*/1/'             libffi/include/Makefile.in &&
-patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch &&
-mkdir ../gcc-build &&
-cd    ../gcc-build &&
-../gcc-&gcc-version;/configure              --prefix=/usr                   --libdir=/usr/lib               --enable-shared                 --enable-threads=posix          --enable-__cxa_atexit           --enable-clocale=gnu            --disable-multilib              --with-system-zlib              --enable-languages=c,c++,fortran,ada,go,java,objc,obj-c++ &&
+<userinput>patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch    &&
+mkdir ../gcc-build                                   &&
+cd    ../gcc-build                                   &&
+../gcc-&gcc-version;/configure                               \
+    --prefix=/usr                                    \
+    --libdir=/usr/lib                                \
+    --enable-shared                                  \
+    --enable-threads=posix                           \
+    --enable-__cxa_atexit                            \
+    --enable-clocale=gnu                             \
+    --disable-multilib                               \
+    --with-system-zlib                               \
+    --enable-languages=c,c++,fortran,go,objc,obj-c++ &&
 make</userinput>
 </screen>
 <para>Si vous avez installé des paquets supplémentaires comme <application>Valgrind</application> et <application>GDB</application>,
@@ -160,11 +167,10 @@
 <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
-ln -v -sf ../usr/bin/cpp /lib &&
-ln -v -sf gcc /usr/bin/cc     &&
 mkdir -pv /usr/share/gdb/auto-load/usr/lib              &&
 mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib &&
-chown -v -R root:root     /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}     /usr/lib/gcc/*linux-gnu/&gcc-version;/ada{lib,include}</userinput>
+chown -v -R root:root \
+    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput>
 </screen>
     
     <para>Quelques paquets veulent trouver le préprocesseur C dans
@@ -175,10 +181,9 @@
     votre système, tapez en tant qu'utilisateur 
     <systemitem class="username">root</systemitem> :</para>
   
-<screen>
-<userinput>rm -rf /opt/gnat &&
-export PATH=$PATH_HOLD &&
-unset PATH_HOLD</userinput>
+<screen role="root">
+<userinput>ln -v -sf ../usr/bin/cpp /lib &&
+ln -v -sf gcc /usr/bin/cc</userinput>
 </screen>
   
 </sect2>
@@ -261,8 +266,6 @@
      peuvent être trouvé dans
     <ulink url="&lfs-root;/chapter06/gcc.html#contents-gcc"/> depuis qu'ils sont initialement
      installés dans LFS.</para>
-
-
     <segmentedlist>
       <segtitle>Programmes installés</segtitle>
       <segtitle>Bibliothèques installées</segtitle>

Modified: trunk/blfs/general/prog/git.xml
===================================================================
--- trunk/blfs/general/prog/git.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/git.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -101,7 +101,8 @@
     <para>Installez <application>Git</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                     --with-gitconfig=/etc/gitconfig &&
+<userinput>./configure --prefix=/usr         \
+            --with-gitconfig=/etc/gitconfig &&
 make</userinput>
 </screen>
     <para>Si vous avez installé <ulink
@@ -150,9 +151,10 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &&
-tar -xf  ../git-htmldocs-&git-version;.tar.xz     -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
-find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} ;     &&
-find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} ;     &&
+tar -xf  ../git-htmldocs-&git-version;.tar.xz \
+    -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &&
+find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &&
+find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;     &&
 mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &&
 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &&
 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &&

Modified: trunk/blfs/general/prog/mercurial.xml
===================================================================
--- trunk/blfs/general/prog/mercurial.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/mercurial.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -92,13 +92,15 @@
     <para>Le lancement de la suite de tests est facultatif, l'échec de test-patchbomb est causé par
     <application>Python-2.7.x</application> (x > 7). Pour tester les résultats dans le sous-répertoire
     <filename class="directory">tmp</filename>, en blacklistant ce test, tapez:</para>
-<screen><userinput>cat > tests/blacklists/test-failed << "EOF"
+<screen>
+<userinput>cat > tests/blacklists/test-failed << "EOF"
 <literal># Failure with Python-2.7.8
   test-patchbomb.t</literal>
 EOF
 rm -rf tests/tmp &&
 TESTFLAGS="--tmpdir tmp --blacklist blacklists/test-failed" \
-make check</userinput></screen>
+make check</userinput>
+</screen>
     <para>Les tests peuvent être fait en parallèle, ajoutez juste
     <quote>-j$(getconf _NPROCESSORS_ONLN)</quote> à TESTFLAGS.</para>
     <para>Installez <application>Mercurial</application> en lançant la commande

Modified: trunk/blfs/general/prog/openjdk.xml
===================================================================
--- trunk/blfs/general/prog/openjdk.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/openjdk.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -272,13 +272,13 @@
     <application>JDK</application> qui ont été relicencié en une licence open-source.
     Si vous avez téléchargé précédemment pour les composants individuels, mettez tous les composants individuels dans l'arbre des sources avec les commandes suivantes </para>
 <screen>
-<userinput>cp -v ../corba.tar.gz     . &&
-cp -v ../hotspot.tar.gz   . &&
-cp -v ../jaxp.tar.gz      . &&
-cp -v ../jaxws.tar.gz     . &&
-cp -v ../jdk.tar.gz       . &&
-cp -v ../langtools.tar.gz . &&
-cp -v ../openjdk.tar.gz   .</userinput>
+<userinput>cp -v ../corba.tar.bz2     . &&
+cp -v ../hotspot.tar.bz2   . &&
+cp -v ../jaxp.tar.bz2      . &&
+cp -v ../jaxws.tar.bz2     . &&
+cp -v ../jdk.tar.bz2       . &&
+cp -v ../langtools.tar.bz2 . &&
+cp -v ../openjdk.tar.bz2   .</userinput>
 </screen>
  
     <para>Appliquez un correctif pour générer un fichier cacerts valide en utilisant le système de certificats CA:</para>
@@ -306,7 +306,11 @@
 <screen>
 <userinput>unset JAVA_HOME                                               &&
 ./autogen.sh                                                  &&
-./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin                     --with-version-suffix=BLFS                                    --enable-nss                                                  --disable-system-kerberos                                     --with-parallel-jobs=$(getconf _NPROCESSORS_ONLN) &&
+./configure --with-jdk-home=/opt/OpenJDK-&openjdk-version;-bin         \
+            --with-version-suffix=BLFS                        \
+            --enable-nss                                      \
+            --disable-system-kerberos                         \
+            --with-parallel-jobs                              &&
 make</userinput>
 </screen>
     <note><para>Si vous n'avez pas installé l'archive spécifiée précédemment,
@@ -550,31 +554,31 @@
 # Handle common errors
 if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then
     echo "ERROR!  You must provide an x509 certificate store!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then
     echo "ERROR!  You cannot provide two x509 certificate stores!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${KEYTOOL}x" == "x" ; then
     echo "ERROR!  You must provide a valid keytool program!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${OPENSSL}x" == "x" ; then
     echo "ERROR!  You must provide a valid path to openssl!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
 if test "${OUTFILE}x" == "x" ; then
     echo "ERROR!  You must provide a valid output file!"
-    echo "'$(basename ${0}) --help' for more info."
+    echo "\'$(basename ${0}) --help\' for more info."
     echo ""
     exit 1
 fi
@@ -616,7 +620,8 @@
     certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
     certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
     sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
-    echo yes | env LC_ALL=C "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore                    "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
+    echo yes | env LC_ALL=C "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
+                   "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
     rm "${tempfile}"
 done
 if test "${TEMPDIR}x" != "x" ; then
@@ -638,7 +643,8 @@
     Ensuite vous pouvez en créer un nouveau, en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/"  -k "/opt/jdk/bin/keytool"                        -s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
+<userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/"  -k "/opt/jdk/bin/keytool" \
+                       -s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput>
 </screen>
     </sect3> 
   </sect2>

Modified: trunk/blfs/general/prog/php.xml
===================================================================
--- trunk/blfs/general/prog/php.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/php.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -152,7 +152,26 @@
     lançant les commandes suivantes :</para>
 <screen>
 <userinput>sed -i -e 's/2.6.5 2.7/& 3.0/' configure &&
-./configure --prefix=/usr                            --sysconfdir=/etc                        --localstatedir=/var                     --datadir=/usr/share/php                 --mandir=/usr/share/man                  --enable-fpm                             --with-fpm-user=apache                   --with-fpm-group=apache                  --with-config-file-path=/etc             --with-zlib                              --enable-bcmath                          --with-bz2                               --enable-calendar                        --enable-dba=shared                      --with-gdbm                              --with-gmp                               --enable-ftp                             --with-gettext                           --enable-mbstring                        --with-readline              &&
+./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --datadir=/usr/share/php     \
+            --mandir=/usr/share/man      \
+            --enable-fpm                 \
+            --with-fpm-user=apache       \
+            --with-fpm-group=apache      \
+            --with-config-file-path=/etc \
+            --with-zlib                  \
+            --enable-bcmath              \
+            --with-bz2                   \
+            --enable-calendar            \
+            --enable-dba=shared          \
+            --with-gdbm                  \
+            --with-gmp                   \
+            --enable-ftp                 \
+            --with-gettext               \
+            --enable-mbstring            \
+            --with-readline              &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make test</command>.
@@ -165,9 +184,12 @@
 install -v -m644 php.ini-production /etc/php.ini     &&
 mv -v /etc/php-fpm.conf{.default,}                   &&
 install -v -m755 -d /usr/share/doc/php-&php-version; &&
-install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif                     /usr/share/doc/php-&php-version; &&
-ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt                     /usr/share/doc/php-&php-version; &&
-ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs                     /usr/share/doc/php-&php-version;</userinput>
+install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif \
+                    /usr/share/doc/php-&php-version; &&
+ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
+                    /usr/share/doc/php-&php-version; &&
+ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs \
+                    /usr/share/doc/php-&php-version;</userinput>
 </screen>
     <para>La documentation HTML précompilée est emballée sous deux formes :
     un archive tar contenant beaucoup de fichiers individuels, utile pour être
@@ -180,12 +202,14 @@
     tar ci-dessous si nécessaire).</para>
     <para>Pour le fichier <quote>Unique en HTML</quote> :</para>
 <screen role="root">
-<userinput>install -v -m644 ../php_manual_en.html.gz     /usr/share/doc/php-&php-version; &&
+<userinput>install -v -m644 ../php_manual_en.html.gz \
+    /usr/share/doc/php-&php-version; &&
 gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput>
 </screen>
     <para>Pour l'archive tar <quote>beaucoup de fichiers HTML</quote> :</para>
 <screen role="root">
-<userinput>tar -xvf ../php_manual_en.tar.gz     -C /usr/share/doc/php-&php-version; --no-same-owner</userinput>
+<userinput>tar -xvf ../php_manual_en.tar.gz \
+    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">
@@ -268,20 +292,25 @@
       <para>Si désiré, ajoutez l'entrée en utilisant la commande suivante en
       tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>sed -i 's at php/includes"@&ninclude_path = ".:/usr/lib/php"@'     /etc/php.ini</userinput>
+<userinput>sed -i 's at php/includes"@&\ninclude_path = ".:/usr/lib/php"@' \
+    /etc/php.ini</userinput>
 </screen>
       <para>Pour activer le support fastCGI dans un serveur web <application>Apache</application>
       , deux directives de chargement LoadModule doivent être ajoutées dans le fichier
       <filename>httpd.conf</filename>. Elles sont commentées, donc il suffit de taper la commande suivante
       en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>sed -i -e '/proxy_module/s/^#//'             -e '/proxy_fcgi_module/s/^#//'        /etc/httpd/httpd.conf</userinput>
+<userinput>sed -i -e '/proxy_module/s/^#//'      \
+       -e '/proxy_fcgi_module/s/^#//' \
+       /etc/httpd/httpd.conf</userinput>
 </screen>
       <para>Ces modules acceptent différentes directives <command>ProxyPass</command>.
       Une possibilité est (en tant qu'utilisateur
       <systemitem class="username">root</systemitem>):</para>
 <screen role="root">
-<userinput>echo 'ProxyPassMatch ^/(.*.php)$ fcgi://127.0.0.1:9000/srv/www/$1' >> /etc/httpd/httpd.conf</userinput>
+<userinput>echo \
+'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/srv/www/$1' >> \
+/etc/httpd/httpd.conf</userinput>
 </screen>
       <para>En outre, il peut être utile d'ajouter une entrée pour
       <filename>index.php</filename> à la ligne DirectoryIndex du fichier

Modified: trunk/blfs/general/prog/python2.xml
===================================================================
--- trunk/blfs/general/prog/python2.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/python2.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -101,7 +101,11 @@
     <para>Installez <application>Python</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                   --enable-shared                 --with-system-expat             --with-system-ffi               --enable-unicode=ucs4 &&
+<userinput>./configure --prefix=/usr       \
+            --enable-shared     \
+            --with-system-expat \
+            --with-system-ffi   \
+            --enable-unicode=ucs4 &&
 make</userinput>
 </screen>
      <para>
@@ -129,9 +133,10 @@
     </para>
 <screen role="root">
 <userinput>install -v -dm755 /usr/share/doc/python-&python2-version; &&
-tar --strip-components=1 -C /usr/share/doc/python-&python2-version;     --no-same-owner -xvf ../python-&python2-version;-docs-html.tar.bz2      &&
-find /usr/share/doc/python-&python2-version; -type d -exec chmod 0755 {} ; &&
-find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} ;</userinput>
+tar --strip-components=1 -C /usr/share/doc/python-&python2-version; \
+    --no-same-owner -xvf ../python-&python2-version;-docs-html.tar.bz2      &&
+find /usr/share/doc/python-&python2-version; -type d -exec chmod 0755 {} \; &&
+find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/general/prog/scons.xml
===================================================================
--- trunk/blfs/general/prog/scons.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/prog/scons.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -83,7 +83,10 @@
     </para>
  
 <screen role="root">
-<userinput>python setup.py install --prefix=/usr                          --standard-lib                         --optimize=1                           --install-data=/usr/share</userinput>
+<userinput>python setup.py install --prefix=/usr  \
+                        --standard-lib \
+                        --optimize=1   \
+                        --install-data=/usr/share</userinput>
 </screen>
   </sect2>
   

Modified: trunk/blfs/general/sysutils/bluez.xml
===================================================================
--- trunk/blfs/general/sysutils/bluez.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/sysutils/bluez.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -87,14 +87,14 @@
       Actives les options suivantes dans la configuration du noyau et recompilez le noyau si nécessaire:
     </para>
 <screen>
-<literal>[*] Networking support --->
-  <*> or <M> Bluetooth subsystem support --->
-    <*> or <M> RFCOMM protocol support
-    [*] RFCOMM TTY support
-    <*> or <M> BNEP protocol support
-    [*] Multicast filter support
-    [*] Protocol filter support
-    <*> or <M> HIDP protocol support
+<literal>[*] Networking support --->                   [CONFIG_NET]
+  <*> or <M> Bluetooth subsystem support ---> [CONFIG_BT]
+    <*> or <M> RFCOMM protocol support        [CONFIG_BT_RFCOMM]
+    [*] RFCOMM TTY support                    [CONFIG_BT_RFCOMM_TTY]
+    <*> or <M> BNEP protocol support          [CONFIG_BT_BNEP]
+    [*] Multicast filter support              [CONFIG_BT_BNEP_MC_FILTER]
+    [*] Protocol filter support               [CONFIG_BT_BNEP_PROTO_FILTER]
+    <*> or <M> HIDP protocol support          [CONFIG_BT_HIDP]
     Bluetooth device drivers --->
   <*> or <M> RF switch subsystem support</literal>
 </screen>
@@ -119,7 +119,11 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                     --sysconfdir=/etc                 --localstatedir=/var              --enable-library                  --disable-systemd     &&
+<userinput>./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --enable-library      \
+            --disable-systemd     &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/general/sysutils/dbus.xml
===================================================================
--- trunk/blfs/general/sysutils/dbus.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/sysutils/dbus.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -80,7 +80,8 @@
     messages système :</para>
 <screen role="root">
 <userinput>groupadd -g 18 messagebus &&
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus         -u 18 -g messagebus -s /bin/false messagebus</userinput>
+useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
+        -u 18 -g messagebus -s /bin/false messagebus</userinput>
 </screen>
     <para>Installez <application>D-BUS</application> en lançant les commandes
     suivantes (vous pouvez d'abord souhaiter observer la sortie de
@@ -88,8 +89,13 @@
     à la commande <command>configure</command> affichée ci-dessous) :</para>
  
 <screen>
-<userinput>sed -i -e '539 s/exit/kill_bus_and_exit/' tools/dbus-launch.c &&
-./configure --prefix=/usr                              --sysconfdir=/etc                          --localstatedir=/var                       --with-console-auth-dir=/run/console/             --without-systemdsystemunitdir             --disable-systemd                          --disable-static &&
+<userinput>./configure --prefix=/usr                  \
+            --sysconfdir=/etc              \
+            --localstatedir=/var           \
+            --with-console-auth-dir=/run/console/ \
+            --without-systemdsystemunitdir \
+            --disable-systemd              \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>Voir ci-dessous pour les instructions de test.</para>

Modified: trunk/blfs/general/sysutils/fcron.xml
===================================================================
--- trunk/blfs/general/sysutils/fcron.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/general/sysutils/fcron.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -5,7 +5,6 @@
   %general-entities;
   <!ENTITY fcron-download-http "http://fcron.free.fr/archives/fcron-&fcron-version;.src.tar.gz">
   <!ENTITY fcron-download-ftp " ">
-<!--  <!ENTITY fcron-download-ftp "ftp://ftp.seul.org/pub/fcron/fcron-&fcron-version;.src.tar.gz">-->
   <!ENTITY fcron-md5sum "4b031c2fba32a98fa814d1557158b0e9">
   <!ENTITY fcron-size "584 Ko">
   <!ENTITY fcron-buildsize "5.1 Mo">
@@ -95,7 +94,12 @@
     <para>Installez <application>Fcron</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr --sysconfdir=/etc     --localstatedir=/var --without-sendmail --with-boot-install=no &&
+<userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --localstatedir=/var   \
+            --without-sendmail     \
+            --with-boot-install=no \
+            --with-systemdsystemunitdir=no &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -120,7 +124,6 @@
     
     <para><parameter>--with-boot-install=no</parameter> : Ceci
     empêche l'installation du script de démarrage inclu avec le paquet.</para>
-
     <para><parameter>--with-systemdsystemunitdir=no|yes|DIR</parameter>: Utilisez no, si vous utilisez
     sysvint; yes, si vous utilisez systemd, ou spécifiez le répertoire DIR pour les unités
     systemd.</para>
@@ -131,7 +134,6 @@
     Peut être utilisé si vous avez installé <xref linkend="docbook-utils"/>.
     Actuellement , les feuilles de styles dsssl sont dans le répertoire
     <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.</para>
-
     
  </sect2>
   <sect2 role="configuration">

Modified: trunk/blfs/general/sysutils/logrotate.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/gnome/applications/cheese.xml
===================================================================
--- trunk/blfs/gnome/applications/cheese.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/gnome/applications/cheese.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -83,11 +83,9 @@
 <userinput>./configure --prefix=/usr &&
 make</userinput>
 </screen>
-
      <para>
       Ce paquet n'a pas de suite de tests valide.
     </para>
-
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install</userinput>

Modified: trunk/blfs/gnome/applications/gnome-terminal.xml
===================================================================
--- trunk/blfs/gnome/applications/gnome-terminal.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/gnome/applications/gnome-terminal.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -86,7 +86,10 @@
       suivantes :  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                         --disable-static                      --disable-migration                   --disable-search-provider &&
+<userinput>./configure --prefix=/usr             \
+            --disable-static          \
+            --disable-migration       \
+            --disable-search-provider &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/applications/network-manager-applet.xml
===================================================================
--- trunk/blfs/gnome/applications/network-manager-applet.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/gnome/applications/network-manager-applet.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -103,7 +103,10 @@
       Installez <application>NetworkManager Applet</application> en lançant les commandes suivantes :  
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --disable-migration             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-migration \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/gnome/platform/vte.xml
===================================================================
--- trunk/blfs/gnome/platform/vte.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/gnome/platform/vte.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -68,7 +68,10 @@
     <para>Installez <application>VTE</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                      --sysconfdir=/etc                  --disable-static                   --enable-introspection &&
+<userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --disable-static       \
+            --enable-introspection &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez <command>make check</command>.</para>

Modified: trunk/blfs/introduction/welcome/changelog.xml
===================================================================
--- trunk/blfs/introduction/welcome/changelog.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/introduction/welcome/changelog.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -16,7 +16,6 @@
   <para>Version actuelle : &version; – &releasedate;</para>
   <itemizedlist>
     <title>Entrées dans l'historique des changements :</title>
-
    <listitem>
       <para>19 juillet 2014</para>
       <itemizedlist>
@@ -64,7 +63,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>17 juillet 2014</para>
       <itemizedlist>
@@ -95,7 +93,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>15 juillet 2014</para>
       <itemizedlist>
@@ -118,7 +115,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>13 juillet 2014</para>
       <itemizedlist>
@@ -132,7 +128,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>12 juillet 2014</para>
       <itemizedlist>
@@ -180,7 +175,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>9 juillet 2014</para>
       <itemizedlist>
@@ -282,7 +276,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>4 juillet 2014</para>
       <itemizedlist>
@@ -372,7 +365,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>30 juin 2014</para>
       <itemizedlist>
@@ -382,10 +374,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
-
     <listitem>
       <para>29 Juin 2014</para>
       <itemizedlist>
@@ -410,7 +398,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>28 Juin 2014</para>
       <itemizedlist>
@@ -424,7 +411,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>27 Juin 2014</para>
       <itemizedlist>
@@ -449,7 +435,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>26 Juin 2014</para>
       <itemizedlist>
@@ -459,8 +444,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
     <listitem>
       <para>25 Juin 2014</para>
       <itemizedlist>
@@ -478,7 +461,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
     <listitem>
       <para>24 Juin 2014</para>
       <itemizedlist>
@@ -512,7 +494,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
    <listitem>
       <para>23 Juin 2014</para>
       <itemizedlist>
@@ -541,9 +522,6 @@
         </listitem>
       </itemizedlist>
     </listitem>
-
-
-
     <listitem>
       <para>21 Juin 2014</para>
       <itemizedlist>

Modified: trunk/blfs/kde/core/phonon-backend-gstreamer.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/kde/core/phonon-backend-gstreamer.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -70,7 +70,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_INSTALL_LIBDIR=lib               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon-backend-vlc.xml
===================================================================
--- trunk/blfs/kde/core/phonon-backend-vlc.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/kde/core/phonon-backend-vlc.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -63,7 +63,10 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;       -DCMAKE_INSTALL_LIBDIR=lib               -DCMAKE_BUILD_TYPE=Release               -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/phonon.xml
===================================================================
--- trunk/blfs/kde/core/phonon.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/kde/core/phonon.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -79,7 +79,12 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;       -DCMAKE_BUILD_TYPE=Release       -DCMAKE_INSTALL_LIBDIR=lib       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE       -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces       -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
+      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/kde/core/polkit-qt.xml
===================================================================
--- trunk/blfs/kde/core/polkit-qt.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/kde/core/polkit-qt.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -62,7 +62,11 @@
 <screen>
 <userinput>mkdir build &&
 cd    build &&
-CMAKE_PREFIX_PATH=&qt4-dir;       cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release       \
+      -DCMAKE_INSTALL_LIBDIR=lib       \
+      -DUSE_QT4=TRUE                   \
+      -Wno-dev .. &&
 make</userinput>
 </screen>
     <para>
@@ -90,7 +94,6 @@
       <application>Qt4</application> de la bibliothèque est construite même si 
       <application>Qt5</application> est présent.
     </para>
-
   </sect2>
   <sect2 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/lxde/desktop/libfm.xml
===================================================================
--- trunk/blfs/lxde/desktop/libfm.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/lxde/desktop/libfm.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -90,7 +90,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --disable-static &&
+<userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/cdwriteutils/libisoburn.xml
===================================================================
--- trunk/blfs/multimedia/cdwriteutils/libisoburn.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/multimedia/cdwriteutils/libisoburn.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -89,7 +89,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                          --disable-static                       --enable-pkg-check-modules &&
+<userinput>./configure --prefix=/usr              \
+            --disable-static           \
+            --enable-pkg-check-modules &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/x264.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/x264.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/multimedia/libdriv/x264.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -76,7 +76,9 @@
        
     </para>
 <screen>
-<userinput>./configure --prefix=/usr             --enable-shared             --disable-cli &&
+<userinput>./configure --prefix=/usr \
+            --enable-shared \
+            --disable-cli &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/xine-lib.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/multimedia/libdriv/xine-lib.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -99,7 +99,9 @@
     <para>Installez <application>xine Libraries</application> en lançant les
     commandes suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                 --disable-vcd                 --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &&
+<userinput>./configure --prefix=/usr     \
+            --disable-vcd     \
+            --docdir=/usr/share/doc/xine-lib-&xine-lib-version; &&
 make</userinput>
 </screen>
     <para>Pour la création de la documentation de l'API, <application>Doxygen</application>
@@ -123,7 +125,8 @@
         en tant qu'utilisateur <systemitem class="username">root</systemitem> pour l'installer:</para>
 <screen role="root">
 <userinput>install -v -m755 -d /usr/share/doc/xine-lib-&xine-lib-version;/api &&
-install -v -m644    doc/api/*                     /usr/share/doc/xine-lib-&xine-lib-version;/api</userinput>
+install -v -m644    doc/api/* \
+                    /usr/share/doc/xine-lib-&xine-lib-version;/api</userinput>
 </screen>
  
   </sect2>

Modified: trunk/blfs/multimedia/libdriv/xvid.xml
===================================================================
--- trunk/blfs/multimedia/libdriv/xvid.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/multimedia/libdriv/xvid.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -61,6 +61,7 @@
     suivantes :</para>
 <screen>
 <userinput>cd build/generic &&
+sed -i 's/^LN_S=@LN_S@/& -f -v/' platform.inc.in &&
 ./configure --prefix=/usr &&
 make</userinput>
 </screen>
@@ -70,8 +71,6 @@
 <userinput>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile &&
 make install &&
 chmod -v 755 /usr/lib/libxvidcore.so.4.3 &&
-ln -v -sf libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4 &&
-ln -v -sf libxvidcore.so.4   /usr/lib/libxvidcore.so   &&
 install -v -m755 -d /usr/share/doc/xvidcore-&xvid-version;/examples &&
 install -v -m644 ../../doc/* /usr/share/doc/xvidcore-&xvid-version; &&
 install -v -m644 ../../examples/* \
@@ -83,7 +82,6 @@
     <para><command>sed -i 's/^LN_S=@LN_S@/& -f -v/' platform.inc.in</command>:
     Corrige les erreurs pendant <command>make install</command> si on réinstalle ou met à jour.
     </para>
-
     <para><command>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile</command>:
     Cette commande désactive l'installation des biblothèques statiques.</para>
   </sect2>

Modified: trunk/blfs/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/ffmpeg.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/multimedia/videoutils/ffmpeg.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -130,7 +130,22 @@
     
 <screen>
 <userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
-./configure --prefix=/usr                    --enable-gpl                     --enable-version3                --enable-nonfree                 --disable-static                 --enable-shared                  --disable-debug                  --enable-libass                  --enable-libfdk-aac              --enable-libmp3lame              --enable-libopus                 --enable-libtheora               --enable-libvorbis               --enable-libvpx                  --enable-libx264                 --enable-x11grab     &&
+./configure --prefix=/usr        \
+            --enable-gpl         \
+            --enable-version3    \
+            --enable-nonfree     \
+            --disable-static     \
+            --enable-shared      \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
+            --enable-libmp3lame  \
+            --enable-libopus     \
+            --enable-libtheora   \
+            --enable-libvorbis   \
+            --enable-libvpx      \
+            --enable-libx264     \
+            --enable-x11grab     &&
 make &&
 gcc tools/qt-faststart.c -o tools/qt-faststart</userinput>
 </screen>
@@ -149,7 +164,8 @@
 do
     texi2pdf -b $DOCNAME.texi &&
     texi2dvi -b $DOCNAME.texi &&
-    dvips -o    $DOCNAME.ps                   $DOCNAME.dvi
+    dvips -o    $DOCNAME.ps   \
+                $DOCNAME.dvi
 done                          &&
 popd                          &&
 unset DOCNAME</userinput>
@@ -164,7 +180,9 @@
       FFmpeg Automated Testing Environment</ulink>(fate). D'abord, environ 760 Mo de fichiers d'exemple utilisés pour lancer FATE sont 
       sont téléchargés avec la commande :
     </para>
-<screen><userinput>make fate-rsync SAMPLES=fate-suite/</userinput></screen>
+<screen>
+<userinput>make fate-rsync SAMPLES=fate-suite/</userinput>
+</screen>
      <para>
       Le répertoire <filename class="directory">fate-suite</filename> est créé et les fichiers
       téléchargé ici. Cette commande lance maintenant la commande
@@ -178,21 +196,24 @@
       Ensuite, FATE est exécuté, avec les commandes (vous obtenez un nombre de tests
       supérieur ) 1900):
     </para>
-<screen><userinput>make fate SAMPLES=fate-suite/ | tee ../fate.log &&
-grep ^TEST ../fate.log | wc -l</userinput></screen>
-
+<screen>
+<userinput>make fate SAMPLES=fate-suite/ | tee ../fate.log &&
+grep ^TEST ../fate.log | wc -l</userinput>
+</screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make install &&
 install -v -m755    tools/qt-faststart /usr/bin &&
 install -v -m755 -d /usr/share/doc/ffmpeg &&
-install -v -m644    doc/*.txt                     /usr/share/doc/ffmpeg</userinput>
+install -v -m644    doc/*.txt \
+                    /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>
 	Si la documentation HTML est construite, tapez la commande suivante pour l'installer:
     </para>
 <screen role="root">
-<userinput>install -v -m644 doc/*.html                  /usr/share/doc/ffmpeg</userinput>
+<userinput>install -v -m644 doc/*.html \
+                 /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>Si vous avez utilisé <command>doxygen</command> pour créer la 
     documentation de l'API, installez-la (300 Mo d'espace en plus) en
@@ -200,7 +221,8 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api &&
-install -v -m644    doc/doxy/html/*                     /usr/share/doc/ffmpeg/api</userinput>
+install -v -m644    doc/doxy/html/* \
+                    /usr/share/doc/ffmpeg/api</userinput>
 </screen>
    </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/mplayer.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/multimedia/videoutils/mplayer.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -202,9 +202,12 @@
       <para>Installez <application>MPlayer</application> en lançant les commandes
       suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &&
-patch -Np1 -i ../MPlayer-&mplayer-version;-live_fixes-1.patch &&
-sed -i 's:libsmbclient.h:samba-4.0/&:' configure stream/stream_smb.c &&
+<userinput>
+patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &&
+patch -Np1 -i ../MPlayer-&mplayer-version;-live_fixes-1.patch   &&
+sed -i 's:libsmbclient.h:samba-4.0/&:'      configure stream/stream_smb.c &&
+sed -i 's/EGifCloseFile(new_gif/&, NULL/'   libvo/vo_gif89a.c             &&
+sed -i 's/DGifCloseFile(priv->gif/&, NULL/' libmpdemux/demux_gif.c        &&
 ./configure --prefix=/usr            \
             --confdir=/etc/mplayer   \
             --enable-dynamic-plugins \
@@ -263,7 +266,6 @@
 </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>
-
      <para>
       <command>sed -i 's:libsmbclient.h:samba-4.0 ...</command>: Inclus le support pour 
       Samba 4.
@@ -273,8 +275,6 @@
       <command>sed -i 's/DGifCloseFile(priv->gif ...</command>: Corrige la construction pour les
       nouvelles versions de giflib.
     </para>
-
-
     <para><parameter>--enable-gui</parameter> : Cette option construit l'interface graphique
     dans <command>mplayer</command>.</para>
     

Modified: trunk/blfs/networking/connect/dhcpcd.xml
===================================================================
--- trunk/blfs/networking/connect/dhcpcd.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/connect/dhcpcd.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -5,7 +5,7 @@
   %general-entities;
   <!ENTITY dhcpcd-download-http "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
   <!ENTITY dhcpcd-download-ftp  " ">
-  <!--<!ENTITY dhcpcd-download-ftp  "ftp://ftp.osuosl.org/pub/gentoo/distfiles/dhcpcd-&dhcpcd-version;.tar.bz2">-->
+  
   <!ENTITY dhcpcd-md5sum        "3ba26bd6e0cd2f973bfbcd3c08ebc93b">
   <!ENTITY dhcpcd-size          "148 Ko">
   <!ENTITY dhcpcd-buildsize     "2.2 Mo">
@@ -57,7 +57,8 @@
     <para>Installez <application>dhcpcd</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>./configure --libexecdir=/lib/dhcpcd             --dbdir=/var/tmp         &&
+<userinput>./configure --libexecdir=/lib/dhcpcd \
+            --dbdir=/var/tmp         &&
 make</userinput>
 </screen>
     <para>Ce paquet est fourni sans suite de tests.</para>

Modified: trunk/blfs/networking/netlibs/curl.xml
===================================================================
--- trunk/blfs/networking/netlibs/curl.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/netlibs/curl.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -79,7 +79,9 @@
     <para>Installez <application>cURL</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                          --disable-static                       --enable-threaded-resolver &&
+<userinput>./configure --prefix=/usr              \
+            --disable-static           \
+            --enable-threaded-resolver &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez : 
@@ -88,11 +90,13 @@
 mettez les dans le fichier approprié et lancez les tests de nouveau:
    </para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
-<screen role="root">
-<userinput>make install &&
-find docs ( -name "Makefile*" -o -name "*.1" -o -name "*.3" ) -exec rm {} ; &&
-install -v -d -m755 /usr/share/doc/curl-&curl-version; &&
-cp -v -R docs/*     /usr/share/doc/curl-&curl-version;</userinput>
+<screen>
+<userinput>cat >> tests/data/DISABLED << "EOF"
+<literal>numb1
+...
+numbN
+...</literal>
+EOF</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/networking/netlibs/libndp.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/networking/netlibs/libnl.xml
===================================================================
--- trunk/blfs/networking/netlibs/libnl.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/netlibs/libnl.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -88,7 +88,9 @@
     <para>Installez <application>libnl</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                 --sysconfdir=/etc             --disable-static &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  &&
 make</userinput>
 </screen>
     <para>Pour tester le résultat, tapez : <command>make check</command>.</para>
@@ -100,9 +102,11 @@
       Si vous souhaitez installer la documentation de l'API, en tant qu'utilisateur
       <systemitem class="username">root</systemitem> :
     </para>
-<screen role="root"><userinput>mkdir -vp /usr/share/doc/libnl-&libnl-version; &&
-tar -xf --strip-components=1 --no-same-owner \
-        ../libnl-doc-&libnl-version;.tar.gz -C /usr/share/doc/libnl-&libnl-version;</userinput></screen>
+<screen role="root">
+<userinput>mkdir -vp /usr/share/doc/libnl-&libnl-version; &&
+tar -xf ../libnl-doc-&libnl-version;.tar.gz --strip-components=1 --no-same-owner \
+        -C /usr/share/doc/libnl-&libnl-version;</userinput>
+</screen>
   </sect2>
   <sect2 role="commands">
     <title>Explications des commandes</title>

Modified: trunk/blfs/networking/netprogs/cifsutils.xml
===================================================================
--- trunk/blfs/networking/netprogs/cifsutils.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/netprogs/cifsutils.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -81,7 +81,9 @@
     <para>Installez <application>cifs-utils</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr &&
+<userinput>./configure --prefix=/usr \
+            --disable-pam \
+            --disable-systemd &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -90,7 +92,6 @@
 <userinput>make install</userinput>
 </screen>
   </sect2>
-
   <sect2 role="commands">
       <title>Explications des commandes</title>
           <para><parameter>--disable-pam</parameter>: Pour ne pas construire le support PAM.
@@ -103,9 +104,6 @@
           <para><option>--with-pamdir=/lib/security</option>: Installe le module PAM dans
             <filename class="directory">/lib/security</filename>.</para>
   </sect2>
-
-
-
   <sect2 role="content">
     <title>Contenu</title>
     <segmentedlist>

Modified: trunk/blfs/networking/netprogs/rsync.xml
===================================================================
--- trunk/blfs/networking/netprogs/rsync.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/netprogs/rsync.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -66,7 +66,8 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>groupadd -g 48 rsyncd &&
-useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd     -s /bin/false -u 48 rsyncd</userinput>
+useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd \
+    -s /bin/false -u 48 rsyncd</userinput>
 </screen>
     <para>Installez <application>rsync</application> en lançant les commandes
     suivantes :</para>

Modified: trunk/blfs/networking/netprogs/samba.xml
===================================================================
--- trunk/blfs/networking/netprogs/samba.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/netprogs/samba.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -97,7 +97,15 @@
 	suivantes :</para>
       
 <screen>
-<userinput>./configure                                 --prefix=/usr                           --sysconfdir=/etc                       --localstatedir=/var                    --with-piddir=/run/samba                --with-pammodulesdir=/lib/security      --without-systemd                       --enable-fhs                            --enable-nss-wrapper                &&
+<userinput>./configure                             \
+    --prefix=/usr                       \
+    --sysconfdir=/etc                   \
+    --localstatedir=/var                \
+    --with-piddir=/run/samba            \
+    --with-pammodulesdir=/lib/security  \
+    --without-systemd                   \
+    --enable-fhs                        \
+    --enable-nss-wrapper                &&
 make</userinput>
 </screen>
     <para>Selon les développeurs de <application>Samba</application>, la limitation 
@@ -111,7 +119,7 @@
     Par exemple, <quote><replaceable>samba3.raw.eas</replaceable></quote> peut être désactivé
     avec la commande suivante:</para>
 <screen>
-<userinput>sed -i "/samba3.blackbox.failure.failure/i ^samba3.raw.eas" selftest/knownfail</userinput>
+<userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput>
 </screen>
       <para>Pour tester les résultats,en tant qu'utilisateur    <systemitem class="username">root</systemitem>
 	lancez : <command>make quicktest</command>. Il y a d'autres cibles (test, subunit-test) de disponible
@@ -125,13 +133,17 @@
 ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so    &&
 install -v -m644    examples/smb.conf.default /etc/samba &&
 mkdir -pv /etc/openldap/schema                        &&
-install -v -m644    examples/LDAP/README                                  /etc/openldap/schema/README.LDAP  &&
+install -v -m644    examples/LDAP/README              \
+                    /etc/openldap/schema/README.LDAP  &&
                     
-install -v -m644    examples/LDAP/samba*                                  /etc/openldap/schema              &&
+install -v -m644    examples/LDAP/samba*              \
+                    /etc/openldap/schema              &&
                     
-install -v -m755    examples/LDAP/{get*,ol*}                     /etc/openldap/schema              &&
+install -v -m755    examples/LDAP/{get*,ol*} \
+                    /etc/openldap/schema              &&
 install -v -m755 -d /usr/share/doc/samba-&samba-version; &&
-install -v -m644    lib/ntdb/doc/design.pdf                     /usr/share/doc/samba-&samba-version;</userinput>
+install -v -m644    lib/ntdb/doc/design.pdf \
+                    /usr/share/doc/samba-&samba-version;</userinput>
 </screen>
       
       </sect2>
@@ -366,7 +378,8 @@
 		
 <screen role="root">
 <userinput>groupadd -g 99 nogroup &&
-useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup     -s /bin/false -u 99 nobody</userinput>
+useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
+    -s /bin/false -u 99 nobody</userinput>
 </screen>
 		<para>Installez le script <filename>samba</filename> avec
 		  la commande suivante effectuée en tant qu'utilisateur 
@@ -413,7 +426,6 @@
         winbind_krb5_locator.so; the pam_winbind.so et pam_smbpass.so bibliothèque PAM
         libraries; and assorted character set, filesystem and support module
         s under /usr/lib/{python&python2-majorver;,samba}</seg>
-
         <seg>/etc/samba, /run/samba, /usr/include/samba-4.0,
         /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/Samba{3,4},
         /usr/lib/python&python2-majorver;/site-packages/samba, /usr/lib/samba,

Modified: trunk/blfs/networking/netutils/networkmanager.xml
===================================================================
--- trunk/blfs/networking/netutils/networkmanager.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/networking/netutils/networkmanager.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -97,7 +97,12 @@
 Installez <application>NetworkManager</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                    --sysconfdir=/etc                --localstatedir=/var             --disable-ppp &&
+<userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --localstatedir=/var \
+            --with-nmtui         \
+            --disable-ppp        \
+            --with-systemdsystemunitdir=no &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/postlfs/editors/nano.xml
===================================================================
--- trunk/blfs/postlfs/editors/nano.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/postlfs/editors/nano.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -58,7 +58,10 @@
     <para>Installez <application>Nano</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --sysconfdir=/etc             --enable-utf8 &&
+<userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --enable-utf8     \
+            --docdir=/usr/share/doc/nano-&nano-version; &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
@@ -66,8 +69,7 @@
 <screen role="root">
 <userinput>make install &&
 install -v -m644 doc/nanorc.sample /etc &&
-install -v -m755 -d /usr/share/doc/nano-&nano-version; &&
-install -v -m644 doc/{,man/,texinfo/}*.html /usr/share/doc/nano-&nano-version;</userinput>
+install -v -m644 doc/texinfo/nano.html /usr/share/doc/nano-&nano-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">
@@ -75,7 +77,6 @@
     <para><option>--with-slang</option>> :nbsp;: Cela force
     <application>Nano</application> à détecter <application>S-Lang</application>.
     Utiliser s'il est installé.</para>
-
     <para>
      <option>--enable-utf8</option> : Ce paramètre active le support unicode dans 
       <application>Nano</application>.

Modified: trunk/blfs/postlfs/filesystems/lvm2.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/lvm2.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/postlfs/filesystems/lvm2.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -85,7 +85,13 @@
     <para>Installez <application>lvm2</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr                   --exec-prefix=                  --with-confdir=/etc             --enable-applib                 --enable-cmdlib                 --enable-pkgconfig              --enable-udev_sync &&
+<userinput>./configure --prefix=/usr       \
+            --exec-prefix=      \
+            --with-confdir=/etc \
+            --enable-applib     \
+            --enable-cmdlib     \
+            --enable-pkgconfig  \
+            --enable-udev_sync &&
 make</userinput>
 </screen>
     

Modified: trunk/blfs/postlfs/filesystems/xfsprogs.xml
===================================================================
--- trunk/blfs/postlfs/filesystems/xfsprogs.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/postlfs/filesystems/xfsprogs.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -3,7 +3,6 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!--  <!ENTITY xfsprogs-download-http "&sources-anduin-http;/x/xfsprogs-&xfsprogs-version;.tar.gz">-->
   <!ENTITY xfsprogs-download-http " ">
   <!ENTITY xfsprogs-download-ftp  "ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-&xfsprogs-version;.tar.gz">
   <!ENTITY xfsprogs-md5sum        "5c6905932029c8f9207fe5a0a8aac24b">
@@ -67,7 +66,8 @@
     <para>Installez <application>xfsprogs</application> en lançant les commandes suivantes :
     </para>
 <screen>
-<userinput>make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root      LOCAL_CONFIGURE_OPTIONS="--enable-readline"</userinput>
+<userinput>make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
+     LOCAL_CONFIGURE_OPTIONS="--enable-readline"</userinput>
 </screen>
     <para>Ce paquet n'a pas de suite de tests.</para>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
@@ -167,7 +167,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="xfs_db">
         <term><command>xfs_db</command></term>
         <listitem>
@@ -198,7 +197,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
       <varlistentry id="xfs_growfs">
         <term><command>xfs_growfs</command></term>
         <listitem>

Modified: trunk/blfs/postlfs/security/gnupg2.xml
===================================================================
--- trunk/blfs/postlfs/security/gnupg2.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/postlfs/security/gnupg2.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -76,7 +76,9 @@
     <para>Installez <application>GnuPG</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &&
+<userinput>./configure --prefix=/usr \
+            --enable-symcryptrun \
+            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &&
 make &&
 makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &&
 makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput>
@@ -96,15 +98,19 @@
 ln -sv gpg2  /usr/bin/gpg  &&
 ln -sv gpgv2 /usr/bin/gpgv &&
 install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html       &&
-install -v -m644    doc/gnupg_nochunks.html                     /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &&
-install -v -m644    doc/*.texi doc/gnupg.txt                     /usr/share/doc/gnupg-&gnupg2-version;</userinput>
+install -v -m644    doc/gnupg_nochunks.html \
+                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &&
+install -v -m644    doc/*.texi doc/gnupg.txt \
+                    /usr/share/doc/gnupg-&gnupg2-version;</userinput>
 </screen>
 <para>Si vous avez créé des formats alternatifs de la documentation, installez les
     en utilisant la commande suivante en tant qu'utilisateur
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
-<userinput>install -v -m644 doc/gnupg.html/*                  /usr/share/doc/gnupg-&gnupg2-version;/html &&
-install -v -m644 doc/gnupg.{pdf,dvi,ps}                  /usr/share/doc/gnupg-&gnupg2-version;</userinput>
+<userinput>install -v -m644 doc/gnupg.html/* \
+                 /usr/share/doc/gnupg-&gnupg2-version;/html &&
+install -v -m644 doc/gnupg.{pdf,dvi,ps} \
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput>
 </screen>
  
   </sect2>

Modified: trunk/blfs/postlfs/security/gnutls.xml
===================================================================
--- trunk/blfs/postlfs/security/gnutls.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/postlfs/security/gnutls.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -91,7 +91,8 @@
     <para>Installez <application>GnuTLS</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>./configure --prefix=/usr             --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
+<userinput>./configure --prefix=/usr \
+            --with-default-trust-store-file=/etc/ssl/ca-bundle.crt &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/postlfs/security/nss.xml
===================================================================
--- trunk/blfs/postlfs/security/nss.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/postlfs/security/nss.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -86,7 +86,12 @@
 <screen>
 <userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch &&
 cd nss &&
-make BUILD_OPT=1                        NSPR_INCLUDE_DIR=/usr/include/nspr    USE_SYSTEM_ZLIB=1                     ZLIB_LIBS=-lz                         $([ $(uname -m) = x86_64 ] && echo USE_64=1)   $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) -j1</userinput>
+make BUILD_OPT=1                      \
+  NSPR_INCLUDE_DIR=/usr/include/nspr  \
+  USE_SYSTEM_ZLIB=1                   \
+  ZLIB_LIBS=-lz                       \
+  $([ $(uname -m) = x86_64 ] && echo USE_64=1) \
+  $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) -j1</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
    <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>

Modified: trunk/blfs/pst/printing/cups.xml
===================================================================
--- trunk/blfs/pst/printing/cups.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/pst/printing/cups.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -192,7 +192,11 @@
 <userinput>patch -Np1 -i ../cups-&cups-version;-blfs-1.patch &&
 aclocal -I config-scripts &&
 autoconf -I config-scripts &&
-CC=gcc ./configure --libdir=/usr/lib                             --with-rcdir=/tmp/cupsinit                    --with-docdir=/usr/share/cups/doc             --with-system-groups=lpadmin      &&
+CC=gcc \
+./configure --libdir=/usr/lib                 \
+            --with-rcdir=/tmp/cupsinit        \
+            --with-docdir=/usr/share/cups/doc \
+            --with-system-groups=lpadmin      &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, tapez :  <command>make -k check</command>. Un session graphique déjà

Modified: trunk/blfs/pst/typesetting/texlive.xml
===================================================================
--- trunk/blfs/pst/typesetting/texlive.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/pst/typesetting/texlive.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -7,8 +7,7 @@
   <!ENTITY texlive-source-download-ftp  "ftp://tug.org/texlive/historic/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
   <!ENTITY texlive-source-md5sum        "09ee265ff51637827559affc7304078c">
   <!ENTITY texlive-source-size          "40 Mo">
-  <!-- buildsize is the source dir, plus the kpathsea files installé to /usr.
-   The progs in bin/ARCH/ seem slightly smaller (shared libs) -->
+  
   <!ENTITY texlive-buildsize            "555 Mo">
   <!ENTITY texlive-time                 "8.4 SBU">
 ]>
@@ -126,15 +125,43 @@
     <command>configure</command> et <command>make</command> dans leur répertoire.
 </para>
 <screen>
-<userinput>patch -Np1 -i ../texlive-&texlive-version;-source-fix_asymptote-1.patch &&
-patch -Np1 -i ../texlive-&texlive-version;-source-poppler26-1.patch &&
-mkdir texlive-build &&
+<userinput>mkdir texlive-build &&
 cd texlive-build    &&
-../configure                                            --prefix=/opt/texlive/2013                          --bindir=/opt/texlive/2013/bin/x86_64-linux         --datarootdir=/opt/texlive/2013                     --includedir=/usr/include                           --infodir=/opt/texlive/2013/texmf-dist/doc/info     --libdir=/usr/lib                                   --mandir=/opt/texlive/2013/texmf-dist/doc/man       --disable-native-texlive-build                      --disable-static --enable-shared                    --with-system-libgs                                 --with-system-poppler                               --with-system-freetype2                             --with-system-fontconfig                            --with-system-libpng                                --with-system-icu                                   --with-system-graphite2                             --with-system-harfbuzz                              --with-system-xpdf                                  --wit
 h-system-poppler                               --with-system-cairo                                 --with-system-pixman                                --with-system-zlib                                  --with-banner-add=" - BLFS" &&
+../configure                                        \
+    --prefix=/opt/texlive/&texlive-year;                      \
+    --bindir=/opt/texlive/&texlive-year;/bin/x86_64-linux     \
+    --datarootdir=/opt/texlive/&texlive-year;                 \
+    --includedir=/usr/include                       \
+    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
+    --libdir=/usr/lib                               \
+    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
+    --disable-native-texlive-build                  \
+    --disable-static --enable-shared                \
+    --with-system-libgs                             \
+    --with-system-poppler                           \
+    --with-system-freetype2                         \
+    --with-system-fontconfig                        \
+    --with-system-libpng                            \
+    --with-system-icu                               \
+    --with-system-graphite2                         \
+    --with-system-harfbuzz                          \
+    --with-system-xpdf                              \
+    --with-system-poppler                           \
+    --with-system-cairo                             \
+    --with-system-pixman                            \
+    --with-system-zlib                              \
+    --with-banner-add=" - BLFS" &&
 pushd ../utils/asymptote &&
     echo "ac_cv_lib_m_sqrt=yes"     >config.cache &&
     echo "ac_cv_lib_z_deflate=yes" >>config.cache &&
-./configure LIBS="-ltirpc "                             --prefix=/opt/texlive/2013/                         --bindir=/opt/texlive/2013/bin/x86_64-linux         --enable-texlive-build                              --datarootdir=/opt/texlive/2013/texmf-dist          --infodir=/opt/texlive/2013/texmf-dist/doc/info     --mandir=/opt/texlive/2013/texmf-dist/doc/man       --cache-file=config.cache &&
+./configure LIBS="-ltirpc "                         \
+    --prefix=/opt/texlive/&texlive-year;/                     \
+    --bindir=/opt/texlive/&texlive-year;/bin/x86_64-linux     \
+    --enable-texlive-build                          \
+    --datarootdir=/opt/texlive/&texlive-year;/texmf-dist      \
+    --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
+    --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
+    --cache-file=config.cache &&
 popd &&
 make &&
 make -C ../utils/asymptote</userinput>

Modified: trunk/blfs/pst/typesetting/tl-installer.xml
===================================================================
--- trunk/blfs/pst/typesetting/tl-installer.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/pst/typesetting/tl-installer.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -6,7 +6,7 @@
   <!ENTITY tl-installer-download-http	"http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
   <!ENTITY tl-installer-download-ftp    " ">
   <!ENTITY tl-installer-md5sum          "f5b1e909d5c2380cefd2cda83d288c00">
-  <!ENTITY tl-installer-date             "20140628"> <!-- in the directory name -->
+  <!ENTITY tl-installer-date             "20140628"> 
   <!ENTITY tl-installer-size            "3.2 Mo">
   <!ENTITY tl-installer-buildsize        "3.8 Go">
   <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
@@ -86,7 +86,6 @@
       <xref linkend="ruby"/> est utilisé par quelques scripts, principalement dans mtx_context
       qui est un composant de <application>conTeXt</application>.
     </para>
-
     <para condition="html" role="usernotes">Notes utilisateur :
     <ulink url="&blfs-wiki;/tl-installer"/></para>
   </sect2>

Modified: trunk/blfs/server/databases/db.xml
===================================================================
--- trunk/blfs/server/databases/db.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/server/databases/db.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -65,13 +65,21 @@
     commandes suivantes :</para>
 <screen>
 <userinput>cd build_unix                        &&
-../dist/configure --prefix=/usr                        --enable-compat185                   --enable-dbm                         --disable-static                     --enable-cxx       &&
+../dist/configure --prefix=/usr      \
+                  --enable-compat185 \
+                  --enable-dbm       \
+                  --disable-static   \
+                  --enable-cxx       &&
 make</userinput>
 </screen>
     <para>Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>make docdir=/usr/share/doc/db-&db-version; install &&
-chown -v -R root:root                              /usr/bin/db_*                                /usr/include/db{,_185,_cxx}.h                /usr/lib/libdb*.{so,la}                      /usr/share/doc/db-&db-version;</userinput>
+chown -v -R root:root                        \
+      /usr/bin/db_*                          \
+      /usr/include/db{,_185,_cxx}.h          \
+      /usr/lib/libdb*.{so,la}                \
+      /usr/share/doc/db-&db-version;</userinput>
 </screen>
   </sect2>
   <sect2 role="commands">

Modified: trunk/blfs/x/installing/libvdpau.xml
===================================================================
--- trunk/blfs/x/installing/libvdpau.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/installing/libvdpau.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -83,7 +83,6 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect4">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -117,13 +116,13 @@
         </para>
       </listitem>
     </itemizedlist>
-
     <note><para>Le nom d'archive de libvdpau-va-gl n'inclut par le nom de fichier, donc il ne se déballe
     pas dans libvdpau-va-gl-&libvdpau-va-gl-version;.
     Le fichier doit être renomé après le téléchargement:</para>
-<screen><command>mv v&libvdpau-va-gl-version;.tar.gz libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz</command></screen>
+<screen>
+<command>mv v&libvdpau-va-gl-version;.tar.gz libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz</command>
+</screen>
     </note>
-
     <bridgehead renderas="sect3">Dépendances de libvdpau</bridgehead>
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">
@@ -173,11 +172,13 @@
     <para>
       Installez <application>libvdpau-va-gl</application> en lançant les commandes suivantes:
     </para>
-<screen><userinput>
+<screen>
+<userinput>
 mkdir build &&
 cd    build &&
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$XORG_CONFIG .. &&
-make</userinput></screen>
+make</userinput>
+</screen>
     <para>
       Pour tester les résultats, tapez: <command>make check</command>. Les tests doivent être lancés depuis un
       environnement Xorg.
@@ -185,13 +186,17 @@
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem>
     </para>
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root">
+<userinput>make install</userinput>
+</screen>
   </sect3>
   <sect3 role="configuration">
     <title>Configuration</title>
     <para>Pour permettre à libvdpau de trouver libvdpau-va-gl, initialisez une variable d'environnement.
    En tant qu'utilisateur <systemitem class="username">root</systemitem>:</para>
-<screen role="root"><userinput>echo "export VDPAU_DRIVER=va_gl" >> /etc/profile.d/xorg.sh</userinput></screen>
+<screen role="root">
+<userinput>echo "export VDPAU_DRIVER=va_gl" >> /etc/profile.d/xorg.sh</userinput>
+</screen>
   </sect3>
   <sect3 role="content">
     <title>Contenu</title>

Modified: trunk/blfs/x/installing/libxcb.xml
===================================================================
--- trunk/blfs/x/installing/libxcb.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/installing/libxcb.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -75,10 +75,10 @@
     <para>Installez <application>libxcb</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>sed -e "s/pthread-stubs//" -i configure.ac &&
-autoreconf -fiv &&
-./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; \
-            --enable-xinput --enable-xkb &&
+<userinput>sed "s/pthread-stubs//" -i configure &&
+./configure $XORG_CONFIG    \
+            --enable-xinput \
+            --docdir='${datadir}'/doc/libxcb-&libxcb-version; &&
 make</userinput>
 </screen>
     <para>Pour tester les résultats, lancez : <command>make check</command>.</para>

Modified: trunk/blfs/x/installing/mesalib.xml
===================================================================
--- trunk/blfs/x/installing/mesalib.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/installing/mesalib.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -6,8 +6,6 @@
   <!ENTITY mesalib-download-http " ">
   <!ENTITY mesalib-download-ftp
   "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-<!--  <!ENTITY mesalib-download-ftp
-  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">-->
   <!ENTITY mesalib-md5sum        "11d3542da1b703618634be840a87b0b2">
   <!ENTITY mesalib-size          "6.9 Mo">
   <!ENTITY mesalib-buildsize     "313 Mo (additional 1.6 Mo for the docs)">
@@ -123,8 +121,21 @@
      Installez <application>MesaLib</application> en lançant les commandes
     suivantes :</para>
 <screen>
-<userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-svga_texture-1.patch &&
-./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"               --prefix=$XORG_PREFIX                      --sysconfdir=/etc                          --enable-texture-float                     --enable-gles1                             --enable-gles2                             --enable-openvg                            --enable-osmesa                            --enable-xa                                --enable-gbm                               --enable-gallium-egl                       --enable-gallium-gbm                       --enable-glx-tls                           --with-egl-platforms="drm,x11"             --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
+<userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
+            --prefix=$XORG_PREFIX          \
+            --sysconfdir=/etc              \
+            --enable-texture-float         \
+            --enable-gles1                 \
+            --enable-gles2                 \
+            --enable-openvg                \
+            --enable-osmesa                \
+            --enable-xa                    \
+            --enable-gbm                   \
+            --enable-gallium-egl           \
+            --enable-gallium-gbm           \
+            --enable-glx-tls               \
+            --with-egl-platforms="drm,x11" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/installing/x7lib.xml
===================================================================
--- trunk/blfs/x/installing/x7lib.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/installing/x7lib.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -178,7 +178,8 @@
 <screen>
 <userinput>mkdir lib &&
 cd lib &&
-grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c     -B http://xorg.freedesktop.org/releases/individual/lib/ &&
+grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
+    -B http://xorg.freedesktop.org/releases/individual/lib/ &&
 md5sum -c ../lib-&xorg-version;.md5</userinput>
 </screen>
   </sect2>
@@ -205,7 +206,8 @@
       ./configure $XORG_CONFIG --disable-devel-docs
     ;;
     libXt-[0-9]* )
-      ./configure $XORG_CONFIG                   --with-appdefaultdir=/etc/X11/app-defaults
+      ./configure $XORG_CONFIG \
+                  --with-appdefaultdir=/etc/X11/app-defaults
     ;;
     * )
       ./configure $XORG_CONFIG

Modified: trunk/blfs/x/installing/xorg-server.xml
===================================================================
--- trunk/blfs/x/installing/xorg-server.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/installing/xorg-server.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -85,7 +85,11 @@
 <userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput>
 </screen>
 <screen>
-<userinput>./configure $XORG_CONFIG            --with-xkb-output=/var/lib/xkb            --enable-install-setuid &&
+<userinput>./configure $XORG_CONFIG                    \
+           --with-xkb-output=/var/lib/xkb   \
+           --enable-dmx                     \
+           --enable-install-setuid          \
+           --enable-suid-wrapper            &&
 make</userinput>
 </screen>
     <para>Pour tester la construction, tapez : <command>make check</command>.</para>
@@ -101,23 +105,17 @@
   </sect2>
   <sect2 role="commands">
     <title>Explication des commandes</title>
-
      <para>
       <parameter>--enable-dmx</parameter>: construit le serveur DMX (Distributed Multihead X).
     </para>
-
-
     <para><parameter>--enable-install-setuid</parameter> : Le binaire
     Xorg doit se lancer en tant qu'utilisateur root. Ce paramètre assure que le
     binaire est installé avec setuid quand <command>make</command> est lancé
     par un utilisateur non privilégié.</para>
-
-
      <para>
       <parameter>--enable-suid-wrapper</parameter>: construit l'enveloppe suid-root pour l'héritage du support
       des pilotes sur les systèmes xserver sans utilisateur root.
     </para>
-
     <para><command>cat >> /etc/sysconfig/createfiles...</command> : Cette
     commande crée les répertoires <filename class='directory'>/tmp/.ICE-unix</filename>
     et <filename class="directory">/tmp/.X11-unix</filename>

Modified: trunk/blfs/x/installing/xterm.xml
===================================================================
--- trunk/blfs/x/installing/xterm.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/installing/xterm.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -59,8 +59,10 @@
     les commandes suivantes :</para>
 <screen>
 <userinput>sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap &&
-echo -e 'tkbs=\177,' >> terminfo &&
-TERMINFO=/usr/share/terminfo ./configure $XORG_CONFIG         --with-app-defaults=/etc/X11/app-defaults &&
+echo -e '\tkbs=\\177,' >> terminfo &&
+TERMINFO=/usr/share/terminfo \
+./configure $XORG_CONFIG     \
+    --with-app-defaults=/etc/X11/app-defaults &&
 make</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>

Modified: trunk/blfs/x/lib/cairo.xml
===================================================================
--- trunk/blfs/x/lib/cairo.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/lib/cairo.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -93,9 +93,9 @@
     suivantes :</para>
 <screen>
 <userinput>CFLAGS="$CFLAGS -ffat-lto-objects" \
-./configure --prefix=/usr \
---disable-static          \
---enable-tee &&
+./configure --prefix=/usr    \
+            --disable-static \
+            --enable-tee &&
 make</userinput>
 </screen>
     

Modified: trunk/blfs/x/lib/gtk+2.xml
===================================================================
--- trunk/blfs/x/lib/gtk+2.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/lib/gtk+2.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -76,7 +76,7 @@
     <para>Installez <application>Gtk+-2</application> en lançant
     les commandes suivantes :</para>
 <screen>
-<userinput>sed -i 's#l (gtk-.*).sgml#& -o 1#' docs/{faq,tutorial}/Makefile.in &&
+<userinput>sed -i 's#l \(gtk-.*\).sgml#& -o \1#' docs/{faq,tutorial}/Makefile.in &&
 sed -i 's#.*@man_#man_#' docs/reference/gtk/Makefile.in               &&
 sed -i -e 's#pltcheck.sh#$(NULL)#g' gtk/Makefile.in                   &&
 ./configure --prefix=/usr --sysconfdir=/etc                           &&

Modified: trunk/blfs/x/lib/pango.xml
===================================================================
--- trunk/blfs/x/lib/pango.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/lib/pango.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -50,7 +50,6 @@
         <para>Estimation du temps de construction : &pango-time;</para>
       </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">Dépendances de Pango</bridgehead>
     <bridgehead renderas="sect4">Requises</bridgehead>
     <para role="required">

Modified: trunk/blfs/x/lib/qt5.xml
===================================================================
--- trunk/blfs/x/lib/qt5.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/lib/qt5.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -141,7 +141,23 @@
     </para>
 <screen>
 <userinput>export QT5LINK=/usr
-./configure -prefix         /usr                           -sysconfdir     /etc/xdg                       -bindir         /usr/bin                       -headerdir      /usr/include/qt5               -archdatadir    /usr/lib/qt5                   -datadir        /usr/share/qt5                 -docdir         /usr/share/doc/qt5             -translationdir /usr/share/qt5/translations             -examplesdir    /usr/share/doc/qt5/examples             -confirm-license               -opensource                    -dbus-linked                   -openssl-linked                -system-sqlite                 -no-nis                        -nomake examples               -optimized-qmake   &&
+./configure -prefix         /usr               \
+            -sysconfdir     /etc/xdg           \
+            -bindir         /usr/bin           \
+            -headerdir      /usr/include/qt5   \
+            -archdatadir    /usr/lib/qt5       \
+            -datadir        /usr/share/qt5     \
+            -docdir         /usr/share/doc/qt5 \
+            -translationdir /usr/share/qt5/translations \
+            -examplesdir    /usr/share/doc/qt5/examples \
+            -confirm-license   \
+            -opensource        \
+            -dbus-linked       \
+            -openssl-linked    \
+            -system-sqlite     \
+            -no-nis            \
+            -nomake examples   \
+            -optimized-qmake   &&
 make</userinput>
 </screen>
     <para>
@@ -152,7 +168,7 @@
       en lançant la commande suivante:
     </para>
 <screen>
-<userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?S+,,g" {} ;</userinput>
+<userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput>
 </screen>
     <para>
       Maintenant, en tant qu'utilisateur <systemitem class="username">root</systemitem> :
@@ -166,8 +182,10 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g"     -i /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &&
-find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r      '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/1/' {} ;</userinput>
+<userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
+    -i /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &&
+find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
+     '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput>
 </screen>
  <bridgehead renderas="sect3">Methode 2: Installation dans /opt/qt-&qt5-version;</bridgehead>
     <para>
@@ -177,7 +195,16 @@
 <screen>
 <userinput>export QT5DIR=/opt/qt-&qt5-version; &&
 export QT5LINK=/opt/qt5 &&
-./configure -prefix     $QT5DIR              -sysconfdir /etc/xdg             -confirm-license                 -opensource                      -dbus-linked                     -openssl-linked                  -system-sqlite                   -no-nis                          -nomake examples                 -optimized-qmake     &&
+./configure -prefix     $QT5DIR  \
+            -sysconfdir /etc/xdg \
+            -confirm-license     \
+            -opensource          \
+            -dbus-linked         \
+            -openssl-linked      \
+            -system-sqlite       \
+            -no-nis              \
+            -nomake examples     \
+            -optimized-qmake     &&
 make</userinput>
 </screen>
     <para>
@@ -193,8 +220,10 @@
       <systemitem class="username">root</systemitem>:
     </para>
 <screen role="root">
-<userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri    -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} ; &&
-find $QT5DIR -name *.prl    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} ;</userinput>
+<userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri \
+   -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &&
+find $QT5DIR -name \*.prl \
+   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput>
 </screen>
     <bridgehead renderas="sect3">Suite pour les deux méthodes</bridgehead>
     <para>
@@ -205,10 +234,14 @@
     </para>
 <screen role="root">
 <userinput>install -v -dm755 /usr/share/pixmaps/                  &&
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png                   /usr/share/pixmaps/assistant-qt5.png &&
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png                   /usr/share/pixmaps/designer-qt5.png  &&
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png                   /usr/share/pixmaps/linguist-qt5.png  &&
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png                   /usr/share/pixmaps/qdbusviewer-qt5.png &&
+install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
+                  /usr/share/pixmaps/assistant-qt5.png &&
+install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
+                  /usr/share/pixmaps/designer-qt5.png  &&
+install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
+                  /usr/share/pixmaps/linguist-qt5.png  &&
+install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+                  /usr/share/pixmaps/qdbusviewer-qt5.png &&
 install -dm755 /usr/share/applications &&
 cat > /usr/share/applications/assistant-qt5.desktop << EOF
 <literal>[Desktop Entry]

Modified: trunk/blfs/x/lib/webkitgtk2.xml
===================================================================
--- trunk/blfs/x/lib/webkitgtk2.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/lib/webkitgtk2.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -120,7 +120,8 @@
       Installez <application>WebKitGTK+</application> en lançant les commandes suivantes
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                      --enable-introspection &&
+<userinput>./configure --prefix=/usr          \
+            --enable-introspection &&
 make</userinput>
 </screen>
     <para>

Modified: trunk/blfs/x/lib/xulrunner.xml
===================================================================
--- trunk/blfs/x/lib/xulrunner.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/x/lib/xulrunner.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -154,8 +154,7 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
-# shared-js broken by WeakMapPtr visibility
-#ac_add_options --enable-shared-js
+ac_add_options --enable-shared-js
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
@@ -178,7 +177,9 @@
       passez <envar>SHELL=/bin/bash</envar> à la première commande make dessous.
     </para></note>
 <screen>
-<userinput>make -f client.mk</userinput>
+<userinput>sed -i '/^template class/s/JS::WeakMapPtr/JS_PUBLIC_API(&)/' \
+       js/src/vm/WeakMapPtr.cpp &&
+make -f client.mk</userinput>
 </screen>
     <para>Ce paquet n'est pas fourni avec une suite de tests.</para>
     <para>Installez, en tant qu'utilisateur <systemitem class="username">root</systemitem>> :nbsp;:</para>

Modified: trunk/blfs/xincludes/texprogs.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/xsoft/office/libreoffice.xml
===================================================================
--- trunk/blfs/xsoft/office/libreoffice.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/xsoft/office/libreoffice.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -208,7 +208,6 @@
     <para>Il y a beaucoup de dépendances facultatives non listées ici.
     Elles peuvent être trouvées dans <quote>download.lst</quote> (répertoire des sources).
     </para>
-
     <para condition="html" role="usernotes">
       Notes utilisateur : <ulink url="&blfs-wiki;/libreoffice"/>
     </para>
@@ -298,11 +297,50 @@
       suivantes:
     </para>
 <screen>
-<userinput>sed -e "/gzip -f/d"       -e "s|.1.gz|.1|g"     -i bin/distro-install-desktop-integration        &&
+<userinput>sed -e "/gzip -f/d"   \
+    -e "s|.1.gz|.1|g" \
+    -i bin/distro-install-desktop-integration        &&
 sed -e "/distro-install-file-lists/d" -i Makefile.in &&
 chmod -v +x bin/unpack-sources                     &&
-sed -e "s/target.mk/langlist.mk/"                    -e "s/tar -xf/tar -x --strip-components=1 -f/"     -e "/tar -x/s/lo_src_dir/start_dir/"               -i bin/unpack-sources                          &&
-./autogen.sh --prefix=$LO_PREFIX                      --sysconfdir=/etc                        --with-vendor="BLFS"                     --with-lang="en-US pt-BR"                --with-help                              --with-alloc=system                      --without-java                           --disable-gconf                          --disable-odk                            --disable-postgresql-sdbc                --enable-release-build=yes               --enable-python=system                   --with-system-boost                      --with-system-clucene                    --with-system-cairo                      --with-system-curl                       --with-system-expat                      --with-system-graphite                   --with-system-harfbuzz                   --with-system-icu                        --with-system-jpeg                       --with-system-lcms2                      --with-system-libpng                     --with-system-libxml                     
 --with-system-mesa-headers               --with-system-neon                       --with-system-npapi-headers              --with-system-nss                        --with-system-odbc                       --with-system-openldap                   --with-system-openssl                    --with-system-poppler                    --with-system-redland                    --with-system-zlib                       --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
+sed -e "s/target\.mk/langlist\.mk/"                \
+    -e "s/tar -xf/tar -x --strip-components=1 -f/" \
+    -e "/tar -x/s/lo_src_dir/start_dir/"           \
+    -i bin/unpack-sources                          &&
+./autogen.sh --prefix=$LO_PREFIX         \
+             --sysconfdir=/etc           \
+             --with-vendor="BLFS"        \
+             --with-lang="en-US pt-BR"   \
+             --with-help                 \
+             --with-alloc=system         \
+             --without-java              \
+             --disable-gconf             \
+             --disable-odk               \
+             --disable-postgresql-sdbc   \
+             --enable-release-build=yes  \
+             --enable-python=system      \
+             --with-system-boost         \
+             --with-system-clucene       \
+             --with-system-cairo         \
+             --with-system-curl          \
+             --with-system-expat         \
+             --with-system-graphite      \
+             --with-system-harfbuzz      \
+             --with-system-icu           \
+             --with-system-jpeg          \
+             --with-system-lcms2         \
+             --with-system-libpng        \
+             --with-system-libxml        \
+             --with-system-mesa-headers  \
+             --with-system-neon          \
+             --with-system-npapi-headers \
+             --with-system-nss           \
+             --with-system-odbc          \
+             --with-system-openldap      \
+             --with-system-openssl       \
+             --with-system-poppler       \
+             --with-system-redland       \
+             --with-system-zlib          \
+             --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput>
 </screen>
 <para>
    Les instructions suivantes vont seulement construire le paquet sans lancer aucune
@@ -321,7 +359,8 @@
 <screen role="root">
 <userinput>make distro-pack-install                                  &&
 install -v -m755 -d $LO_PREFIX/share/appdata              &&
-install -v -m644    sysui/desktop/appstream-appdata/*.xml                     $LO_PREFIX/share/appdata</userinput>
+install -v -m644    sysui/desktop/appstream-appdata/*.xml \
+                    $LO_PREFIX/share/appdata</userinput>
 </screen>
     <para>
        Si les dictionnaires ont été construits, de nouveau en tant qu'utilisateur
@@ -347,7 +386,8 @@
 <userinput>mkdir -pv /usr/share/pixmaps &&
 for i in writer base calc draw impress math startcenter writer
 do
-  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png           /usr/share/pixmaps/
+  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
+          /usr/share/pixmaps/
 done
 unset i</userinput>
 </screen>

Modified: trunk/blfs/xsoft/other/fontforge.xml
===================================================================
(Binary files differ)

Modified: trunk/blfs/xsoft/other/gparted.xml
===================================================================
--- trunk/blfs/xsoft/other/gparted.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/xsoft/other/gparted.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -85,7 +85,9 @@
       commands:
     </para>
 <screen>
-<userinput>./configure --prefix=/usr                --disable-doc                --disable-static &&
+<userinput>./configure --prefix=/usr    \
+            --disable-doc    \
+            --disable-static &&
 make</userinput>
 </screen>
     <para>
@@ -166,8 +168,10 @@
           configurez <xref linkend="gparted"/> et <xref linkend="polkit"/> avec les commandes suivantes:
         </para>
 <screen role="root">
-<userinput>cp -v /usr/share/applications/gparted.desktop                                      /usr/share/applications/gparted.desktop.back &&
-sed -i 's:/usr/sbin/gparted:/usr/sbin/gparted_polkit:'                                      /usr/share/applications/gparted.desktop      &&
+<userinput>cp -v /usr/share/applications/gparted.desktop \
+                                     /usr/share/applications/gparted.desktop.back &&
+sed -i 's:/usr/sbin/gparted:/usr/sbin/gparted_polkit:' \
+                                     /usr/share/applications/gparted.desktop      &&
 cat > /usr/sbin/gparted_polkit << "EOF" &&
 <literal>#!/bin/bash
 pkexec /usr/sbin/gparted $@</literal>

Modified: trunk/blfs/xsoft/other/inkscape.xml
===================================================================
--- trunk/blfs/xsoft/other/inkscape.xml	2014-07-25 11:25:15 UTC (rev 6493)
+++ trunk/blfs/xsoft/other/inkscape.xml	2014-07-25 11:34:51 UTC (rev 6494)
@@ -109,7 +109,8 @@
       Installez <application>Inkscape</application> en lançant les commandes
       commands:
     </para>
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch &&
+<screen>
+<userinput>patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch &&
 ./configure --prefix=/usr  &&
 make</userinput>
 </screen>

Modified: trunk/blfs/xsoft/other/tigervnc.xml
===================================================================
(Binary files differ)



More information about the lfs-traducfr mailing list