From f480fc5ddc678ce6adff6a92ad77705458cfa511 Mon Sep 17 00:00:00 2001
From: Ronald Garcia <rxg@cs.ubc.ca>
Date: Sat, 12 Mar 2011 16:58:52 +0000
Subject: [PATCH] FOP 1.0 is broken, so I found a working link to FOP 0.94.
 curl was mis-naming docbook-xsl-*.tar.gz.  Changing the form of the URL seems
 to do the trick (remove the "/download" part).

[SVN r69895]
---
 setup_boostbook.py | 5 +++--
 setup_boostbook.sh | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/setup_boostbook.py b/setup_boostbook.py
index ac45bc0..b06736a 100644
--- a/setup_boostbook.py
+++ b/setup_boostbook.py
@@ -13,9 +13,10 @@
 # (MAINTANERS: please, keep in synch with setup_boostbook.sh)
 DOCBOOK_XSL_VERSION = "1.75.2"
 DOCBOOK_DTD_VERSION = "4.2"
-FOP_VERSION = "1.0"
+FOP_VERSION = "0.94"
 FOP_JDK_VERSION="1.4"
-FOP_MIRROR = "http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries"
+# FOP_MIRROR = "http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries"
+FOP_MIRROR = "http://archive.apache.org/dist/xmlgraphics/fop/binaries/"
 SOURCEFORGE_DOWNLOAD = "http://sourceforge.net/projects/docbook/files"
 
 # No user configuration below this point-------------------------------------
diff --git a/setup_boostbook.sh b/setup_boostbook.sh
index c40b056..0e79031 100644
--- a/setup_boostbook.sh
+++ b/setup_boostbook.sh
@@ -9,9 +9,10 @@
 # (MAINTANERS: please, keep in synch with setup_boostbook.py)
 DOCBOOK_XSL_VERSION=1.75.2
 DOCBOOK_DTD_VERSION=4.2
-FOP_VERSION=1.0
+FOP_VERSION=0.94
 FOP_JDK_VERSION=1.4
-FOP_MIRROR=http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries
+# FOP_MIRROR=http://mirrors.ibiblio.org/pub/mirrors/apache/xmlgraphics/fop/binaries
+FOP_MIRROR=http://archive.apache.org/dist/xmlgraphics/fop/binaries/
 SOURCEFORGE_DOWNLOAD=http://sourceforge.net/projects/docbook/files/
 HTTP_GET_CMD="curl -O -L"
 
@@ -19,7 +20,7 @@ HTTP_GET_CMD="curl -O -L"
 
 # Get the DocBook XSLT Stylesheets
 DOCBOOK_XSL_TARBALL=docbook-xsl-$DOCBOOK_XSL_VERSION.tar.gz
-DOCBOOK_XSL_URL=$SOURCEFORGE_DOWNLOAD/docbook-xsl/$DOCBOOK_XSL_VERSION/$DOCBOOK_XSL_TARBALL/download
+DOCBOOK_XSL_URL=$SOURCEFORGE_DOWNLOAD/docbook-xsl/$DOCBOOK_XSL_VERSION/$DOCBOOK_XSL_TARBALL
 if test -f $DOCBOOK_XSL_TARBALL; then
   echo "Using existing DocBook XSLT Stylesheets (version $DOCBOOK_XSL_VERSION)."
 else