Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 87351a9d367e97e11cd540a10d8813d7d077cb57)
+++ general/genutils/graphviz.xml	(revision 20a35abcbab26df48bedc7157c8ff8644557c36d)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY graphviz-download-http "https://www2.graphviz.org/Packages/stable/portable_source/graphviz-&graphviz-version;.tar.gz">
+  <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.gz">
   <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "96792adafea5cc6879060c400da31ea3">
-  <!ENTITY graphviz-size          "33 MB">
-  <!ENTITY graphviz-buildsize     "284 MB">
-  <!ENTITY graphviz-time          "1.0 SBU (using parallelism=4)">
+  <!ENTITY graphviz-md5sum        "f9dd7caf4785f47f5fd40f5407d9d7ce">
+  <!ENTITY graphviz-size          "29 MB">
+  <!ENTITY graphviz-buildsize     "204 MB">
+  <!ENTITY graphviz-time          "0.7 SBU (using parallelism=4)">
 ]>
 
@@ -17,5 +17,4 @@
 
   <sect1info>
-    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -39,5 +38,5 @@
     </para>
 
-    &lfs10_checked;
+    &lfs110a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -146,5 +145,5 @@
       <xref linkend="libwebp"/> (WebP support is considered experimental),
       <ulink url="http://openil.sourceforge.net/projects.php">DevIL</ulink>,
-      <ulink url="http://sourceforge.net/projects/lasi/">libLASi</ulink>,
+      <ulink url="https://sourceforge.net/projects/lasi/">libLASi</ulink>,
       <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>,
       and <ulink url="http://www.libming.org/">libming</ulink> (Adobe
@@ -185,5 +184,5 @@
       <xref linkend="lua"/>,
       <xref linkend="php"/>,
-      <xref linkend="python2"/>,
+      <!--<xref linkend="python2"/>, Removed in 2.47.3 -->
       <xref linkend="ruby"/>,
       <!-- <xref linkend="tcl"/>, -->
@@ -198,6 +197,6 @@
     <para role="optional">
       <ulink url="https://github.com/Snaipe/Criterion">Criterion</ulink>
-          (framework for tests),
-      <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
+          (framework for tests) and
+      <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>
     </para>
 
@@ -242,6 +241,8 @@
 <screen><userinput>sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
 
-autoreconf                            &amp;&amp;
-./configure --prefix=/usr PS2PDF=true &amp;&amp;
+./autogen.sh              &amp;&amp;
+./configure --prefix=/usr \
+            --disable-php \
+            PS2PDF=true   &amp;&amp;
 make</userinput></screen>
 
@@ -265,5 +266,5 @@
     </para>
 
-<screen role="root"><userinput>ln -v -s /usr/share/graphviz/doc /usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
+<screen role="root"><userinput>ln -svr /usr/share/graphviz/doc /usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
 
   </sect2>
@@ -276,9 +277,9 @@
       avoid installing files in /usr/lib64.
     </para>
-<!-- Seems php bindings can be built now (not tested)
-    <para>
-      <parameter>- -disable-php</parameter>: This version of graphviz
-      does not support php version 7.
-    </para>-->
+
+    <para>
+      <parameter>--disable-php</parameter>: This version of graphviz
+      does not support php version 8.
+    </para>
 
     <para>
@@ -335,5 +336,5 @@
         <application>Graphviz</application>. You may consider installing the
         additional plugins and tools available from the download page at
-        <ulink url="http://www.graphviz.org/Download_source.php"/> for additional
+        <ulink url="https://graphviz.org/download/source/"/> for additional
         capabilities. If additional plugins are installed, you can run
         <command>dot -c</command> (as the
@@ -368,5 +369,5 @@
           libpathplan.so, libxdot.so, and several plugins in /usr/lib/graphviz.
           There are also several in subdirectories of
-          /usr/lib/{lua,perl5,php,python&python2-majorver;,python&python3-majorver;tcl8.6}.
+          /usr/lib/{lua,perl5,php,<!--python&python2-majorver;-->,python&python3-majorver;,tcl8.6}.
           Unfortunately, some libraries are duplicated.
         </seg>
@@ -392,5 +393,5 @@
             is a filter that takes a directed graph as input and outputs a
             copy of the graph with sufficient edges reversed to make the
-            graph acyclic.
+            graph acyclic
           </para>
           <indexterm zone="graphviz acyclic">
@@ -405,5 +406,5 @@
           <para>
             decomposes graphs into their biconnected components,
-            printing the components to standard output.
+            printing the components to standard output
           </para>
           <indexterm zone="graphviz bcomps">
@@ -418,5 +419,5 @@
           <para>
             decomposes graphs into their connected components,
-            printing the components to standard output.
+            printing the components to standard output
           </para>
           <indexterm zone="graphviz ccomps">
@@ -430,5 +431,5 @@
         <listitem>
           <para>
-            draws graphs using a circular layout.
+            draws graphs using a circular layout
           </para>
           <indexterm zone="graphviz circo">
@@ -443,5 +444,5 @@
           <para>
             takes as input a graph in DOT format, finds node clusters
-            and augments the graph with this information.
+            and augments the graph with this information
           </para>
           <indexterm zone="graphviz cluster">
@@ -458,5 +459,5 @@
             generates an image where each pixel is the
             difference between the corresponding pixel in
-            each of the two source images.
+            each of the two source images
           </para>
           <indexterm zone="graphviz diffimg">
@@ -471,5 +472,5 @@
           <para>
             reads a stream of graphs and for each computes the distance of
-            every node from sourcenode.
+            every node from sourcenode
           </para>
           <indexterm zone="graphviz dijkstra">
@@ -486,5 +487,5 @@
             that can be drawn as hierarchies. It reads attributed graph files and
             writes drawings. By default, the output format dot is the input file
-            with layout coordinates appended.
+            with layout coordinates appended
           </para>
           <indexterm zone="graphviz dot">
@@ -502,8 +503,8 @@
             <command>gxl2dot</command> will deduce the type of conversion from
             the suffix of the input file, a
-            <filename class='extension'>.dot</filename> suffix causing a
+            <filename class="extension">.dot</filename> suffix causing a
             conversion from DOT to GXL, and a
-            <filename class='extension'>.gxl</filename> suffix causing a
-            conversion from GXL to DOT.
+            <filename class="extension">.gxl</filename> suffix causing a
+            conversion from GXL to DOT
           </para>
           <indexterm zone="graphviz dot2gxl">
@@ -519,5 +520,5 @@
             is a graph editor for the X Window System. It may be run as a
             standalone editor, or as a front end for applications that use
-            graphs. It can control multiple windows viewing different graphs.
+            graphs. It can control multiple windows viewing different graphs
           </para>
           <indexterm zone="graphviz dotty">
@@ -531,5 +532,5 @@
         <listitem>
           <para>
-            performs edge coloring to disambiguate crossing edges.
+            performs edge coloring to disambiguate crossing edges
           </para>
           <indexterm zone="graphviz edgepaint">
@@ -545,5 +546,5 @@
             draws undirected graphs using a <quote>spring</quote> model. It
             relies on a force-directed approach in the spirit of Fruchterman
-            and Reingold.
+            and Reingold
           </para>
           <indexterm zone="graphviz fdp">
@@ -560,5 +561,5 @@
             to standard output the number of nodes, edges, connected components
             or clusters contained in the input files. It also prints a total
-            count for all graphs if more than one graph is given.
+            count for all graphs if more than one graph is given
           </para>
           <indexterm zone="graphviz gc-graphviz">
@@ -573,5 +574,5 @@
           <para>
             converts a graph specified in the GML format to
-            a graph in the GV (formerly DOT) format.
+            a graph in the GV (formerly DOT) format
           </para>
           <indexterm zone="graphviz gml2gv">
@@ -586,5 +587,5 @@
           <para>
             converts a graph specified in the GRAPHML format to a graph in
-            the GV (formerly DOT) format.
+            the GV (formerly DOT) format
           </para>
           <indexterm zone="graphviz graphml2gv">
@@ -598,5 +599,5 @@
         <listitem>
           <para>
-            converts a graph specified in the GV format to a graph in the GML format.
+            converts a graph specified in the GV format to a graph in the GML format
           </para>
           <indexterm zone="graphviz gv2gml">
@@ -610,5 +611,5 @@
         <listitem>
           <para>
-            converts a graph specified in the GV format to a graph in the GXL format.
+            converts a graph specified in the GV format to a graph in the GXL format
           </para>
           <indexterm zone="graphviz gv2gxl">
@@ -624,5 +625,5 @@
             is a filter that sets node colors from initial seed values.
             Colors flow along edges from tail to head, and are averaged (as HSB
-            vectors) at nodes.
+            vectors) at nodes
           </para>
           <indexterm zone="graphviz gvcolor">
@@ -638,5 +639,5 @@
             provides a simple graph editor and viewer. It allows many
             graphs to be viewed at the same time. The text of each
-            graph is displayed in its own text window.
+            graph is displayed in its own text window
           </para>
           <indexterm zone="graphviz gvedit">
@@ -651,5 +652,5 @@
           <para>
             generates a variety of simple, regularly-structured
-            abstract graphs.
+            abstract graphs
           </para>
           <indexterm zone="graphviz gvgen">
@@ -666,5 +667,5 @@
             clusters and produces a rendering of the graph as
             a geographic-style map, with clusters highlighted,
-            in xdot format.
+            in xdot format
           </para>
           <indexterm zone="graphviz gvmap">
@@ -678,5 +679,5 @@
         <listitem>
           <para>
-            is a pipeline for running gvmap.
+            is a pipeline for running gvmap
           </para>
           <indexterm zone="graphviz gvmap.sh">
@@ -691,5 +692,5 @@
           <para>
             reads in a stream of graphs, combines the graphs into a single layout,
-            and produces a single graph serving as the union of the input graphs.
+            and produces a single graph serving as the union of the input graphs
           </para>
           <indexterm zone="graphviz gvpack">
@@ -706,5 +707,5 @@
             copies input graphs to its output, possibly transforming their
             structure and attributes, creating new graphs, or printing arbitrary
-            information.
+            information
           </para>
           <indexterm zone="graphviz gvpr">
@@ -722,8 +723,8 @@
             <command>gxl2dot</command> will deduce the type of conversion from
             the suffix of the input file, a
-            <filename class='extension'>.dot</filename> suffix causing a
+            <filename class="extension">.dot</filename> suffix causing a
             conversion from DOT to GXL, and a
-            <filename class='extension'>.gxl</filename> suffix causing a
-            conversion from GXL to DOT.
+            <filename class="extension">.gxl</filename> suffix causing a
+            conversion from GXL to DOT
           </para>
           <indexterm zone="graphviz gxl2dot">
@@ -738,5 +739,5 @@
           <para>
             converts between graphs represented in GXL and in
-            the GV language.
+            the GV language
           </para>
           <indexterm zone="graphviz gxl2gv">
@@ -750,5 +751,5 @@
         <listitem>
           <para>
-            is a two-view graphics editor for technical pictures.
+            is a two-view graphics editor for technical pictures
           </para>
           <indexterm zone="graphviz lefty">
@@ -764,5 +765,5 @@
             is a graph editor for the X Window System. It may be run as a
             standalone editor, or as a front end for applications that use
-            graphs. It can control multiple windows viewing different graphs.
+            graphs. It can control multiple windows viewing different graphs
           </para>
           <indexterm zone="graphviz lneato">
@@ -777,5 +778,5 @@
           <para>
             converts a sparse matrix of the Matrix Market format
-            to a graph in the GV (formerly DOT) format.
+            to a graph in the GV (formerly DOT) format
           </para>
           <indexterm zone="graphviz mm2gv">
@@ -792,5 +793,5 @@
             files must be formatted in the <command>dot</command>  attributed
             graph language. By default, the output of <command>neato</command>
-            is the input graph with layout coordinates appended.
+            is the input graph with layout coordinates appended
           </para>
           <indexterm zone="graphviz neato">
@@ -805,5 +806,5 @@
           <para>
             reads a stream of graphs and prints each in pretty-printed (canonical)
-            format on stdout. If no files are given, it reads from stdin.
+            format on stdout. If no files are given, it reads from stdin
           </para>
           <indexterm zone="graphviz nop">
@@ -818,5 +819,5 @@
           <para>
             draws clustered graphs. As input, it takes any
-            graph in the DOT format.
+            graph in the DOT format
           </para>
           <indexterm zone="graphviz osage">
@@ -831,5 +832,5 @@
           <para>
             draws clustered graphs using a squarified treemap layout.
-            As input, it takes any graph in the DOT format.
+            As input, it takes any graph in the DOT format
           </para>
           <indexterm zone="graphviz patchwork">
@@ -845,5 +846,5 @@
             reads directed graphs in the same format used by
             <command>dot</command> and removes subgraphs rooted at nodes
-            specified on the command line via options.
+            specified on the command line via options
           </para>
           <indexterm zone="graphviz prune">
@@ -860,5 +861,5 @@
             auxiliary map of the relationship between components. In this map,
             each component is collapsed into a node. The resulting graphs are
-            printed to stdout.
+            printed to stdout
           </para>
           <indexterm zone="graphviz sccmap">
@@ -874,5 +875,5 @@
             draws undirected graphs using the <quote>spring</quote> model,
             but it uses a multi-scale approach to produce layouts of large
-            graphs in a reasonably short time.
+            graphs in a reasonably short time
           </para>
           <indexterm zone="graphviz sfdp">
@@ -889,5 +890,5 @@
             prints the resulting graphs to standard output. This removes edges
             implied by transitivity. Nodes and subgraphs are not otherwise
-            affected.
+            affected
           </para>
           <indexterm zone="graphviz tred">
@@ -904,5 +905,5 @@
             chosen as the center and put at the origin. The remaining nodes are
             placed on a sequence of concentric circles centered about the origin,
-            each a fixed radial distance from the previous circle.
+            each a fixed radial distance from the previous circle
           </para>
           <indexterm zone="graphviz twopi">
@@ -918,5 +919,5 @@
             is a preprocessor to <command>dot</command> that is used to
             improve the aspect ratio of graphs having many leaves or disconnected
-            nodes. The usual layout for such a graph is generally very wide or tall.
+            nodes. The usual layout for such a graph is generally very wide or tall
           </para>
           <indexterm zone="graphviz unflatten">
@@ -932,5 +933,5 @@
             is a simple script which launches the <command>gvim</command>
             or <command>vim</command> editor along with a GUI window
-            showing the <command>dot</command> output of the edited file.
+            showing the <command>dot</command> output of the edited file
           </para>
           <indexterm zone="graphviz vimdot">
@@ -946,5 +947,5 @@
             manages run-time dictionaries using standard container data
             types: unordered set/multiset, ordered set/multiset, list, stack,
-            and queue.
+            and queue
           </para>
           <indexterm zone="graphviz libcdt">
@@ -960,5 +961,5 @@
             supports graph programming by maintaining graphs in memory and
             reading and writing graph files. Graphs are composed of nodes,
-            edges, and nested subgraphs.
+            edges, and nested subgraphs
           </para>
           <indexterm zone="graphviz libcgraph">
@@ -974,5 +975,5 @@
             provides a context for applications wishing to manipulate
             and render graphs. It provides a command line parsing,
-            common rendering code, and a plugin mechanism for renderers.
+            common rendering code, and a plugin mechanism for renderers
           </para>
           <indexterm zone="graphviz libgvc">
@@ -987,5 +988,5 @@
           <para>
             contains functions to find the shortest path between two points
-            in a simple polygon.
+            in a simple polygon
           </para>
           <indexterm zone="graphviz libpathplan">
@@ -1000,5 +1001,5 @@
           <para>
             provides support for parsing and deparsing graphical
-            operations specificed by the xdot language.
+            operations specificed by the xdot language
           </para>
           <indexterm zone="graphviz libxdot">
