From f4f5b30abe69d1da16c739eb932e3af8c82de689 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 18 Apr 2006 14:10:22 +0000
Subject: Make the installed files mimic the public URL naming scheme and add
 an appropriate rewriteSystem entry to the catalog.  Bump PKGREVISION.

Fixes the build of htdocs after a similar rewriteSystem entry was added
to docbook-xml.
---
 textproc/docbook-simple/Makefile | 15 +++++++++++----
 textproc/docbook-simple/PLIST    | 28 ++++++++++++++++------------
 2 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'textproc/docbook-simple')

diff --git a/textproc/docbook-simple/Makefile b/textproc/docbook-simple/Makefile
index 07a174d932a..583e2cefee0 100644
--- a/textproc/docbook-simple/Makefile
+++ b/textproc/docbook-simple/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/21 06:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/18 14:10:22 jmmv Exp $
 #
 
 DISTNAME=	docbook-simple-1.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://docbook.org/xml/simple/1.1/
 EXTRACT_SUFX=	.zip
@@ -17,13 +17,20 @@ NO_BUILD=	YES
 
 WRKSRC=		${WRKDIR}
 INSTDIR=	${DESTDIR}${PREFIX}/share/xml
-DTDDIR=		${INSTDIR}/docbook-simple
+DTDDIR=		${INSTDIR}/docbook/simple/1.1
 DTDFILES=	sdbcent.mod sdocbook-custom.dtd sdocbookref-custom.dtd \
 		sdbhier.mod sdocbookref.dtd sdbpool.mod sdocbook.dtd \
 		sinclist.mod
 MISCFILES=	sdocbook.css
 
-XML_CATALOGS=	${PREFIX}/share/xml/docbook-simple/catalog.xml
+XML_CATALOGS=	${DTDDIR}/catalog.xml
+XML_ENTRIES=	rewriteSystem http://www.oasis-open.org/docbook/xml/simple/1.1 \
+		${DTDDIR}
+
+# share/xml/docbook is shared with docbook-xml.
+PRINT_PLIST_AWK+=	/^@dirrm share\/xml\/docbook$$/ \
+			{ print "@unexec $${RMDIR} %D/share/xml/docbook" \
+			  " >/dev/null 2>&1"; next }
 
 do-install:
 	${INSTALL_DATA_DIR} ${DTDDIR}
diff --git a/textproc/docbook-simple/PLIST b/textproc/docbook-simple/PLIST
index d882b310c13..7fb0a218921 100644
--- a/textproc/docbook-simple/PLIST
+++ b/textproc/docbook-simple/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/05 19:20:45 hrs Exp $
-share/xml/docbook-simple/catalog.xml
-share/xml/docbook-simple/sdbcent.mod
-share/xml/docbook-simple/sdbhier.mod
-share/xml/docbook-simple/sdbpool.mod
-share/xml/docbook-simple/sdocbook-custom.dtd
-share/xml/docbook-simple/sdocbook.css
-share/xml/docbook-simple/sdocbook.dtd
-share/xml/docbook-simple/sdocbookref-custom.dtd
-share/xml/docbook-simple/sdocbookref.dtd
-share/xml/docbook-simple/sinclist.mod
-@dirrm share/xml/docbook-simple
+@comment $NetBSD: PLIST,v 1.4 2006/04/18 14:10:22 jmmv Exp $
+@comment in xmlcatmgr: share/xml/catalog
+share/xml/docbook/simple/${PKGVERSION}/catalog.xml
+share/xml/docbook/simple/${PKGVERSION}/sdbcent.mod
+share/xml/docbook/simple/${PKGVERSION}/sdbhier.mod
+share/xml/docbook/simple/${PKGVERSION}/sdbpool.mod
+share/xml/docbook/simple/${PKGVERSION}/sdocbook-custom.dtd
+share/xml/docbook/simple/${PKGVERSION}/sdocbook.css
+share/xml/docbook/simple/${PKGVERSION}/sdocbook.dtd
+share/xml/docbook/simple/${PKGVERSION}/sdocbookref-custom.dtd
+share/xml/docbook/simple/${PKGVERSION}/sdocbookref.dtd
+share/xml/docbook/simple/${PKGVERSION}/sinclist.mod
+@dirrm share/xml/docbook/simple/${PKGVERSION}
+@dirrm share/xml/docbook/simple
+@unexec ${RMDIR} %D/share/xml/docbook >/dev/null 2>&1 || ${TRUE}
+@comment in xmlcatmgr: @dirrm share/xml
-- 
cgit v1.2.3