On 2010/12/03 09:53, viq wrote:
> I am looking at some software (rabbitmq 2.1.1) which during build
> processes some files using xslt, and for that it epects docbook 4.5 dtd
> files - which we don't have, so it fetches them, which obviously fails
> if systrace is being used. Since I know next to nothing about docbook,
> xslt and rest of family, my uneducated guess was that the "easiest" way
> to fix it is to update docbook to 4.5 so we'll have the dtd files on
> disk and won't need to fetch them. Thus my question - did anyone think
> about updating docbook?
> Or, alternatively, any idea how to approach the above problem?
updating to 4.5 (or really, adding the 4.5 files to the port) makes
sense - please try this diff.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/docbook/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 20 Nov 2010 19:56:48 -0000 1.25
+++ Makefile 3 Dec 2010 09:07:25 -0000
@@ -4,8 +4,7 @@ PKG_ARCH= *
COMMENT= technical documentation XML/SGML definitions
-DISTNAME= docbook-4.4
-REVISION = 0
+DISTNAME= docbook-4.5
DIST_SUBDIR= docbook
CATEGORIES= textproc
@@ -24,6 +23,7 @@ DISTFILES= sgml/2.4.1/docbk241.zip \
xml/4.2/docbook-xml-4.2.zip \
xml/4.3/docbook-xml-4.3.zip \
xml/4.4/docbook-xml-4.4.zip \
+ xml/4.5/docbook-xml-4.5.zip \
examples.zip:0
# permission granted in dtd copyright notice
@@ -38,7 +38,7 @@ SEPARATE_BUILD= concurrent
SGML_VERSIONS= 2.4.1 3.0 3.1 4.0 4.1
XML_VERSIONS_OLD= 4.1 4.1.2
-XML_VERSIONS_NEW= 4.2 4.3 4.4
+XML_VERSIONS_NEW= 4.2 4.3 4.4 4.5
SGML_INSTDIR= ${PREFIX}/share/sgml/docbook
XML_INSTDIR= ${PREFIX}/share/xml/docbook
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/docbook/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 5 Apr 2007 17:26:15 -0000 1.6
+++ distinfo 3 Dec 2010 09:09:05 -0000
@@ -9,6 +9,7 @@ MD5 (docbook/xml/4.1/docbkx41.zip) = kK/
MD5 (docbook/xml/4.2/docbook-xml-4.2.zip) = c/5Q3+dMpjHBYC9VjtiWHw==
MD5 (docbook/xml/4.3/docbook-xml-4.3.zip) = qyACArnhNqFE2x4IZMRQdA==
MD5 (docbook/xml/4.4/docbook-xml-4.4.zip) = y7BOmnAJVdiMUJYu8iwWNA==
+MD5 (docbook/xml/4.5/docbook-xml-4.5.zip) = Awg+KI6Hp+gp5Dc1jafvng==
RMD160 (docbook/examples.zip) = wOpVRTl54aINmzkMyvmEfokz950=
RMD160 (docbook/sgml/2.4.1/docbk241.zip) = inh1jUDaZLsMwBCscTY00HHpA5Q=
RMD160 (docbook/sgml/3.0/docbk30.zip) = KfI2DA7u8PFnzrAt2R734S8AQTY=
@@ -20,6 +21,7 @@ RMD160 (docbook/xml/4.1/docbkx41.zip) =
RMD160 (docbook/xml/4.2/docbook-xml-4.2.zip) = O6F7+Wqyq4/m3J/4LajiKq+c5eA=
RMD160 (docbook/xml/4.3/docbook-xml-4.3.zip) = 3usp7TNrzObtGZxRbwG7FULqFu4=
RMD160 (docbook/xml/4.4/docbook-xml-4.4.zip) = aRqSMEQr4U0BmvnQfpTyaYJNhcw=
+RMD160 (docbook/xml/4.5/docbook-xml-4.5.zip) = cjNH7xeVDFyOgafJ1EgSJh3K3F0=
SHA1 (docbook/examples.zip) = 9s/x+DW7ioE06F411W8evsyXbyM=
SHA1 (docbook/sgml/2.4.1/docbk241.zip) = +zFMoqHt3vLB4ts+s//RX+/y+GU=
SHA1 (docbook/sgml/3.0/docbk30.zip) = g7IrJI7Rfmht86BElKxpa5cQ5a8=
@@ -31,6 +33,7 @@ SHA1 (docbook/xml/4.1/docbkx41.zip) = C0
SHA1 (docbook/xml/4.2/docbook-xml-4.2.zip) = Xjo1ZjzQKMXF+7lZw4WP7C1/i54=
SHA1 (docbook/xml/4.3/docbook-xml-4.3.zip) = 55pZ6RZMEBO4zJ9k+W+QmhhMoBY=
SHA1 (docbook/xml/4.4/docbook-xml-4.4.zip) = fE2RyCrTdH4bVgDJF4J1jl2Rwis=
+SHA1 (docbook/xml/4.5/docbook-xml-4.5.zip) = uRJCM7UGaPtQh3OqKz68Yx18FiA=
SHA256 (docbook/examples.zip) = +sNVgFbNS2yL42WXJGm2E7VxtPazUo8ByQN77EvC3xs=
SHA256 (docbook/sgml/2.4.1/docbk241.zip) =
26wGlOm8rsQ8q4DHVf+wLPj2E794X/hQbl7XLvp2onI=
SHA256 (docbook/sgml/3.0/docbk30.zip) =
7Pccvo3brXSU/1INW07fc6QowLFZF4ywy2GcumheYcY=
@@ -42,6 +45,7 @@ SHA256 (docbook/xml/4.1/docbkx41.zip) =
SHA256 (docbook/xml/4.2/docbook-xml-4.2.zip) =
rMRgHk+XoZYHa35ks2jZJIsHx6vyazSgLMpA7uvmD6I=
SHA256 (docbook/xml/4.3/docbook-xml-4.3.zip) =
IwaKlOpv1ISwBMWnPsNqZqpH6o8Na2LMFpWTH1wUNGQ=
SHA256 (docbook/xml/4.4/docbook-xml-4.4.zip) =
AvFZ64jEJU2V6DHFHBRLGGOyFtkJtf9FdDoc5vUnMJA=
+SHA256 (docbook/xml/4.5/docbook-xml-4.5.zip) =
Tk4DeiuDyYxslIGDkNS90/bhD27GLdeRiFlOJhkNx7Q=
SIZE (docbook/examples.zip) = 59246
SIZE (docbook/sgml/2.4.1/docbk241.zip) = 55653
SIZE (docbook/sgml/3.0/docbk30.zip) = 43441
@@ -53,3 +57,4 @@ SIZE (docbook/xml/4.1/docbkx41.zip) = 74
SIZE (docbook/xml/4.2/docbook-xml-4.2.zip) = 78428
SIZE (docbook/xml/4.3/docbook-xml-4.3.zip) = 83865
SIZE (docbook/xml/4.4/docbook-xml-4.4.zip) = 96107
+SIZE (docbook/xml/4.5/docbook-xml-4.5.zip) = 98497
Index: files/makemastercatalog
===================================================================
RCS file: /cvs/ports/textproc/docbook/files/makemastercatalog,v
retrieving revision 1.2
diff -u -p -r1.2 makemastercatalog
--- files/makemastercatalog 1 Aug 2006 06:34:15 -0000 1.2
+++ files/makemastercatalog 3 Dec 2010 09:07:44 -0000
@@ -29,12 +29,12 @@
CATALOG=$PREFIX/share/xml/docbook/catalog.xml
docbookdir=file://$TRUEPREFIX/share/xml/docbook
-latestdbdir=$docbookdir/4.4
+latestdbdir=$docbookdir/4.5
isodir=$latestdbdir/ent
$TRUEPREFIX/bin/xmlcatalog --noout --create $CATALOG
-for v in 4.4 4.3 4.2 4.1.2 4.1; do
+for v in 4.5 4.4 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_db45_catalog
===================================================================
RCS file: files/xml_db45_catalog
diff -N files/xml_db45_catalog
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/xml_db45_catalog 3 Dec 2010 09:18:01 -0000
@@ -0,0 +1,29 @@
+PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "docbookx.dtd"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5//EN" "calstblx.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" "htmltblx.mod"
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN" "dbpoolx.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN" "dbhierx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
"dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.5//EN" "dbnotnx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" "dbcentx.mod"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/isodia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
"ent/isonum.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/isopub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/isotech.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/isolat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/isolat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/isogrk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/isogrk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/isogrk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
"ent/isogrk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
"ent/isoamsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
"ent/isoamsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
"ent/isoamsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated
Relations//EN//XML" "ent/isoamsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
"ent/isoamso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
"ent/isoamsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/isobox.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/isocyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
"ent/isocyr2.ent"
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; "docbookx.dtd"
Index: files/xml_db_catalog
===================================================================
RCS file: /cvs/ports/textproc/docbook/files/xml_db_catalog,v
retrieving revision 1.3
diff -u -p -r1.3 xml_db_catalog
--- files/xml_db_catalog 1 Aug 2006 06:34:15 -0000 1.3
+++ files/xml_db_catalog 3 Dec 2010 09:08:07 -0000
@@ -3,3 +3,4 @@ CATALOG "4.1.2/catalog"
CATALOG "4.2/catalog"
CATALOG "4.3/catalog"
CATALOG "4.4/catalog"
+CATALOG "4.5/catalog"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/docbook/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 20 Mar 2010 17:06:45 -0000 1.12
+++ pkg/PLIST 3 Dec 2010 09:19:27 -0000
@@ -259,6 +259,40 @@ share/xml/docbook/4.4/ent/isopub.ent
share/xml/docbook/4.4/ent/isotech.ent
share/xml/docbook/4.4/htmltblx.mod
share/xml/docbook/4.4/soextblx.dtd
+share/xml/docbook/4.5/
+share/xml/docbook/4.5/calstblx.dtd
+share/xml/docbook/4.5/catalog
+share/xml/docbook/4.5/catalog.xml
+share/xml/docbook/4.5/dbcentx.mod
+share/xml/docbook/4.5/dbgenent.mod
+share/xml/docbook/4.5/dbhierx.mod
+share/xml/docbook/4.5/dbnotnx.mod
+share/xml/docbook/4.5/dbpoolx.mod
+share/xml/docbook/4.5/docbook.cat
+share/xml/docbook/4.5/docbookx.dtd
+share/xml/docbook/4.5/ent/
+share/xml/docbook/4.5/ent/README
+share/xml/docbook/4.5/ent/isoamsa.ent
+share/xml/docbook/4.5/ent/isoamsb.ent
+share/xml/docbook/4.5/ent/isoamsc.ent
+share/xml/docbook/4.5/ent/isoamsn.ent
+share/xml/docbook/4.5/ent/isoamso.ent
+share/xml/docbook/4.5/ent/isoamsr.ent
+share/xml/docbook/4.5/ent/isobox.ent
+share/xml/docbook/4.5/ent/isocyr1.ent
+share/xml/docbook/4.5/ent/isocyr2.ent
+share/xml/docbook/4.5/ent/isodia.ent
+share/xml/docbook/4.5/ent/isogrk1.ent
+share/xml/docbook/4.5/ent/isogrk2.ent
+share/xml/docbook/4.5/ent/isogrk3.ent
+share/xml/docbook/4.5/ent/isogrk4.ent
+share/xml/docbook/4.5/ent/isolat1.ent
+share/xml/docbook/4.5/ent/isolat2.ent
+share/xml/docbook/4.5/ent/isonum.ent
+share/xml/docbook/4.5/ent/isopub.ent
+share/xml/docbook/4.5/ent/isotech.ent
+share/xml/docbook/4.5/htmltblx.mod
+share/xml/docbook/4.5/soextblx.dtd
share/xml/docbook/catalog
share/xml/docbook/catalog.xml
share/libxml2/docbook.spec
