From dfb751bce335544ba7589d339c92a5cc7b708279 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Thu, 27 Nov 2008 18:51:31 +0000
Subject: [PATCH] Update pcre, and activate the reference ready for the newer
 glib.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7626 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/genlib/pcre.xml            | 28 +++++++++++++---------------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/general.ent b/general.ent
index 91193d2423..402253d2cd 100644
--- a/general.ent
+++ b/general.ent
@@ -98,7 +98,7 @@ $Date$
 
 <!-- Part III -->
 <!-- Chapter 8 -->
-<!ENTITY pcre-version                 "7.6">
+<!ENTITY pcre-version                 "7.8">
 <!ENTITY popt-version                 "1.14">
 <!ENTITY slang-version                "2.1.3">
 <!ENTITY gamin-version                "0.1.9">
diff --git a/general/genlib/pcre.xml b/general/genlib/pcre.xml
index eed92f4f4d..f1fc54a591 100644
--- a/general/genlib/pcre.xml
+++ b/general/genlib/pcre.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">
   <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
-  <!ENTITY pcre-md5sum        "2af38e083fb90ef60fa9eda7cc290e86">
-  <!ENTITY pcre-size          "780 KB">
-  <!ENTITY pcre-buildsize     "11 MB">
+  <!ENTITY pcre-md5sum        "141132d6af14dccc7b08fa797e4fd441">
+  <!ENTITY pcre-size          "821 KB">
+  <!ENTITY pcre-buildsize     "10 MB">
   <!ENTITY pcre-time          "0.3 SBU">
 ]>
 
@@ -57,7 +57,7 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required Patch: <ulink
@@ -67,7 +67,7 @@
         <para>Required Patch: <ulink
           url="&patch-root;/pcre-&pcre-version;-security_fix-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/pcre"/></para>
@@ -84,7 +84,7 @@
 patch -Np1 -i ../pcre-&pcre-version;-security_fix-1.patch &amp;&amp;
 ./configure --prefix=/usr \
             --docdir=/usr/share/doc/pcre-&pcre-version; \
-            --enable-utf8 \
+            --enable-utf8 --enable-unicode-properties \
             --enable-pcregrep-libz \
             --enable-pcregrep-libbz2 &amp;&amp;
 make</userinput></screen>
@@ -118,15 +118,9 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
     handling UTF-8 character strings in the library.</para>
 
     <para><parameter>--enable-unicode-properties</parameter>: This switch
-    enables Unicode properties support.</para>
-
-    <!-- [ag] Glib-2.12.* hasn't yet has this switch. Un-comment for
-    glib-2.16.* and newer and merge the note in the above para.
-    Also for consistency, replace (&dash;&dash;) with two dashes.
-
-    Note: You need this switch if you are going to build
-    <xref linkend="glib2"/> with the
-    <parameter>&dash;&dash;with-pcre=system</parameter> switch. -->
+    enables Unicode properties support. Note: You need this switch if you are
+    going to build <xref linkend="glib2"/> with the
+    <parameter>--with-pcre=system</parameter> switch.</para>
 
     <para><parameter>--enable-pcregrep-libz</parameter>: This switch adds
     support to <command>pcregrep</command> to read
@@ -136,6 +130,10 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
     support to <command>pcregrep</command> to read
     <filename class='extension'>.bz2</filename> compressed files.</para>
 
+    <para><parameter>--enable-shared --disable-static</parameter>: This pair
+    of switches prevents the static libraries in this package from being
+    built and installed.</para>
+
   </sect2>
 
   <sect2 role="content">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b97867026f..29efe4e3cf 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -52,6 +52,9 @@
         <listitem>
           <para>[ken] - Updated to intltool-0.40.4.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Updated to pcre-7.8.</para>
+        </listitem>
       </itemizedlist>
     </listitem>