From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 27 05:20:41 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 BE66437B405 for ; Fri, 27 Jun 2003 05:20:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25AFB44003 for ; Fri, 27 Jun 2003 05:20:18 -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 h5RCKHUp049219 for ; Fri, 27 Jun 2003 05:20:17 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5RCKHSJ049218; Fri, 27 Jun 2003 05:20:17 -0700 (PDT) Resent-Date: Fri, 27 Jun 2003 05:20:17 -0700 (PDT) Resent-Message-Id: <200306271220.h5RCKHSJ049218@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 60CA837B409 for ; Fri, 27 Jun 2003 05:16:27 -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 577C443FB1 for ; Fri, 27 Jun 2003 05:16:25 -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 8FB3137AC for ; Fri, 27 Jun 2003 21:16:23 +0900 (JST) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) h5RCCZSI040776 for ; Fri, 27 Jun 2003 21:12:35 +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 h5RCCY5I002451 for ; Fri, 27 Jun 2003 21:12:34 +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 h5RCCYAQ002450; Fri, 27 Jun 2003 21:12:34 +0900 (JST) Message-Id: <200306271212.h5RCCYAQ002450@alph.allbsd.org> Date: Fri, 27 Jun 2003 21:12:34 +0900 (JST) From: Hiroki Sato To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53832: Switch to use xmlcatmgr: textproc/docbook-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:41 -0000 >Number: 53832 >Category: ports >Synopsis: Switch to use xmlcatmgr: textproc/docbook-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:17 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: docbook-xml/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/docbook-xml/Makefile,v retrieving revision 1.19 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.19 Makefile --- docbook-xml/Makefile 22 Feb 2003 07:48:48 -0000 1.19 +++ docbook-xml/Makefile 27 Jun 2003 11:03:10 -0000 @@ -7,6 +7,7 @@ PORTNAME= docbook-xml PORTVERSION= 4.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/ \ http://www.oasis-open.org/committees/docbook/xml/${PORTVERSION}/ @@ -14,17 +15,21 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= XML version of the DocBook DTD -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= YES NO_BUILD= YES NO_WRKSUBDIR= YES PLIST_SUB= DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} CATALOG=${CATALOG} + XMLCATMGR=${XMLCATMGR}\ + DOCBOOKDIR=${DOCBOOKDIR}\ + CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \ + CATALOG_PORTS_XML=${CATALOG_PORTS_XML} DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION} -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 pre-install: @[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent @@ -35,6 +40,7 @@ done post-install: - ${MKCATALOG} -q -c ${CATALOG} install docbook/${PORTVERSION} docbook.cat + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DOCBOOKDIR}/docbook.cat + @${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${DOCBOOKDIR}/catalog.xml .include Index: docbook-xml/pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/docbook-xml/pkg-plist,v retrieving revision 1.7 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.7 pkg-plist --- docbook-xml/pkg-plist 9 Oct 2002 02:47:03 -0000 1.7 +++ docbook-xml/pkg-plist 27 Jun 2003 09:16:17 -0000 @@ -1,15 +1,17 @@ share/xml/docbook/%%DTD_VERSION%%/ChangeLog share/xml/docbook/%%DTD_VERSION%%/README share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DOCBOOKDIR%%/catalog.xml share/xml/docbook/%%DTD_VERSION%%/catalog.xml +@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DOCBOOKDIR%%/catalog.xml share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod -@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall docbook/%%DTD_VERSION%% docbook.cat +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DOCBOOKDIR%%/docbook.cat share/xml/docbook/%%DTD_VERSION%%/docbook.cat -@exec %%MKCATALOG%% -q -c%%CATALOG%% install docbook/%%DTD_VERSION%% docbook.cat +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/docbook.cat share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsa.ent share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsb.ent >Release-Note: >Audit-Trail: >Unformatted: