Less external dependencies for Git documentation build

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index b0dc35e73724f11f4ac98742493d10892c0776742e73c62319aa9a3e1c818638..b8d68ab9df6cbbff2d4a53800441654fac5ed96543795e5c7f5b77faa8c0ded7 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -6,6 +6,7 @@
 /apr-1.7.4.tar.bz2
 /apr-util-1.6.3.tar.bz2
 /aria2-1.37.0.tar.xz
+/asciidoc-10.2.1.tar.gz
 /at-spi2-atk-2.38.0.tar.xz
 /at-spi2-core-2.52.0.tar.xz
 /atk-2.38.0.tar.xz
@@ -33,7 +34,8 @@
 /dav1d-1.5.2.tar.zst
 /dav1d.git/
 /djvulibre-3.5.28.tar.gz
-/docbook-xsl-1.79.2.zip
+/docbook-xml-4.5.zip
+/docbook-xsl-1.79.1.tar.bz2
 /dq-20240101.tar.zst
 /dq.git/
 /expat-2.6.2.tar.xz

diff --git a/build/distfiles/asciidoc-10.2.1.tar.gz.meta4 b/build/distfiles/asciidoc-10.2.1.tar.gz.meta4
new file mode 100644 (file)
index 0000000..b7a61ce
--- /dev/null
+++ b/build/distfiles/asciidoc-10.2.1.tar.gz.meta4
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="asciidoc-10.2.1.tar.gz">
+    <hash type="blake3-256">4ee9c42f4ee7a114a8366057faba1fe6d41e7f51460d7f6a1463721ff6598598</hash>
+    <hash type="blake2b-512">7b2a65ac1923bd1514c0ce3a05cb6dc5b01a0c612f319ebf64ba6c01cf3df557e7e036fec4c457cef8ac90b8b97b40288de688cc7b3e5ff791eb91995d6a4af9</hash>
+    <hash type="blake2b-256">1de7315a82f2d256e9270977aa3c15e8fe281fd7c40b8e2a0b97e0cb61ca8fa0</hash>
+    <hash type="skein-512">3516f7bf03d48a68eb01f056a6425584974c5937169233a584dc07554f3f4ac9a8733844ea8dd33315a42c7839a8734fec19750a490df21ac9d37fe0c8a3970f</hash>
+    <hash type="sha-512">101b8f83dd0b79fbd43fa76c602658f5e200817eef87a02d21aa67e73edbc76466cfd3b914437866bd71fb4e65d91340a7c9ee260875c353b959d5783c696804</hash>
+    <hash type="sha-256">d9f13c285981b3c7eb660d02ca0a2779981e88d48105de81bb40445e60dddb83</hash>
+    <hash type="streebog-512">9fee752f5666cc4321f025febce99cff603c922dc0753a75bda483adf719fd398140329d59c78c380689e419e5ee23af3c26a6c5240608580a6ea7f8d237ed3c</hash>
+    <hash type="streebog-256">a23972ea479d5abaf9fbc9d1ca96de14d44194b1b5079f93a062b9bfd08b6e52</hash>
+    <hash type="xxh3-128">c4e1447c61586494aa66a5a370293d8f</hash>
+    <size>230179</size>
+    <url>https://files.pythonhosted.org/packages/1d/e7/315a82f2d256e9270977aa3c15e8fe281fd7c40b8e2a0b97e0cb61ca8fa0/asciidoc-10.2.1.tar.gz</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/docbook-xml-4.5.zip.meta4 b/build/distfiles/docbook-xml-4.5.zip.meta4
new file mode 100644 (file)
index 0000000..cf9cbb8
--- /dev/null
+++ b/build/distfiles/docbook-xml-4.5.zip.meta4
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="docbook-xml-4.5.zip">
+    <hash type="blake3-256">64d749cd899f01f6237387a357a2e1fe8accf7c098f92273955c95a5584d6d39</hash>
+    <hash type="blake2b-512">3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20</hash>
+    <hash type="blake2b-256">c9a9ffce344e82455f59b49e81f55ae0c85bccb790dd9c4c2af9bacdcbb66603</hash>
+    <hash type="skein-512">52861cbd88967a510fee18b57f1de818cda761151a7fe6d932bfda418f160b6b6d01d5cb87bdf7cea04a84b365f4d7afbcb8c4d47367a7df61091542f075751e</hash>
+    <hash type="sha-512">1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27</hash>
+    <hash type="sha-256">4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4</hash>
+    <hash type="streebog-512">772fddfd171ce51eb1618c3ccde4cf15ec63eeaca64a27862578208beccc906c311ad0a67392bbee896834f8d31b56f4d54b7b0f7d8779255763278921599007</hash>
+    <hash type="streebog-256">ab08c5642677237171b3e87ae0e2827cab757c71ee22b1f566020760af693eaf</hash>
+    <hash type="xxh3-128">1c72a180436423bb5a3c1ee8802403de</hash>
+    <size>98497</size>
+    <url>https://docbook.org/xml/4.5/docbook-xml-4.5.zip</url>
+    <url>http://distcache.FreeBSD.org/ports-distfiles/docbook-xml-4.5.zip</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/docbook-xsl-1.79.1.tar.bz2.meta4 b/build/distfiles/docbook-xsl-1.79.1.tar.bz2.meta4
new file mode 100644 (file)
index 0000000..57e1d9a
--- /dev/null
+++ b/build/distfiles/docbook-xsl-1.79.1.tar.bz2.meta4
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="docbook-xsl-1.79.1.tar.bz2">
+    <hash type="blake3-256">5d8a4782d480f1075c4c8204e33122c60ee70230bb1f19abe2dc5da52c856b93</hash>
+    <hash type="blake2b-512">42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b</hash>
+    <hash type="blake2b-256">6ef0967d2dbb54a20109a9363aa7971fc77ff35a23e0f114ea46b32af8115953</hash>
+    <hash type="skein-512">68bc8ea0b97885e81d81653cc30039c811a038e4711960bd4084b726f5a6eb86b51c5de02591334f29489d066130b703d4f39499d2b92a22a07314da1a7879fe</hash>
+    <hash type="sha-512">83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7</hash>
+    <hash type="sha-256">725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968</hash>
+    <hash type="streebog-512">06c3102d9a7e355e3eaf7aca28683a47b45c6382aa2979464fbe635394468e2a82cfaea9c384fce67d2e0563aeaea7fc45e04b68f32dfda9c01fc71b8c0b9aac</hash>
+    <hash type="streebog-256">a08617754e696a2e98b8ceb4c13d6d80c45b442fdb9525c6974c39d136e29315</hash>
+    <hash type="xxh3-128">a1fc3ccf3e174cc34fc0143f41401b95</hash>
+    <size>21967928</size>
+    <url>https://sourceforge.net/projects/docbook/files/docbook-xsl/1.79.1/docbook-xsl-1.79.1.tar.bz2/download</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/docbook-xsl-1.79.2.zip.meta4 b/build/distfiles/docbook-xsl-1.79.2.zip.meta4
deleted file mode 100644 (file)
index 25decb4..0000000
--- a/build/distfiles/docbook-xsl-1.79.2.zip.meta4
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="docbook-xsl-1.79.2.zip">
-    <hash type="blake3-256">d0fded395ad10f38a7125fe41d2bbff0afa5831c2ebea8b5d222acb1e23b23a2</hash>
-    <hash type="blake2b-512">6568b108669446baa4d6d54f048b57955c84076ec606036bb8387f3b77aef9dfb57b67dac84a42c1fe67dd423b91956c23d750397e7358a7bd41e75c4d05b6e8</hash>
-    <hash type="blake2b-256">b827e1c83f55c5ced628749d1bb6a47e9c665eadf28082b420b4d025e287f7b4</hash>
-    <hash type="skein-512">25c6897c832cd3780f19f25579aaddbed019d85c4b28f853ac0079dd55fddd4b1d54b98b10e8775407a7502d2ee679d715eb13b2a37a318a02e6c5352df20347</hash>
-    <hash type="shake128">3161fa4385e6a47fe10baefa61e13acb88629ba90c5852eb949d0db1de24f881</hash>
-    <hash type="shake256">46af8a60f607be9fe2e462ff8e823a7e937e47413822846810a7b106cc6b2239e7879c1e077908c3710fbfe1aefe35cbd0b74344b8acf8f6a7c011cb6fbd9533</hash>
-    <hash type="sha-512">94f3be0d462991949203b51b2b4d1d931f80c90cda16429056bdca89c30ae7639068873b012c667c0a88da01c5526461744bf31d76b388f84f3e5665271df973</hash>
-    <hash type="sha-256">853dce096f5b32fe0b157d8018d8fecf92022e9c79b5947a98b365679c7e31d7</hash>
-    <hash type="streebog-512">3ad7baea7d7a7b8b9e3ee1dadc6d55a19dff7edae4a4b4650c5e8d280d9f3b8e67d25e0971df5b2e7c0c298b8263f18cfa501b24fd4eac69ff17bfd0e6e88be1</hash>
-    <hash type="streebog-256">75f81acadad348d7803d2bed2734496b2c3f2e866f4bbf0f6b0f61934df72b03</hash>
-    <hash type="xxh3-128">758c952c2af2ec30d9a620e2def429f5</hash>
-    <size>25975988</size>
-    <url>https://github.com/docbook/xslt10-stylesheets/releases/download/release/1.79.2/docbook-xsl-1.79.2.zip</url>
-  </file>
-</metalink>

diff --git a/build/skel/devel/git-full-2.52.0.do b/build/skel/devel/git-full-2.52.0.do
index b79ad783bbbfc8bbf920d8c90ff203021ab07f6785e204dfa81bde6e7e10a98d..f059a7af011f6570522371d866fa60dab7c0018c7d84808d98c48e239e2ccf0c 100644 (file)
--- a/build/skel/devel/git-full-2.52.0.do
+++ b/build/skel/devel/git-full-2.52.0.do
@@ -9,15 +9,21 @@ archivers/zstd
 devel/gmake-4.4.1
 devel/pkgconf-2.1.1
 textproc/xmlto-0.0.26
+lang/Python-3.7.3
 "
 rdeps="
+textproc/expat-2.6.2
 devel/pcre2-10.44
 ftp/curl-with-tls-8.17.0
 lang/perl-5.32.1
 security/nettle-3.10.1
 "
 ver=${NAME#git-full-}
-redo-ifchange $bdeps "$DISTFILES"/git-$ver.tar.xz $rdeps
+redo-ifchange $bdeps $rdeps \
+    "$DISTFILES"/git-$ver.tar.xz \
+    "$DISTFILES"/asciidoc-10.2.1.tar.gz \
+    "$DISTFILES"/docbook-xml-4.5.zip \
+    "$DISTFILES"/docbook-xsl-1.79.1.tar.bz2
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
@@ -25,6 +31,23 @@ hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 $TAR xf "$DISTFILES"/git-$ver.tar.xz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
+python3 -m venv venv >&2
+. venv/bin/activate
+$TAR xf "$DISTFILES"/asciidoc-10.2.1.tar.gz
+cd asciidoc-10.2.1
+pip install . >&2
+
+cd ..
+mkdir docbook-xml-4.5
+cd docbook-xml-4.5
+$TAR xf "$DISTFILES"/docbook-xml-4.5.zip
+cd ..
+$TAR xf "$DISTFILES"/docbook-xsl-1.79.1.tar.bz2
+xmlcatmgr -c catalog.xml create
+xmlcatmgr -c catalog.xml add nextCatalog $(realpath docbook-xml-4.5/catalog.xml)
+xmlcatmgr -c catalog.xml add nextCatalog $(realpath docbook-xsl-1.79.1/catalog.xml)
+export XML_CATALOG_FILES=$(realpath catalog.xml)
+
 cd git-$ver
 export USE_LIBPCRE=1 BLK_SHA1=1 NETTLE_SHA256=1 NO_TCLTK=1
 gmake -j$MAKE_JOBS \

diff --git a/build/skel/multimedia/mkvtoolnix-58.0.0.do b/build/skel/multimedia/mkvtoolnix-58.0.0.do
index c543edb8e95dd3fc56886865ff08206a26274337072da6e3840def3a24f3ad45..d092e690e78172de9ebdde9043ca8d16f2c60a7857fd362fc8ee0667650a4241 100644 (file)
--- a/build/skel/multimedia/mkvtoolnix-58.0.0.do
+++ b/build/skel/multimedia/mkvtoolnix-58.0.0.do
@@ -16,13 +16,13 @@ audio/libvorbis-1.3.7
 devel/pcre2-10.44
 multimedia/libmatroska-1.7.1
 "
-xsl=docbook-xsl-1.79.2
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz "$DISTFILES"/$xsl.zip $rdeps
+xsl=docbook-xsl-1.79.1
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz "$DISTFILES"/$xsl.tar.bz2 $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
 . ./rc
-$TAR xf "$DISTFILES"/$xsl.zip
+$TAR xf "$DISTFILES"/$xsl.tar.bz2
 $TAR xf "$DISTFILES"/$NAME.tar.xz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh