Updated package list to match new versions / new packages.
[beastbuild.git] / build-docbook-catalog-2.diff
1 --- build-docbook-catalog-1.4   2009-05-17 10:49:37 +0000
2 +++ build-docbook-catalog       2009-05-17 17:36:40 +0000
3 @@ -9,15 +9,20 @@
4  # written by Aron Griffis
5  #
6  
7 -ROOTCATALOG=/etc/xml/catalog
8 -CATALOG=/etc/xml/docbook
9 -DOCBOOKDIR=/usr/share/sgml/docbook
10 +ROOTCATALOG="$(slashx , sh echo /etc/xml/catalog)"
11 +CATALOG="$(slashx , sh echo /etc/xml/docbook)"
12 +DOCBOOKDIR="$(slashx , sh echo /usr/share/sgml/docbook)"
13  DTDS=
14  LATEST_DTD=
15  LATEST_DATE=
16  VERBOSE=false
17  ZERO=${0##*/}
18  
19 +xmlcatalog()
20 +{
21 +    slashx '%!' xmlcatalog.exe "$@"
22 +}
23 +
24  #
25  # main (called from bottom)
26  #
27 @@ -119,8 +124,8 @@
28  
29         # dtd pointers
30         verb "  Populating ${ROOTCATALOG} with DTD delegates to ${CATALOG}"
31 -       xmlcatalog --noout --add "delegatePublic" "-//OASIS//ENTITIES DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
32 -       xmlcatalog --noout --add "delegatePublic" "-//OASIS//DTD DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
33 +       xmlcatalog --noout --add "delegatePublic" "-%!%!OASIS%!%!ENTITIES DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
34 +       xmlcatalog --noout --add "delegatePublic" "-%!%!OASIS%!%!DTD DocBook XML" "file://${CATALOG}" ${ROOTCATALOG}
35         xmlcatalog --noout --add "delegateSystem" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
36         xmlcatalog --noout --add "delegateURI" "http://www.oasis-open.org/docbook/" "file://${CATALOG}" ${ROOTCATALOG}
37  
38 @@ -160,14 +165,14 @@
39  
40         # Populate the docbook catalog with this version
41         verb "  Populating ${CATALOG} based on ${docbookdir}"
42 -       xmlcatalog --noout --add "public" "-//OASIS//ELEMENTS DocBook XML Information Pool V${v}//EN" "file://${docbookdir}/dbpoolx.mod" ${CATALOG}
43 -       xmlcatalog --noout --add "public" "-//OASIS//DTD DocBook XML V${v}//EN" "file://${docbookdir}/docbookx.dtd" ${CATALOG}
44 -       xmlcatalog --noout --add "public" "-//OASIS//ENTITIES DocBook XML Character Entities V${v}//EN" "file://${docbookdir}/dbcentx.mod" ${CATALOG}
45 -       xmlcatalog --noout --add "public" "-//OASIS//ENTITIES DocBook XML Notations V${v}//EN" "file://${docbookdir}/dbnotnx.mod" ${CATALOG}
46 -       xmlcatalog --noout --add "public" "-//OASIS//ENTITIES DocBook XML Additional General Entities V${v}//EN" "file://${docbookdir}/dbgenent.mod" ${CATALOG}
47 -       xmlcatalog --noout --add "public" "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${v}//EN" "file://${docbookdir}/dbhierx.mod" ${CATALOG}
48 -       xmlcatalog --noout --add "public" "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "file://${docbookdir}/soextblx.dtd" ${CATALOG}
49 -       xmlcatalog --noout --add "public" "-//OASIS//DTD DocBook XML CALS Table Model V${v}//EN" "file://${docbookdir}/calstblx.dtd" ${CATALOG}
50 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ELEMENTS DocBook XML Information Pool V${v}%!%!EN" "file://${docbookdir}/dbpoolx.mod" ${CATALOG}
51 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD DocBook XML V${v}%!%!EN" "file://${docbookdir}/docbookx.dtd" ${CATALOG}
52 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Character Entities V${v}%!%!EN" "file://${docbookdir}/dbcentx.mod" ${CATALOG}
53 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Notations V${v}%!%!EN" "file://${docbookdir}/dbnotnx.mod" ${CATALOG}
54 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ENTITIES DocBook XML Additional General Entities V${v}//EN" "file://${docbookdir}/dbgenent.mod" ${CATALOG}
55 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!ELEMENTS DocBook XML Document Hierarchy V${v}%!%!EN" "file://${docbookdir}/dbhierx.mod" ${CATALOG}
56 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD XML Exchange Table Model 19990315%!%!EN" "file://${docbookdir}/soextblx.dtd" ${CATALOG}
57 +       xmlcatalog --noout --add "public" "-%!%!OASIS%!%!DTD DocBook XML CALS Table Model V${v}%!%!EN" "file://${docbookdir}/calstblx.dtd" ${CATALOG}
58         xmlcatalog --noout --add "rewriteSystem" "http://www.oasis-open.org/docbook/xml/${v}" "file://${docbookdir}" ${CATALOG}
59         xmlcatalog --noout --add "rewriteURI" "http://www.oasis-open.org/docbook/xml/${v}" "file://${docbookdir}" ${CATALOG}
60