I was building something that needs docbook-4.3, so I updated the docbook
port to install it. I don't really understand the SGML / XML catalog
stuff, so I just imitated the 4.2 catalog code, and this seems to work
fine.
Docbook is actually up to version 4.4, but the ports makefile has run out
of MASTER_SITESs. Someone with more ports-fu than I will need to look at
that, at some point.
Other than that, this is a pretty straightforward version bump.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/docbook/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile 22 Sep 2005 12:28:54 -0000 1.20
+++ Makefile 15 Jul 2006 21:21:57 -0000
@@ -2,8 +2,8 @@
COMMENT= "technical documentation XML/SGML definitions"
-DISTNAME= docbook-4.2
-PKGNAME= ${DISTNAME}p2
+DISTNAME= docbook-4.3
+PKGNAME= ${DISTNAME}p0
DIST_SUBDIR= docbook
CATEGORIES= textproc
@@ -19,9 +19,10 @@
MASTER_SITES5= ${ROOT_SITE}/xml/4.1/ ${MIRROR_SITE}/xml/4.1/
MASTER_SITES6= ${ROOT_SITE}/xml/4.1.2/ ${MIRROR_SITE}/xml/4.1.2/
MASTER_SITES7= ${ROOT_SITE}/xml/4.2/ ${MIRROR_SITE}/xml/4.2/
-MASTER_SITES8= http://www.docbook.org/tdg/
+MASTER_SITES8= ${ROOT_SITE}/xml/4.3/ ${MIRROR_SITE}/xml/4.3/
+MASTER_SITES9= http://www.docbook.org/tdg/
-DISTFILES= docbk241.zip:0 docbk30.zip:1 docbk31.zip:2 docbk40.zip:3
docbk41.zip:4 docbkx41.zip:5 docbkx412.zip:6 docbook-xml-4.2.zip:7
examples.zip:8
+DISTFILES= docbk241.zip:0 docbk30.zip:1 docbk31.zip:2 docbk40.zip:3
docbk41.zip:4 docbkx41.zip:5 docbkx412.zip:6 docbook-xml-4.2.zip:7
docbook-xml-4.3.zip:8 examples.zip:9
# permission granted in dtd copyright notice
PERMIT_PACKAGE_CDROM= Yes
@@ -34,7 +35,7 @@
SEPARATE_BUILD= concurrent
SGML_VERSIONS= 2.4.1 3.0 3.1 4.0 4.1
-XML_VERSIONS= 4.1 4.1.2 4.2
+XML_VERSIONS= 4.1 4.1.2 4.2 4.3
SGML_INSTDIR= ${PREFIX}/share/sgml/docbook
XML_INSTDIR= ${PREFIX}/share/xml/docbook
@@ -50,6 +51,7 @@
# new naming system for recent docbook versions
EXTRACT_CASES+= *docbook-xml-4.2.zip) unzip -qa
${FULLDISTDIR}/$$archive -d ${WRKDIR}/x4.2;;
+EXTRACT_CASES+= *docbook-xml-4.3.zip) unzip -qa
${FULLDISTDIR}/$$archive -d ${WRKDIR}/x4.3;;
do-install:
${INSTALL_DATA_DIR} ${SGML_INSTDIR} ${XML_INSTDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/docbook/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Jan 2005 17:34:19 -0000 1.4
+++ distinfo 15 Jul 2006 21:21:57 -0000
@@ -15,6 +15,7 @@
RMD160 (docbook/docbkx41.zip) = 574e68b6c59025f1e386f24871d198229a1a1a41
RMD160 (docbook/docbkx412.zip) = 89af805434b21f12f7be7ef58cf52edeb458e0c9
RMD160 (docbook/docbook-xml-4.2.zip) = 3ba17bf96ab2ab8fe6dc9ff82da8e22aaf9ce5e0
+RMD160 (docbook/docbook-xml-4.3.zip) = deeb29ed336bcce6ed199c516f01bb1542ea16ee
RMD160 (docbook/examples.zip) = c0ea55453979e1a20d9b390ccaf9847e8933f79d
SHA1 (docbook/docbk241.zip) = fb314ca2a1eddef2c1e2db3eb3ffd15feff2f865
SHA1 (docbook/docbk30.zip) = 83b22b248ed17e686df3a04494ac696b9710e5af
@@ -24,6 +25,7 @@
SHA1 (docbook/docbkx41.zip) = 0b4c6d8228f4526185de51b8afbcfe0ec8939849
SHA1 (docbook/docbkx412.zip) = b9ae7a41056bfaf885581812d60651b7b5531519
SHA1 (docbook/docbook-xml-4.2.zip) = 5e3a35663cd028c5c5fbb959c3858fec2d7f8b9e
+SHA1 (docbook/docbook-xml-4.3.zip) = e79a59e9164c1013b8cc9f64f96f909a184ca016
SHA1 (docbook/examples.zip) = f6cff1f835bb8a8134e85e35d56f1ebecc976f23
SIZE (docbook/docbk241.zip) = 55653
SIZE (docbook/docbk30.zip) = 43441
@@ -33,4 +35,5 @@
SIZE (docbook/docbkx41.zip) = 74627
SIZE (docbook/docbkx412.zip) = 75683
SIZE (docbook/docbook-xml-4.2.zip) = 78428
+SIZE (docbook/docbook-xml-4.3.zip) = 83865
SIZE (docbook/examples.zip) = 59246
Index: files/makemastercatalog
===================================================================
RCS file: /cvs/ports/textproc/docbook/files/makemastercatalog,v
retrieving revision 1.1
diff -u -r1.1 makemastercatalog
--- files/makemastercatalog 17 Jun 2003 16:20:04 -0000 1.1
+++ files/makemastercatalog 15 Jul 2006 21:21:57 -0000
@@ -29,12 +29,12 @@
CATALOG=$PREFIX/share/xml/docbook/catalog.xml
docbookdir=file://$TRUEPREFIX/share/xml/docbook
-latestdbdir=$docbookdir/4.2
+latestdbdir=$docbookdir/4.3
isodir=$latestdbdir/ent
$TRUEPREFIX/bin/xmlcatalog --noout --create $CATALOG
-for v in 4.2 4.1.2 4.1; do
+for v in 4.3 4.2 4.1.2 4.1; do
# DocBook driver file
$TRUEPREFIX/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V$v//EN" \
Index: files/xml_db43_catalog
===================================================================
RCS file: files/xml_db43_catalog
diff -N files/xml_db43_catalog
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/xml_db43_catalog 15 Jul 2006 21:21:58 -0000
@@ -0,0 +1,29 @@
+PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "docbookx.dtd"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" "calstblx.dtd"
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" "dbpoolx.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" "dbhierx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN"
"dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.3//EN" "dbnotnx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" "dbcentx.mod"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
"ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
"ent/iso-grk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
"ent/iso-amsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
"ent/iso-amsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
"ent/iso-amsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
"ent/iso-amsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
"ent/iso-amso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
"ent/iso-amsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
"ent/iso-box.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
"ent/iso-cyr2.ent"
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; "docbookx.dtd"
Index: files/xml_db_catalog
===================================================================
RCS file: /cvs/ports/textproc/docbook/files/xml_db_catalog,v
retrieving revision 1.2
diff -u -r1.2 xml_db_catalog
--- files/xml_db_catalog 28 May 2003 00:10:56 -0000 1.2
+++ files/xml_db_catalog 15 Jul 2006 21:21:58 -0000
@@ -1,3 +1,4 @@
CATALOG "4.1/catalog"
CATALOG "4.1.2/catalog"
CATALOG "4.2/catalog"
+CATALOG "4.3/catalog"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/docbook/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 4 Sep 2005 23:38:18 -0000 1.10
+++ pkg/PLIST 15 Jul 2006 21:21:58 -0000
@@ -192,6 +192,39 @@
share/xml/docbook/4.2/ent/iso-pub.ent
share/xml/docbook/4.2/ent/iso-tech.ent
share/xml/docbook/4.2/soextblx.dtd
+share/xml/docbook/4.3/
+share/xml/docbook/4.3/calstblx.dtd
+share/xml/docbook/4.3/catalog
+share/xml/docbook/4.3/catalog.xml
+share/xml/docbook/4.3/dbcentx.mod
+share/xml/docbook/4.3/dbgenent.mod
+share/xml/docbook/4.3/dbhierx.mod
+share/xml/docbook/4.3/dbnotnx.mod
+share/xml/docbook/4.3/dbpoolx.mod
+share/xml/docbook/4.3/docbook.cat
+share/xml/docbook/4.3/docbookx.dtd
+share/xml/docbook/4.3/ent/
+share/xml/docbook/4.3/ent/iso-amsa.ent
+share/xml/docbook/4.3/ent/iso-amsb.ent
+share/xml/docbook/4.3/ent/iso-amsc.ent
+share/xml/docbook/4.3/ent/iso-amsn.ent
+share/xml/docbook/4.3/ent/iso-amso.ent
+share/xml/docbook/4.3/ent/iso-amsr.ent
+share/xml/docbook/4.3/ent/iso-box.ent
+share/xml/docbook/4.3/ent/iso-cyr1.ent
+share/xml/docbook/4.3/ent/iso-cyr2.ent
+share/xml/docbook/4.3/ent/iso-dia.ent
+share/xml/docbook/4.3/ent/iso-grk1.ent
+share/xml/docbook/4.3/ent/iso-grk2.ent
+share/xml/docbook/4.3/ent/iso-grk3.ent
+share/xml/docbook/4.3/ent/iso-grk4.ent
+share/xml/docbook/4.3/ent/iso-lat1.ent
+share/xml/docbook/4.3/ent/iso-lat2.ent
+share/xml/docbook/4.3/ent/iso-num.ent
+share/xml/docbook/4.3/ent/iso-pub.ent
+share/xml/docbook/4.3/ent/iso-tech.ent
+share/xml/docbook/4.3/htmltblx.mod
+share/xml/docbook/4.3/soextblx.dtd
share/xml/docbook/catalog
share/xml/docbook/catalog.xml
share/libxml2/docbook.spec
