ports/53832: Switch to use xmlcatmgr: textproc/docbook-xml

[Hiroki Sato]

>Number:         53832
>Category:       ports
>Synopsis:       Switch to use xmlcatmgr: textproc/docbook-xml
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 27 05:20:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hiroki Sato
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org 4.8-STABLE FreeBSD 4.8-STABLE #7: Tue May 20 00:05:43 JST 2003     hrs at alph.allbsd.org:/home/obj/home/src/sys/ALPH  i386

>Description:
	Change this port to use textproc/xmlcatmgr and bump ${PORTREVISION}.
	This PR supersedes ports/52640 and please read the original PR
	for the motivation.


>How-To-Repeat:
	N/A

>Fix:

Index: docbook-xml/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xml/Makefile,v
retrieving revision 1.19
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.19 Makefile
--- docbook-xml/Makefile	22 Feb 2003 07:48:48 -0000	1.19
+++ docbook-xml/Makefile	27 Jun 2003 11:03:10 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	docbook-xml
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/xml/${PORTVERSION}/ \
 		http://www.oasis-open.org/committees/docbook/xml/${PORTVERSION}/
@@ -14,17 +15,21 @@
 MAINTAINER=	kuriyama at FreeBSD.org
 COMMENT=	XML version of the DocBook DTD
 
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_ZIP=	YES
 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
 PLIST_SUB=	DTD_VERSION=${PORTVERSION} \
-		MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
+		XMLCATMGR=${XMLCATMGR}\
+		DOCBOOKDIR=${DOCBOOKDIR}\
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
+		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
 
 DOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION}
-MKCATALOG=	${LOCALBASE}/sbin/mkcatalog
-CATALOG=	${PREFIX}/share/xml/catalog
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
 
 pre-install:
 	@[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent
@@ -35,6 +40,7 @@
 	done
 
 post-install:
-	${MKCATALOG} -q -c ${CATALOG} install docbook/${PORTVERSION} docbook.cat
+	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DOCBOOKDIR}/docbook.cat
+	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${DOCBOOKDIR}/catalog.xml
 
 .include <bsd.port.mk>
Index: docbook-xml/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-xml/pkg-plist,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.7 pkg-plist
--- docbook-xml/pkg-plist	9 Oct 2002 02:47:03 -0000	1.7
+++ docbook-xml/pkg-plist	27 Jun 2003 09:16:17 -0000
@@ -1,15 +1,17 @@
 share/xml/docbook/%%DTD_VERSION%%/ChangeLog
 share/xml/docbook/%%DTD_VERSION%%/README
 share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
+ at unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DOCBOOKDIR%%/catalog.xml
 share/xml/docbook/%%DTD_VERSION%%/catalog.xml
+ at exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DOCBOOKDIR%%/catalog.xml
 share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
 share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod
- at unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall docbook/%%DTD_VERSION%% docbook.cat
+ at unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DOCBOOKDIR%%/docbook.cat
 share/xml/docbook/%%DTD_VERSION%%/docbook.cat
- at exec %%MKCATALOG%% -q -c%%CATALOG%% install docbook/%%DTD_VERSION%% docbook.cat
+ at exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/docbook.cat
 share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd
 share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsa.ent
 share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsb.ent
>Release-Note:
>Audit-Trail:
>Unformatted: