docbook-xsl: fix rewrites for non-ns sourceforge URLs

It was routing them to the namespaced style sheets, which resulted, for
example, in broken man pages in xmlto.

Route old SF URLs to nons, and add rewrites in the nons catalog to handle those
old URLs.

Also some cleanup

Author: lazka

mingw-w64-docbook-xsl/0001-add-back-old-uri-rewrite.patch

@@ -4,7 +4,7 @@ _realname=docbook-xsl
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.79.2
-pkgrel=8
+pkgrel=9
 pkgdesc='XML stylesheets for Docbook-xml transformations (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -16,11 +16,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-docbook-xml")
 install=${_realname}-${MSYSTEM}.install
 source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F${pkgver}/docbook-xsl{,-nons}-${pkgver}.tar.gz
-        "0001-add-back-old-uri-rewrite.patch"
         "0002-fix-infinity.patch")
 sha256sums=('966188d7c05fc76eaca115a55893e643dd01a3486f6368733c9ad974fcee7a26'
             'f89425b44e48aad24319a2f0d38e0cb6059fdc7dbaf31787c8346c748175ca8e'
-            '1aef3b01c69cce3552614033cdee9d26e4d6b3770cdf7d62b4055f9062adb9c0'
             '4a27dd468bb803290b73aeb3a0fde190a1897b97945b59eaf39d8535bb6332a5')
 
 # Helper macros to help make tasks easier #
@@ -46,7 +44,7 @@ prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
 
   msg2 "${_realname}-${pkgver}"
-  apply_patch_with_msg 0001-add-back-old-uri-rewrite.patch \
+  apply_patch_with_msg \
     0002-fix-infinity.patch
 
   cd "${srcdir}"/${_realname}-nons-${pkgver}
@@ -59,7 +57,7 @@ prepare() {
 package() {
   cd "${srcdir}"
   mkdir -p "$pkgdir${MINGW_PREFIX}/etc/xml"
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --create "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
+  xmlcatalog --noout --create "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
 
   local pkgroot ns dir
   for ns in -nons ''; do
@@ -79,45 +77,43 @@ package() {
     )
   done
 
-  # sf nons version
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateURI \
-      "http://docbook.sourceforge.net/release/xsl/" \
-      "../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateSystem \
-      "http://docbook.sourceforge.net/release/xsl/" \
-      "../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
-
-  # sf ns version
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateURI \
-      "http://docbook.sourceforge.net/release/xsl-ns/" \
-      "../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateSystem \
-      "http://docbook.sourceforge.net/release/xsl-ns/" \
-      "../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
+  local nons_catalog="${pkgdir}${MINGW_PREFIX}/share/xml/docbook/xsl-stylesheets-nons-$pkgver/catalog.xml"
+  local catalog="${pkgdir}${MINGW_PREFIX}/share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml"
 
-  # cdn ns version
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateURI \
-      "http://cdn.docbook.org/release/xsl/" \
-      "../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateSystem \
-      "http://cdn.docbook.org/release/xsl/" \
-      "../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
+  # rewrites: <catalog> <scheme-base>
+  #   SF 'xsl/'   + CDN 'xsl-nons/' -> non-namespaced catalog
+  #   SF 'xsl-ns/' + CDN 'xsl/'     -> namespaced catalog
+  local rewrites=(
+    "$nons_catalog|http://docbook.sourceforge.net/release/xsl"
+    "$nons_catalog|http://cdn.docbook.org/release/xsl-nons"
+    "$catalog|http://docbook.sourceforge.net/release/xsl-ns"
+    "$catalog|http://cdn.docbook.org/release/xsl"
+  )
+  for entry in "${rewrites[@]}"; do
+    cat=${entry%%|*}
+    base=${entry#*|}
+    for ver in current "$pkgver"; do
+      xmlcatalog --noout --add rewriteURI    "$base/$ver/" "./" "$cat"
+      xmlcatalog --noout --add rewriteSystem "$base/$ver/" "./" "$cat"
+    done
+  done
 
-  # cdn nons version
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateURI \
-      "http://cdn.docbook.org/release/xsl-nons/" \
-      "../../share/xml/docbook/xsl-stylesheets-nons-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
-  ${MINGW_PREFIX}/bin/xmlcatalog --noout --add delegateSystem \
-      "http://cdn.docbook.org/release/xsl-nons/" \
-      "../../share/xml/docbook/xsl-stylesheets-nons-$pkgver/catalog.xml" \
-      "${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
+  # delegations: <scheme-base> <target-catalog-relative-path>
+  local rootcat="${pkgdir}${MINGW_PREFIX}/etc/xml/docbook-xsl"
+  local nons_rel="../../share/xml/docbook/xsl-stylesheets-nons-$pkgver/catalog.xml"
+  local ns_rel="../../share/xml/docbook/xsl-stylesheets-$pkgver/catalog.xml"
+  local delegations=(
+    "http://docbook.sourceforge.net/release/xsl/|$nons_rel"
+    "http://cdn.docbook.org/release/xsl-nons/|$nons_rel"
+    "http://docbook.sourceforge.net/release/xsl-ns/|$ns_rel"
+    "http://cdn.docbook.org/release/xsl/|$ns_rel"
+  )
+  for entry in "${delegations[@]}"; do
+    from=${entry%%|*}
+    target=${entry#*|}
+    xmlcatalog --noout --add delegateURI    "$from" "$target" "$rootcat"
+    xmlcatalog --noout --add delegateSystem "$from" "$target" "$rootcat"
+  done
 
   install -Dt "$pkgdir${MINGW_PREFIX}/share/licenses/$pkgname" -m644 $dir/COPYING
 }