From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 27 05:20:40 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 9D69537B404 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 B08FB4400F for ; Fri, 27 Jun 2003 05:20:21 -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 h5RCKJUp049319 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 h5RCKJZj049318; Fri, 27 Jun 2003 05:20:19 -0700 (PDT) Resent-Date: Fri, 27 Jun 2003 05:20:19 -0700 (PDT) Resent-Message-Id: <200306271220.h5RCKJZj049318@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 95DF737B40B for ; Fri, 27 Jun 2003 05:16:29 -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 1648444013 for ; Fri, 27 Jun 2003 05:16:27 -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 0B6A83876 for ; Fri, 27 Jun 2003 21:16:26 +0900 (JST) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) h5RCCWSI040773 for ; Fri, 27 Jun 2003 21:12:32 +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 h5RCCV5I002292 for ; Fri, 27 Jun 2003 21:12:31 +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 h5RCCV7L002291; Fri, 27 Jun 2003 21:12:31 +0900 (JST) Message-Id: <200306271212.h5RCCV7L002291@alph.allbsd.org> Date: Fri, 27 Jun 2003 21:12:31 +0900 (JST) From: Hiroki Sato To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53836: Switch to use xmlcatmgr: textproc/docbook-310 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:40 -0000 >Number: 53836 >Category: ports >Synopsis: Switch to use xmlcatmgr: textproc/docbook-310 >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: docbook-310/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/docbook-310/Makefile,v retrieving revision 1.17 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.17 Makefile --- docbook-310/Makefile 7 Mar 2003 06:11:38 -0000 1.17 +++ docbook-310/Makefile 27 Jun 2003 11:02:37 -0000 @@ -9,6 +9,7 @@ PORTNAME= docbook PORTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/sgml/3.1/ DISTNAME= docbk31 @@ -17,33 +18,36 @@ COMMENT= V3.1 of the DocBook DTD, designed for technical documentation RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \ - ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog + ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_MTREE= yes EXTRACT_ONLY= # empty NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= DTD_NAME=${PORTNAME} +PLIST_SUB+= DTD_VERSION=${PORTVERSION} +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} INSTDIR= ${PREFIX}/share/sgml/docbook ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog -MKCATALOG= ${PREFIX}/sbin/mkcatalog +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports LATEST_LINK= docbook-310 pre-install: - @[ -d ${INSTDIR}/3.1 ] || ${MKDIR} ${INSTDIR}/3.1 + @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} do-install: - @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1 - @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog - @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog - @${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/* + @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} + @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog + @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog + @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + @${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog .include Index: docbook-310/pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/docbook-310/pkg-plist,v retrieving revision 1.3 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.3 pkg-plist --- docbook-310/pkg-plist 27 Oct 2000 15:29:04 -0000 1.3 +++ docbook-310/pkg-plist 27 Jun 2003 09:09:43 -0000 @@ -11,9 +11,9 @@ share/sgml/docbook/3.1/docbook.cat share/sgml/docbook/3.1/docbook.dcl share/sgml/docbook/3.1/docbook.dtd -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/3.1/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/3.1/readme.txt @dirrm share/sgml/docbook/3.1 @unexec rmdir %D/share/sgml/docbook 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: