Date: Fri, 27 Jun 2003 21:12:44 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53821: Switch to use xmlcatmgr: textproc/xhtml Message-ID: <200306271212.h5RCCi7P003093@alph.allbsd.org> Resent-Message-ID: <200306271220.h5RCKD2o049043@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53821
>Category: ports
>Synopsis: Switch to use xmlcatmgr: textproc/xhtml
>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@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: xhtml/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xhtml/Makefile,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.5 Makefile
--- xhtml/Makefile 22 Feb 2003 07:48:50 -0000 1.5
+++ xhtml/Makefile 27 Jun 2003 11:05:08 -0000
@@ -7,6 +7,7 @@
PORTNAME= xhtml
PORTVERSION= 1.0.20000126
+PORTREVISION= 1
CATEGORIES= textproc
#MASTER_SITES= http://www.w3.org/TR/xhtml1/
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -16,21 +17,28 @@
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= W3C's XHTML DTD
-BUILD_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
-RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_ZIP= YES
NO_MTREE= YES
NO_BUILD= YES
WRKSRC= ${WRKDIR}/xhtml1
+PLIST_SUB= XMLCATMGR=${XMLCATMGR}
+PLIST_SUB+= DTDDIR=${DTDDIR}
+PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+PLIST_SUB+= CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
INSTDIR= ${PREFIX}/share/xml
DTDDIR= ${INSTDIR}/dtd/xhtml
DTDFILES= xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent \
xhtml.soc xhtml1-frameset.dtd xhtml1-strict.dtd \
- xhtml1-transitional.dtd xhtml1.dcl
-MKCATALOG= ${PREFIX}/sbin/mkcatalog
-PLIST_SUB= MKCATALOG=${MKCATALOG}
+ xhtml1-transitional.dtd xhtml1.dcl ${WRKSRC}/catalog.xml
+XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports
+
+post-patch:
+ ${SED} -e 's#@@DTDDIR@@#${DTDDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml
pre-install:
@[ -d ${DTDDIR} ] || ${MKDIR} ${DTDDIR}
@@ -39,6 +47,7 @@
@(cd ${WRKSRC}/DTD; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
post-install:
- @${MKCATALOG} -c ${INSTDIR}/catalog -q install dtd/xhtml xhtml.soc
+ ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/xhtml.soc
+ ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${DTDDIR}/catalog.xml
.include <bsd.port.mk>
Index: xhtml/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/xhtml/pkg-plist,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.3 pkg-plist
--- xhtml/pkg-plist 10 Nov 2002 23:04:21 -0000 1.3
+++ xhtml/pkg-plist 27 Jun 2003 10:13:59 -0000
@@ -1,9 +1,12 @@
share/xml/dtd/xhtml/xhtml-lat1.ent
share/xml/dtd/xhtml/xhtml-special.ent
share/xml/dtd/xhtml/xhtml-symbol.ent
-@unexec %%MKCATALOG%% -c %D/share/xml/catalog -q deinstall dtd/xhtml xhtml.soc
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/xhtml.soc
share/xml/dtd/xhtml/xhtml.soc
-@exec %%MKCATALOG%% -c %D/share/xml/catalog -q install dtd/xhtml xhtml.soc
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/xhtml.soc
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DTDDIR%%/catalog.xml
+share/xml/dtd/xhtml/catalog.xml
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DTDDIR%%/catalog.xml
share/xml/dtd/xhtml/xhtml1-frameset.dtd
share/xml/dtd/xhtml/xhtml1-strict.dtd
share/xml/dtd/xhtml/xhtml1-transitional.dtd
Index: xhtml/files/catalog.xml
===================================================================
RCS file: xhtml/files/catalog.xml
diff -N xhtml/files/catalog.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xhtml/files/catalog.xml 27 Jun 2003 08:44:45 -0000
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">;
+
+<!-- Created by xmlcatmgr-0.2 -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <public publicId="-//W3C//DTD XHTML 1.0 Strict//EN" uri="file://@@DTDDIR@@/xhtml1-strict.dtd" />
+ <public publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" uri="file://@@DTDDIR@@/xhtml1-transitional.dtd" />
+ <public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" uri="file://@@DTDDIR@@/xhtml1-frameset.dtd" />
+ <public publicId="-//W3C//ENTITIES Latin 1 for XHTML//EN" uri="file://@@DTDDIR@@/xhtml-lat1.ent" />
+ <public publicId="-//W3C//ENTITIES Symbols for XHTML//EN" uri="file://@@DTDDIR@@/xhtml-symbol.ent" />
+ <public publicId="-//W3C//ENTITIES Special for XHTML//EN" uri="file://@@DTDDIR@@/xhtml-special.ent" />
+</catalog>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306271212.h5RCCi7P003093>