From hrs@allbsd.org  Fri Jun 27 05:16:26 2003
Return-Path: <hrs@allbsd.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3EDFA37B407
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 27 Jun 2003 05:16:24 -0700 (PDT)
Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EA05043FFD
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 27 Jun 2003 05:16:19 -0700 (PDT)
	(envelope-from hrs@allbsd.org)
Received: from mail.d.allbsd.org (p19167-adsao12honb4-acca.tokyo.ocn.ne.jp [219.165.47.167])
	by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id C537B3652
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 27 Jun 2003 21:16:18 +0900 (JST)
Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10])
	by mail.d.allbsd.org (8.12.9/3.7W/DomainMaster) with ESMTP id h5RCChSI040784
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 27 Jun 2003 21:12:44 +0900 (JST)
	(envelope-from hrs@allbsd.org)
Received: from alph.allbsd.org (localhost [127.0.0.1])
	by alph.allbsd.org (8.12.9/8.12.9) with ESMTP id h5RCCf5I002879
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 27 Jun 2003 21:12:41 +0900 (JST)
	(envelope-from hrs@alph.d.allbsd.org)
Received: (from hrs@localhost)
	by alph.allbsd.org (8.12.9/8.12.9/Submit) id h5RCCfTM002878;
	Fri, 27 Jun 2003 21:12:41 +0900 (JST)
Message-Id: <200306271212.h5RCCfTM002878@alph.allbsd.org>
Date: Fri, 27 Jun 2003 21:12:41 +0900 (JST)
From: Hiroki Sato <hrs@freebsd.org>
Reply-To: Hiroki Sato <hrs@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Switch to use xmlcatmgr: textproc/tei-lite
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53826
>Category:       ports
>Synopsis:       Switch to use xmlcatmgr: textproc/tei-lite
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 27 05:20:15 PDT 2003
>Closed-Date:    Mon Jun 30 23:23:27 PDT 2003
>Last-Modified:  Mon Jun 30 23:23:27 PDT 2003
>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@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-lite/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-lite/Makefile,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 Makefile
--- tei-lite/Makefile	21 Feb 2003 13:42:47 -0000	1.2
+++ tei-lite/Makefile	27 Jun 2003 11:04:35 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	tei
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tei-c.org/Lite/DTD/
 PKGNAMESUFFIX=	-lite
@@ -16,22 +17,24 @@
 MAINTAINER=	henrik.motakef@web.de
 COMMENT=	SGML version of the TEI-Lite DTD
 
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 NO_BUILD=	yes
-PLIST_SUB=	MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+=	DTDDIR=${DTDDIR}
+PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 INSTDIR=	${PREFIX}/share/sgml/tei/lite
-CATALOG=	${PREFIX}/share/sgml/catalog
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+DTDDIR=		${PORTNAME}/lite
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 do-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
 	@${INSTALL_DATA} ${DISTDIR}/teilite.dtd ${INSTDIR}
 	@${INSTALL_DATA} ${DISTDIR}/teilite.tag ${INSTDIR}
-	@${SED} -e 's!%%INSTDIR%%!${INSTDIR}!' ${FILESDIR}/catalog \
-	  > ${INSTDIR}/catalog
+	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}
 
 post-install:
-	@${MKCATALOG} -q -c ${CATALOG} install ${PORTNAME}/lite
+	${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog 
 
 .include <bsd.port.mk>
Index: tei-lite/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-lite/pkg-plist,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 pkg-plist
--- tei-lite/pkg-plist	22 Feb 2003 03:18:50 -0000	1.2
+++ tei-lite/pkg-plist	27 Jun 2003 09:46:16 -0000
@@ -1,7 +1,7 @@
-@unexec %%MKCATALOG%% -q -c %%CATALOG%% deinstall tei/lite
 share/sgml/tei/lite/teilite.dtd
 share/sgml/tei/lite/teilite.tag
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog
 share/sgml/tei/lite/catalog
-@exec %%MKCATALOG%% -q -c %%CATALOG%% install tei/lite
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
 @dirrm share/sgml/tei/lite
 @unexec rmdir %D/share/sgml/tei 2>/dev/null || true
Index: tei-lite/files/catalog
===================================================================
RCS file: /home/ncvs/ports/textproc/tei-lite/files/catalog,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.1 catalog
--- tei-lite/files/catalog	3 Jan 2003 12:21:19 -0000	1.1
+++ tei-lite/files/catalog	27 Jun 2003 09:45:31 -0000
@@ -1,7 +1,7 @@
-PUBLIC "-//TEI//DTD TEI Lite 1.0//EN" "%%INSTDIR%%/teilite.dtd"
-PUBLIC "-//TEI//DTD TEI Lite 1.0 //EN" "%%INSTDIR%%/teilite.dtd"
-PUBLIC "-//TEI//DTD TEI Lite 1.6 //EN" "%%INSTDIR%%/teilite.dtd"
-PUBLIC "-//TEI//DTD TEI Lite 1.6//EN" "%%INSTDIR%%/teilite.dtd"
+PUBLIC "-//TEI//DTD TEI Lite 1.0//EN" "teilite.dtd"
+PUBLIC "-//TEI//DTD TEI Lite 1.0 //EN" "teilite.dtd"
+PUBLIC "-//TEI//DTD TEI Lite 1.6 //EN" "teilite.dtd"
+PUBLIC "-//TEI//DTD TEI Lite 1.6//EN" "teilite.dtd"
 
 
 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: kuriyama 
State-Changed-When: Mon Jun 30 23:23:19 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53826 
>Unformatted:
