From 554d0a9cca691d0dbc0b7179e7bb47dc253a82bd Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Mon, 24 Dec 2012 12:52:08 -0600
Subject: docbook: install catalog.xml for v4.1.2

Fixes #16717.
---
 Library/Formula/docbook.rb | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/docbook.rb b/Library/Formula/docbook.rb
index 302476259..6e9a351d3 100644
--- a/Library/Formula/docbook.rb
+++ b/Library/Formula/docbook.rb
@@ -6,8 +6,10 @@ class Docbook < Formula
   sha1 '49f274e67efdee771300cba4da1f3e4bc00be1ec'
 
   def install
-    packages = [Docbookxml412,
-                Docbookxml42,
+    # Install 4.1.2 *after* 4.2, because we need to borrow the catalog.xml
+    # file from the 4.2 package.
+    packages = [Docbookxml42,
+                Docbookxml412,
                 Docbookxml43,
                 Docbookxml44,
                 Docbookxml45,
@@ -15,13 +17,13 @@ class Docbook < Formula
                 Docbookxsl,
                 Docbookxslns]
 
-    (etc+'xml').mkpath
+    (etc/'xml').mkpath
     system "xmlcatalog", "--noout", "--create", "#{etc}/xml/catalog"
 
     packages.each do |pkg|
       pkg.new.brew do |f|
         f.install
-        catalog = prefix+f.catalog+'catalog.xml'
+        catalog = prefix/f.catalog/'catalog.xml'
         system "xmlcatalog", "--noout", "--del",
                              "file://#{catalog}", "#{etc}/xml/catalog"
         system "xmlcatalog", "--noout", "--add", "nextCatalog",
@@ -43,16 +45,29 @@ class Docbookxml < Formula
   def install
     rm_rf 'docs'
     docbook = Formula.factory 'docbook'
-    (docbook.prefix+'docbook/xml'+version).install Dir['*']
+    (docbook.prefix/'docbook/xml'/version).install Dir['*']
   end
 
-  def catalog; 'docbook/xml/'+version; end
+  def catalog
+    "docbook/xml/#{version}"
+  end
 end
 
 class Docbookxml412 < Docbookxml
   url 'http://www.docbook.org/xml/4.1.2/docbkx412.zip'
   sha1 'b9ae7a41056bfaf885581812d60651b7b5531519'
   version '4.1.2'
+
+  def install
+    cp Formula.factory('docbook').prefix/'docbook/xml/4.2/catalog.xml', 'catalog.xml'
+
+    inreplace 'catalog.xml' do |s|
+      s.gsub! 'V4.2 ..', 'V4.1.2 '
+      s.gsub! '4.2', '4.1.2'
+    end
+
+    super
+  end
 end
 
 class Docbookxml42 < Docbookxml
@@ -91,10 +106,12 @@ class Docbookxsl < Formula
                    htmlhelp images javahelp lib manpages params profiling roundtrip
                    slides template tools website xhtml xhtml-1_1]
     docbook = Formula.factory 'docbook'
-    (docbook.prefix+'docbook/xsl'+version).install xsl_files + doc_files
+    (docbook.prefix/'docbook/xsl'/version).install xsl_files + doc_files
   end
 
-  def catalog; 'docbook/xsl/'+version; end
+  def catalog
+    "docbook/xsl/#{version}"
+  end
 end
 
 class Docbookxslns < Formula
@@ -109,8 +126,10 @@ class Docbookxslns < Formula
                    params profiling roundtrip slides template tests tools webhelp
                    website xhtml xhtml-1_1 xhtml5]
     docbook = Formula.factory 'docbook'
-    (docbook.prefix+'docbook/xsl-ns'+version).install xsl_files + doc_files
+    (docbook.prefix/'docbook/xsl-ns'/version).install xsl_files + doc_files
   end
 
-  def catalog; 'docbook/xsl-ns/'+version; end
+  def catalog
+    "docbook/xsl-ns/#{version}"
+  end
 end
-- 
cgit v1.2.3