diff options
| author | jmmv <jmmv@pkgsrc.org> | 2006-04-18 14:11:29 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2006-04-18 14:11:29 +0000 |
| commit | daf7b80209435cb2930bd549e8176e640944e0a0 (patch) | |
| tree | 40b0fa010a8b4d447ece11b3c085ada1c86f9c4d /textproc | |
| parent | dde5220caec428c6cc53b2cda76333e0de524df4 (diff) | |
| download | pkgsrc-daf7b80209435cb2930bd549e8176e640944e0a0.tar.gz | |
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 (limited to 'textproc')
| -rw-r--r-- | textproc/docbook-xml/Makefile | 15 | ||||
| -rw-r--r-- | textproc/docbook-xml/PLIST | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile index 48e7db21d4e..2e0a9068567 100644 --- a/textproc/docbook-xml/Makefile +++ b/textproc/docbook-xml/Makefile @@ -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 @@ DTDDIR= ${INSTDIR}/docbook 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 -XML_CATALOGS+= ${DTDDIR}/4.2/catalog-4.1.2 +# 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 --git a/textproc/docbook-xml/PLIST b/textproc/docbook-xml/PLIST index 56c21d406e2..28d7764100e 100644 --- a/textproc/docbook-xml/PLIST +++ b/textproc/docbook-xml/PLIST @@ -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 @@ share/xml/docbook/4.2/soextblx.dtd @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 |