From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 27 05:20:43 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26D6637B40D for ; Fri, 27 Jun 2003 05:20:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99CA944029 for ; Fri, 27 Jun 2003 05:20:22 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5RCKJUp049344 for ; Fri, 27 Jun 2003 05:20:19 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5RCKJch049341; Fri, 27 Jun 2003 05:20:19 -0700 (PDT) Resent-Date: Fri, 27 Jun 2003 05:20:19 -0700 (PDT) Resent-Message-Id: <200306271220.h5RCKJch049341@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hiroki Sato Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E4A037B401 for ; Fri, 27 Jun 2003 05:16:31 -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 9762043FB1 for ; Fri, 27 Jun 2003 05:16:30 -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 28175458E for ; Fri, 27 Jun 2003 21:16:27 +0900 (JST) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) h5RCCfSI040783 for ; Fri, 27 Jun 2003 21:12:42 +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 h5RCCe5I002824 for ; Fri, 27 Jun 2003 21:12:40 +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 h5RCCek8002823; Fri, 27 Jun 2003 21:12:40 +0900 (JST) Message-Id: <200306271212.h5RCCek8002823@alph.allbsd.org> Date: Fri, 27 Jun 2003 21:12:40 +0900 (JST) From: Hiroki Sato To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53837: Switch to use xmlcatmgr: textproc/sdocbook-xml X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Hiroki Sato List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2003 12:20:43 -0000 >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 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 @@ + + + + + + + + + >Release-Note: >Audit-Trail: >Unformatted: