ports/53824: Switch to use xmlcatmgr: textproc/iso8879

[Hiroki Sato]

>Number:         53824
>Category:       ports
>Synopsis:       Switch to use xmlcatmgr: textproc/iso8879
>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:14 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: iso8879/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/iso8879/Makefile,v
retrieving revision 1.19
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.19 Makefile
--- iso8879/Makefile	22 Feb 2003 07:48:49 -0000	1.19
+++ iso8879/Makefile	27 Jun 2003 11:03:55 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	iso8879
 PORTVERSION=	1986
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -17,15 +18,17 @@
 COMMENT=	Character entity sets from ISO 8879:1986 (SGML)
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME} MKCATALOG=${MKCATALOG}
+PLIST_SUB=	DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
 INSTDIR=	${PREFIX}/share/sgml/iso8879
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 pre-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
@@ -37,6 +40,6 @@
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
 post-install:
-	@${MKCATALOG} -q install ${PORTNAME}
+	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/catalog
 
 .include <bsd.port.mk>
Index: iso8879/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/iso8879/pkg-plist,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.5 pkg-plist
--- iso8879/pkg-plist	10 Nov 2002 22:30:18 -0000	1.5
+++ iso8879/pkg-plist	27 Jun 2003 09:22:57 -0000
@@ -17,7 +17,7 @@
 share/sgml/iso8879/ISOnum
 share/sgml/iso8879/ISOpub
 share/sgml/iso8879/ISOtech
- at unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%
+ at unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog
 share/sgml/iso8879/catalog
- at exec %%MKCATALOG%% -q install %%DTD_NAME%%
+ at exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog
 @dirrm share/sgml/iso8879
>Release-Note:
>Audit-Trail:
>Unformatted: