Index: 4.5/Makefile
===================================================================
--- 4.5/Makefile (revision 120)
+++ 4.5/Makefile (revision 121)
@@ -55,7 +55,7 @@
SOURCE_REQUIRES = sources/packages/a/linuxdoc-tools/docbook-xml/4.x
-REQUIRES = libs/libxml2/2.9.9
+REQUIRES = libs/libxml2/2.11.4
REQUIRES += share/sgml-common/0.6.3
# ======= __END_OF_REQUIRES__ =======
@@ -128,7 +128,7 @@
$(build_target): $(src_done)
@mkdir -p $(DTD_PKG)
- # ====== Create DTD v$(version) catalog ======
+ # ======= Create DTD v$(version) catalog =======
@mkdir -pm755 $(DTD_PKG)/usr/share/xml/docbook/xml-dtd-$(version)
@( cd $(SRC_DIR) ; \
chmod 0644 *.dtd *.mod ; \
@@ -138,7 +138,7 @@
$(install_target): $(build_target)
@mkdir -pm755 $(DTD_PKG)/etc/xml
- # ====== Populate /etc/xml/docbook ======
+ # ======= Populate /etc/xml/docbook =======
@xmlcatalog --noout --create $(DTD_PKG)/etc/xml/docbook
@for xmldtdver in `for r in $(version) ; do echo "$$r" ; done | sort -V | uniq` ; do \
xmlcatalog --noout --add "public" \
@@ -200,7 +200,7 @@
"file:///usr/share/xml/docbook/xml-dtd-$(version)" \
$(DTD_PKG)/etc/xml/docbook ; \
done
- # ====== Populate /etc/xml/catalog ======
+ # ======= Populate /etc/xml/catalog =======
@xmlcatalog --noout --create $(DTD_PKG)/etc/xml/catalog
@for xmldtdver in `for r in $(version) ; do echo "$$r" ; done | sort -V | uniq` ; do \
xmlcatalog --noout --add "delegatePublic" \
Index: 4.5/docbook-xml-pkg-install.sh
===================================================================
--- 4.5/docbook-xml-pkg-install.sh (revision 120)
+++ 4.5/docbook-xml-pkg-install.sh (revision 121)
@@ -61,7 +61,9 @@
# arg 1: the old package version
post_remove() {
- xmlcatalog --noout --del file:///etc/xml/docbook etc/xml/catalog
+ if [ -e etc/xml/catalog ]; then
+ xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
+ fi
}