From 70ce4673db7bee716fb8d4595fee070117b6f086 Mon Sep 17 00:00:00 2001
From: "wurblzap%gmail.com" <>
Date: Sun, 13 Apr 2008 03:25:58 +0000
Subject: [PATCH] =?utf8?q?Bug=20428637=20=C3=A2=C2=80=C2=93=20Documentatio?=
 =?utf8?q?n=20doesn't=20build=20(and=20even=20less=20on=20Perl=205.10).=20?=
 =?utf8?q?Patch=20by=20Marc=20Schumann=20<wurblzap@gmail.com>;=20r=3DLpSol?=
 =?utf8?q?it;=20a=3Dmkanat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 docs/makedocs.pl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index b636a2f37a..cf77b3ebac 100644
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -72,9 +72,11 @@ foreach my $module (@$modules, @$opt_modules)
     print ENTITIES '<!ENTITY min-' . $name . '-ver "'.$version.'">' . "\n";
 }
 
-# CGI is a special case, because it has an optional version *and* a required
-# version.
-my ($cgi_opt) = grep($_->{package} eq 'CGI', @$opt_modules);
+# CGI is a special case, because for Perl versions below 5.10, it has an
+# optional version *and* a required version.
+# We check @opt_modules first, then @modules, and pick the first we get.
+# We'll get the optional one then, if it is given, otherwise the required one.
+my ($cgi_opt) = grep($_->{module} eq 'CGI', @$opt_modules, @$modules);
 print ENTITIES '<!ENTITY min-mp-cgi-ver "' . $cgi_opt->{version} . '">' . "\n";
 
 print ENTITIES "\n <!-- Database Versions --> \n";
@@ -82,7 +84,8 @@ print ENTITIES "\n <!-- Database Versions --> \n";
 my $db_modules = DB_MODULE;
 foreach my $db (keys %$db_modules) {
     my $dbd  = $db_modules->{$db}->{dbd};
-    my $name = $dbd->{package};
+    my $name = $dbd->{module};
+    $name =~ s/::/-/g;
     $name = lc($name);
     my $version    = $dbd->{version} || 'any';
     my $db_version = $db_modules->{$db}->{'db_version'};
-- 
2.47.3