Date: Fri, 27 Jun 2003 21:12:40 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53837: Switch to use xmlcatmgr: textproc/sdocbook-xml Message-ID: <200306271212.h5RCCek8002823@alph.allbsd.org> Resent-Message-ID: <200306271220.h5RCKJch049341@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53837
>Category: ports
>Synopsis: Switch to use xmlcatmgr: textproc/sdocbook-xml
>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:19 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: sdocbook-xml/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/sdocbook-xml/Makefile,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.5 Makefile
--- sdocbook-xml/Makefile 7 Mar 2003 06:11:54 -0000 1.5
+++ sdocbook-xml/Makefile 27 Jun 2003 11:04:22 -0000
@@ -7,6 +7,7 @@
PORTNAME= sdocbook-xml
PORTVERSION= 4.1.2.5
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
DISTNAME= simple${PORTVERSION:S/.//g}
@@ -14,15 +15,20 @@
MAINTAINER= des@FreeBSD.org
COMMENT= "Simplified" DocBook XML DTD
-RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_ZIP= yes
NO_BUILD= yes
-PLIST_SUB= MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
+WRKSRC= ${WRKDIR}
+PLIST_SUB= XMLCATMGR=${XMLCATMGR}\
+ CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}\
+ CATALOG_PORTS_XML=${CATALOG_PORTS_XML}\
+ XMLDIR=${SDOCBOOKDIR}
SDOCBOOKDIR= ${PREFIX}/share/xml/sdocbook
-MKCATALOG= ${LOCALBASE}/sbin/mkcatalog
-CATALOG= ${PREFIX}/share/xml/catalog
+XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
+CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports
FILES= sdbcent.mod sdbhier.mod sdbpool.mod sdocbook-custom.dtd \
sdocbook.css sdocbook.dtd sdocbookref-custom.dtd \
@@ -32,14 +38,19 @@
${MKDIR} ${WRKDIR}; \
(cd ${WRKDIR} && unzip -oq ${DISTDIR}/${DISTFILES})
+post-patch:
+ ${SED} -e 's#@@DTDDIR@@#${SDOCBOOKDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml
+
do-install:
${MKDIR} ${SDOCBOOKDIR}
.for i in ${FILES}
$(INSTALL_DATA) $(WRKDIR)/${i} $(SDOCBOOKDIR)
.endfor
${INSTALL_DATA} ${FILESDIR}/catalog ${SDOCBOOKDIR}
+ ${INSTALL_DATA} ${WRKDIR}/catalog.xml ${SDOCBOOKDIR}
post-install:
- ${MKCATALOG} -q -c ${CATALOG} install sdocbook catalog
+ ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${SDOCBOOKDIR}/catalog
+ ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${SDOCBOOKDIR}/catalog.xml
.include <bsd.port.mk>
Index: sdocbook-xml/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/sdocbook-xml/pkg-plist,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 pkg-plist
--- sdocbook-xml/pkg-plist 24 Feb 2002 13:01:28 -0000 1.2
+++ sdocbook-xml/pkg-plist 27 Jun 2003 09:36:00 -0000
@@ -1,7 +1,9 @@
-share/xml/catalog
-@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall sdocbook catalog
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%XMLDIR%%/catalog
share/xml/sdocbook/catalog
-@exec %%MKCATALOG%% -q -c%%CATALOG%% install sdocbook catalog
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%XMLDIR%%/catalog
+@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%XMLDIR%%/catalog.xml
+share/xml/sdocbook/catalog.xml
+@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%XMLDIR%%/catalog.xml
share/xml/sdocbook/sdbcent.mod
share/xml/sdocbook/sdbhier.mod
share/xml/sdocbook/sdbpool.mod
Index: sdocbook-xml/files/catalog.xml
===================================================================
RCS file: sdocbook-xml/files/catalog.xml
diff -N sdocbook-xml/files/catalog.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sdocbook-xml/files/catalog.xml 27 Jun 2003 09:32:24 -0000
@@ -0,0 +1,10 @@
+<?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="-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN" uri="file://@@DTDDIR@@/sdocbook.dtd" />
+ <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V4.1.2.5//EN" uri="file://@@DTDDIR@@/sdocbookref.dtd" />
+</catalog>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306271212.h5RCCek8002823>