Add a new keywork xmlcatmgr

It simplifies the handling of the XML and SMGL catalog
It brings a big of consistency by always specifying the catalog path absolute
instead of mixing absolute and relative path.
The keyword is also written a PKG_ROOTDIR friendly to simplify cross installing

Reviewed by:	hrs
Differential Revision:	https://reviews.freebsd.org/D6539

3 files changed, 26 insertions, 57 deletions

diff --git a/textproc/xhtml-basic/Makefile b/textproc/xhtml-basic/Makefile
index 642f7c836f73..d007d3c25149 100644
--- a/textproc/xhtml-basic/Makefile
+++ b/textproc/xhtml-basic/Makefile
@@ -12,7 +12,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	W3C's XHTML Basic DTD
 
-RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr \
+OPTIONS_DEFINE=	DOCS
+
+RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr \
 		${LOCALBASE}/share/xml/dtd/xhtml-modularization/catalog.xml:textproc/xhtml-modularization
 
 RECDATE=	20001219
@@ -21,56 +23,33 @@ NO_MTREE=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/REC-${PORTNAME}-${RECDATE}
 
-PLIST=		${WRKDIR}/PLIST
-dir_DTD=	share/xml/dtd/xhtml-basic
-dir_DOC=	share/doc/xhtml-basic
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-XMLCAT=		${PREFIX}/share/xml/catalog.ports
-
-XMLCAT_ADD=	${XMLCATMGR} -c ${XMLCAT} add nextCatalog \
-		    ${PREFIX}/${dir_DTD}/catalog.xml
-XMLCAT_RM=	${XMLCATMGR} -c ${XMLCAT} remove \
-		    ${PREFIX}/${dir_DTD}/catalog.xml
-SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
-		    ${PREFIX}/${dir_DTD}/xhtml-basic10.cat
-SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove \
-		    ${PREFIX}/${dir_DTD}/xhtml-basic10.cat
+PORTDATA=	xhtml-basic10-model-1.mod \
+		xhtml-basic10.cat \
+		xhtml-basic10.dtd \
+		xml1.dcl
 
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
+PLIST_FILES+=	%%DATADIR%%/catalog.xml
 
-.include "${.CURDIR}/contents.inc"
+PORTDOCS=	Overview.html \
+		W3C-REC.css \
+		logo-REC.png \
+		w3c_home.png \
+		xhtml-basic.css
 
-# I'd much rather do this stuff in line with the actual installation
-# in do-install, but the PLIST must be generated in pre-install.
-pre-install:
-	${CAT} /dev/null > ${PLIST}
-.for f in ${contents_DTD}
-	${ECHO} ${dir_DTD}/${f} >> ${PLIST}
-.endfor
-.for f in ${contents_DOC}
-	${ECHO} ${dir_DOC}/${f} >> ${PLIST}
-.endfor
-	${ECHO} ${dir_DTD}/catalog.xml >> ${PLIST}
-	${ECHO} "@unexec ${XMLCAT_RM}" >> ${PLIST}
-	${ECHO} "@exec ${XMLCAT_ADD}" >> ${PLIST}
-	${ECHO} "@unexec ${SGMLCAT_RM}" >> ${PLIST}
-	${ECHO} "@exec ${SGMLCAT_ADD}" >> ${PLIST}
-	${ECHO} '@unexec rmdir %D/share/xml/dtd 2>/dev/null || true' >> \
-	    ${PLIST}
+SUB_FILES=	catalog.xml
+DATADIR=	${PREFIX}/share/xml/dtd/xhtml-basic
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DOC}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${contents_DTD} \
-		${STAGEDIR}${PREFIX}/${dir_DTD})
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${contents_DOC} \
-		${STAGEDIR}${PREFIX}/${dir_DOC})
-	${SED} -e "s;@@PREFIX@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \
-	    ${WRKDIR}/catalog.xml
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDATA} \
+		${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${WRKDIR}/catalog.xml \
-		${STAGEDIR}${PREFIX}/${dir_DTD}/catalog.xml
+		${STAGEDIR}${DATADIR}/catalog.xml
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR})
+
 
 .include <bsd.port.mk>
diff --git a/textproc/xhtml-basic/contents.inc b/textproc/xhtml-basic/contents.inc
deleted file mode 100644
index b49c08018da7..000000000000
--- a/textproc/xhtml-basic/contents.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-contents_DTD+= xhtml-basic10-model-1.mod
-contents_DTD+= xhtml-basic10.cat
-contents_DTD+= xhtml-basic10.dtd
-contents_DTD+= xml1.dcl
-
-contents_DOC+= Overview.html
-contents_DOC+= W3C-REC.css
-contents_DOC+= logo-REC.png
-contents_DOC+= w3c_home.png
-contents_DOC+= xhtml-basic.css
diff --git a/textproc/xhtml-basic/files/catalog.xml b/textproc/xhtml-basic/files/catalog.xml.in
index f8d03f71ebd9..091bbff934d1 100644
--- a/textproc/xhtml-basic/files/catalog.xml
+++ b/textproc/xhtml-basic/files/catalog.xml.in
@@ -4,7 +4,7 @@
 
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
   prefer="public"
-  xml:base="file://@@PREFIX@@/share/xml/dtd/xhtml-basic/">
+  xml:base="file://%%PREFIX%%/share/xml/dtd/xhtml-basic/">
 
   <rewriteSystem
     systemIdStartString="http://www.w3.org/TR/xhtml-basic/"