Updated package list to match new versions / new packages.
[beastbuild.git] / build-docbook-catalog-3.diff
1 --- build-docbook-catalog-1.4   2009-05-17 19:28:55 +0000
2 +++ build-docbook-catalog       2009-05-17 19:54:18 +0000
3 @@ -108,7 +108,7 @@
4                 verb "Found XML Catalog root ${ROOTCATALOG}"
5                 # clean out existing entries
6                 verb "  Cleaning existing ${CATALOG} delegates from ${ROOTCATALOG}"
7 -               clean_catalog "file://${CATALOG}" ${ROOTCATALOG}
8 +               clean_catalog "file:///${CATALOG}" ${ROOTCATALOG}
9         fi
10  
11         if [[ ! -r ${CATALOG} ]] ; then
12 @@ -124,14 +124,14 @@
13  
14         # dtd pointers
15         verb "  Populating ${ROOTCATALOG} with DTD delegates to ${CATALOG}"
16 -       xmlcatalog --noout --add "delegatePublic" "-%!%!OASIS%!%!ENTITIES DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
17 -       xmlcatalog --noout --add "delegatePublic" "-%!%!OASIS%!%!DTD DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
18 -       xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
19 -       xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
20 +       xmlcatalog --noout --add "delegatePublic" "-%!%!OASIS%!%!ENTITIES DocBook XML" "file:///${CATALOG}" ${ROOTCATALOG}
21 +       xmlcatalog --noout --add "delegatePublic" "-%!%!OASIS%!%!DTD DocBook XML" "file:///${CATALOG}" ${ROOTCATALOG}
22 +       xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file:///${CATALOG}" ${ROOTCATALOG}
23 +       xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file:///${CATALOG}" ${ROOTCATALOG}
24  
25         # entities pointer
26         verb "  Populating ${ROOTCATALOG} with ISO entities delegate to ${CATALOG}"
27 -       xmlcatalog --noout --add "delegatePublic" "ISO 8879:1986" "file://${CATALOG}" ${ROOTCATALOG}
28 +       xmlcatalog --noout --add "delegatePublic" "ISO 8879:1986" "file:///${CATALOG}" ${ROOTCATALOG}
29  }
30  
31  #
32 @@ -165,16 +165,16 @@
33  
34         # Populate the docbook catalog with this version
35         verb "  Populating ${CATALOG} based on ${docbookdir}"
36 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ELEMENTS DocBook XML Information Pool V${v}%!%!EN" "file://${docbookdir}/dbpoolx.mod" ${CATALOG}
37 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD DocBook XML V${v}%!%!EN" "file://${docbookdir}/docbookx.dtd" ${CATALOG}
38 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Character Entities V${v}%!%!EN" "file://${docbookdir}/dbcentx.mod" ${CATALOG}
39 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Notations V${v}%!%!EN" "file://${docbookdir}/dbnotnx.mod" ${CATALOG}
40 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Additional General Entities V${v}//EN" "file://${docbookdir}/dbgenent.mod" ${CATALOG}
41 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ELEMENTS DocBook XML Document Hierarchy V${v}%!%!EN" "file://${docbookdir}/dbhierx.mod" ${CATALOG}
42 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD XML Exchange Table Model 19990315%!%!EN" "file://${docbookdir}/soextblx.dtd" ${CATALOG}
43 -       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD DocBook XML CALS Table Model V${v}%!%!EN" "file://${docbookdir}/calstblx.dtd" ${CATALOG}
44 -       xmlcatalog --noout --add "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${v}" "file://${docbookdir}" ${CATALOG}
45 -       xmlcatalog --noout --add "rewriteURI" "http://www.oasis-open.org/docbook/xml/${v}" "file://${docbookdir}" ${CATALOG}
46 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ELEMENTS DocBook XML Information Pool V${v}%!%!EN" "file:///${docbookdir}/dbpoolx.mod" ${CATALOG}
47 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD DocBook XML V${v}%!%!EN" "file:///${docbookdir}/docbookx.dtd" ${CATALOG}
48 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Character Entities V${v}%!%!EN" "file:///${docbookdir}/dbcentx.mod" ${CATALOG}
49 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Notations V${v}%!%!EN" "file:///${docbookdir}/dbnotnx.mod" ${CATALOG}
50 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Additional General Entities V${v}//EN" "file:///${docbookdir}/dbgenent.mod" ${CATALOG}
51 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ELEMENTS DocBook XML Document Hierarchy V${v}%!%!EN" "file:///${docbookdir}/dbhierx.mod" ${CATALOG}
52 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD XML Exchange Table Model 19990315%!%!EN" "file:///${docbookdir}/soextblx.dtd" ${CATALOG}
53 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD DocBook XML CALS Table Model V${v}%!%!EN" "file:///${docbookdir}/calstblx.dtd" ${CATALOG}
54 +       xmlcatalog --noout --add "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${v}" "file:///${docbookdir}" ${CATALOG}
55 +       xmlcatalog --noout --add "rewriteURI" "http://www.oasis-open.org/docbook/xml/${v}" "file:///${docbookdir}" ${CATALOG}
56  
57         # grab the RCS date from docbookx.dtd for comparison purposes
58         if [[ ! -f ${docbookdir}/ent/iso-lat1.ent ]]; then
59 @@ -254,7 +254,7 @@
60                         let i=i+2
61                 elif [[ ${entities[i]} == ${avail[j]} ]]; then
62                         xmlcatalog --noout --add "public" "${entities[i+1]}" \
63 -                               "file://${isodir}/${entities[i]}" ${CATALOG}
64 +                               "file:///${isodir}/${entities[i]}" ${CATALOG}
65                         let j=j+1
66                         let i=i+2
67                 else
68 @@ -293,12 +293,12 @@
69         echo "Found DocBook XSL stylesheets (${type}) in ${xsldir}"
70  
71         verb "  Populating ${ROOTCATALOG} with XSL delegations"
72 -       xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG}
73 -       xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/${type}/" "file://${CATALOG}" ${ROOTCATALOG}
74 +       xmlcatalog --noout --add "delegateSystem" "http://docbook.sourceforge.net/release/${type}/" "file:///${CATALOG}" ${ROOTCATALOG}
75 +       xmlcatalog --noout --add "delegateURI" "http://docbook.sourceforge.net/release/${type}/" "file:///${CATALOG}" ${ROOTCATALOG}
76  
77         verb "  Populating ${CATALOG} with XSL stylesheets"
78 -       xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG}
79 -       xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/current" "file://${xsldir}" ${CATALOG}
80 +       xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/${type}/current" "file:///${xsldir}" ${CATALOG}
81 +       xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/${type}/current" "file:///${xsldir}" ${CATALOG}
82  }
83  
84  # Call the main routine