ports/53819: Switch to use xmlcatmgr: textproc/html

[Hiroki Sato]

>Number:         53819
>Category:       ports
>Synopsis:       Switch to use xmlcatmgr: textproc/html
>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:12 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: html/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/html/Makefile,v
retrieving revision 1.13
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.13 Makefile
--- html/Makefile	22 Feb 2003 07:48:49 -0000	1.13
+++ html/Makefile	27 Jun 2003 11:03:37 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	html
 PORTVERSION=	4.01
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -15,15 +16,18 @@
 MAINTAINER=	kuriyama at FreeBSD.org
 COMMENT=	All W3C published SGML DTDs for HTML
 
-RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 NO_MTREE=	yes
 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/html
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 pre-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
@@ -34,6 +38,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: html/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/html/pkg-plist,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.5 pkg-plist
--- html/pkg-plist	27 Oct 2000 15:32:58 -0000	1.5
+++ html/pkg-plist	27 Jun 2003 09:20:52 -0000
@@ -21,9 +21,9 @@
 share/sgml/html/4.01/frameset.dtd
 share/sgml/html/4.01/loose.dtd
 share/sgml/html/4.01/strict.dtd
- at unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%
+ at unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/catalog
 share/sgml/html/catalog
- at exec %%MKCATALOG%% -q install %%DTD_NAME%%
+ at exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/catalog
 @dirrm share/sgml/html/2.0
 @dirrm share/sgml/html/3.2
 @dirrm share/sgml/html/4.0
>Release-Note:
>Audit-Trail:
>Unformatted: