Index: general/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ general/genlib/clucene.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -33,5 +33,5 @@
     high performance text search engine.</para>
 
-    &lfs79_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/gpicview.xml
===================================================================
--- lxde/apps/gpicview.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/apps/gpicview.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/lxappearance-obconf.xml
===================================================================
--- lxde/apps/lxappearance-obconf.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/apps/lxappearance-obconf.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/lxinput.xml
===================================================================
--- lxde/apps/lxinput.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/apps/lxinput.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/lxrandr.xml
===================================================================
--- lxde/apps/lxrandr.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/apps/lxrandr.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/lxtask.xml
===================================================================
--- lxde/apps/lxtask.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/apps/lxtask.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/apps/lxterminal.xml
===================================================================
--- lxde/apps/lxterminal.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/apps/lxterminal.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/desktop/lxappearance.xml
===================================================================
--- lxde/desktop/lxappearance.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/desktop/lxappearance.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/desktop/lxde-common.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/desktop/lxpanel.xml
===================================================================
--- lxde/desktop/lxpanel.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/desktop/lxpanel.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/desktop/lxsession.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: lxde/desktop/pcmanfm.xml
===================================================================
--- lxde/desktop/pcmanfm.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ lxde/desktop/pcmanfm.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ server/databases/postgresql.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -34,6 +34,5 @@
     from the Berkeley Postgres database management system.</para>
 
-    &lfs79_checked;
-    &gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/keybinder2.xml
===================================================================
--- x/lib/keybinder2.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ x/lib/keybinder2.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs79_checked;&gcc6_checked;
+    &lfs7a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 34fbc15bd0e0e0df2ea7c0b0da87497c9d709df6)
+++ xsoft/graphweb/firefox.xml	(revision a5708ba2661e6669cd6fb442a933e72699f5fdcd)
@@ -294,5 +294,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-system_graphite2_harfbuzz-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-system_graphite2_harfbuzz-2.patch</userinput></screen>
 
     <note><para>
@@ -321,7 +321,11 @@
 
 mkdir -pv    /usr/lib/mozilla/plugins  &amp;&amp;
-ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser &amp;&amp;
-
-export CFLAGS=$CFLAGS_HOLD &amp;&amp;
+ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
+
+    <para>
+      Set environment variables back to their values:
+    </para>
+
+<screen><userinput>export CFLAGS=$CFLAGS_HOLD     &amp;&amp;
 export CXXFLAGS=$CXXFLAGS_HOLD &amp;&amp;
 unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>
