ports/53822: Switch to use xmlcatmgr: textproc/tei-p4

[Hiroki Sato]

>Number:         53822
>Category:       ports
>Synopsis:       Switch to use xmlcatmgr: textproc/tei-p4
>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:13 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: tei-p4/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-p4/Makefile,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 Makefile
--- tei-p4/Makefile	20 Feb 2003 20:13:24 -0000	1.2
+++ tei-p4/Makefile	27 Jun 2003 11:04:49 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	tei
 PORTVERSION=	p4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/P4X/DTD/
 DISTNAME=	dtd
@@ -14,18 +15,21 @@
 MAINTAINER=	henrik.motakef at web.de
 COMMENT=	DTD of the Text Encoding Initiative
 
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \
-		MKCATALOG=${MKCATALOG}
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
+		DTDDIR=${DTDDIR} \
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
 DTD=		dtd.zip
 SGMLDIR=	${PREFIX}/share/sgml
 INSTDIR=	${SGMLDIR}/${PORTNAME}/${PORTVERSION}
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+DTDDIR=		${PORTNAME}/${PORTVERSION}
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 pre-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
@@ -35,9 +39,9 @@
 	${INSTALL_DATA} ${WRKSRC}/*.ent ${INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.dec ${INSTDIR}
 	${INSTALL_DATA} ${WRKSRC}/teicatalog.xml ${INSTDIR}
-	${SED} -e "s!&DTDpath;!${INSTDIR}/!" ${WRKSRC}/catalog.tei > ${INSTDIR}/catalog
+	${SED} -e "s!&DTDpath;!!" ${WRKSRC}/catalog.tei > ${INSTDIR}/catalog
 
 post-install:
-	@${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION}
+	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog 
 
 .include <bsd.port.mk>
Index: tei-p4/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-p4/pkg-plist,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 pkg-plist
--- tei-p4/pkg-plist	14 Jan 2003 04:49:25 -0000	1.2
+++ tei-p4/pkg-plist	27 Jun 2003 09:54:27 -0000
@@ -1,4 +1,4 @@
- at unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%%
+ at unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog
 share/sgml/tei/p4/dummy.dtd
 share/sgml/tei/p4/teicatalog.xml
 share/sgml/tei/p4/tei2.dtd
@@ -53,6 +53,6 @@
 share/sgml/tei/p4/teilite.dec
 share/sgml/tei/p4/teilitex.dec
 share/sgml/tei/p4/catalog
- at exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%%
+ at exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
 @dirrm share/sgml/tei/p4/
 @unexec rmdir %D/share/sgml/tei 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: