[pkgsrc/trunk]: pkgsrc/textproc/docbook-xml Narrow the scope of the rewriteSy...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd7ea7817729
branches:  trunk
changeset: 511615:cd7ea7817729
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Apr 18 14:11:29 2006 +0000

description:
Narrow the scope of the rewriteSystem entries added to the catalog so that
they only affect the installed Docbook versions.  Avoids possible conflicts
with other packages as happened with docbook-simple.  Bump PKGREVISION.

diffstat:

 textproc/docbook-xml/Makefile |  15 ++++++++++++---
 textproc/docbook-xml/PLIST    |   4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r aadcee9fe81f -r cd7ea7817729 textproc/docbook-xml/Makefile
--- a/textproc/docbook-xml/Makefile     Tue Apr 18 14:10:22 2006 +0000
+++ b/textproc/docbook-xml/Makefile     Tue Apr 18 14:11:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/01 14:43:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/18 14:11:29 jmmv Exp $
 #
 
 DISTNAME=      docbook-xml-4.4
@@ -28,14 +28,23 @@
 VER=           4.2 4.3 4.4
 
 XML_CATALOGS=
+XML_ENTRIES=
 .for ver in ${VER}
 XML_CATALOGS+= ${DTDDIR}/${ver}/catalog
+XML_ENTRIES+=  rewriteSystem http://www.oasis-open.org/docbook/xml/${ver} \
+               ${DTDDIR}/${ver}
 .endfor
+
+# 4.2 is backwards-compatible with 4.1.2, so we just make 4.1.2 be an alias
+# for 4.2.
 XML_CATALOGS+= ${DTDDIR}/4.2/catalog-4.1.2
-
 XML_ENTRIES+=  rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 \
                ${DTDDIR}/4.2
-XML_ENTRIES+=  rewriteSystem http://www.oasis-open.org/docbook/xml ${DTDDIR}
+
+# share/xml/docbook is shared with docbook-simple.
+PRINT_PLIST_AWK+=      /^@dirrm share\/xml\/docbook$$/ \
+                       { print "@unexec $${RMDIR} %D/share/xml/docbook" \
+                         " >/dev/null 2>&1"; next }
 
 pre-install:
 .for ver in ${VER}
diff -r aadcee9fe81f -r cd7ea7817729 textproc/docbook-xml/PLIST
--- a/textproc/docbook-xml/PLIST        Tue Apr 18 14:10:22 2006 +0000
+++ b/textproc/docbook-xml/PLIST        Tue Apr 18 14:11:29 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/10/02 15:04:41 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/04/18 14:11:29 jmmv Exp $
 share/xml/docbook/4.4/ChangeLog
 share/xml/docbook/4.4/README
 share/xml/docbook/4.4/calstblx.dtd
@@ -102,5 +102,5 @@
 @dirrm share/xml/docbook/4.3
 @dirrm share/xml/docbook/4.2/ent
 @dirrm share/xml/docbook/4.2
-@dirrm share/xml/docbook
+@unexec ${RMDIR} %D/share/xml/docbook >/dev/null 2>&1 || ${TRUE}
 @comment in xmlcatmgr: @dirrm share/xml