From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 27 05:20:37 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 0F5FE37B401 for ; Fri, 27 Jun 2003 05:20:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0411C4400D for ; Fri, 27 Jun 2003 05:20:14 -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 h5RCKDUp049059 for ; Fri, 27 Jun 2003 05:20:13 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5RCKD43049058; Fri, 27 Jun 2003 05:20:13 -0700 (PDT) Resent-Date: Fri, 27 Jun 2003 05:20:13 -0700 (PDT) Resent-Message-Id: <200306271220.h5RCKD43049058@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 CA52D37B404 for ; Fri, 27 Jun 2003 05:16:18 -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 C544643FB1 for ; Fri, 27 Jun 2003 05:16:16 -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 8FBE62F9F for ; Fri, 27 Jun 2003 21:16:15 +0900 (JST) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) h5RCCiSI040786 for ; Fri, 27 Jun 2003 21:12:45 +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 h5RCCg5I002985 for ; Fri, 27 Jun 2003 21:12:43 +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 h5RCCguU002984; Fri, 27 Jun 2003 21:12:42 +0900 (JST) Message-Id: <200306271212.h5RCCguU002984@alph.allbsd.org> Date: Fri, 27 Jun 2003 21:12:42 +0900 (JST) From: Hiroki Sato To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53822: Switch to use xmlcatmgr: textproc/tei-p4 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:37 -0000 >Number: 53822 >Category: ports >Synopsis: Switch to use xmlcatmgr: textproc/tei-p4 >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: tei-p4/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/tei-p4/Makefile,v retrieving revision 1.2 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 Makefile --- tei-p4/Makefile 20 Feb 2003 20:13:24 -0000 1.2 +++ tei-p4/Makefile 27 Jun 2003 11:04:49 -0000 @@ -7,6 +7,7 @@ PORTNAME= tei PORTVERSION= p4 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.tei-c.org/P4X/DTD/ DISTNAME= dtd @@ -14,18 +15,21 @@ MAINTAINER= henrik.motakef@web.de COMMENT= DTD of the Text Encoding Initiative -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= yes NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST_SUB= DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \ - MKCATALOG=${MKCATALOG} +PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ + DTDDIR=${DTDDIR} \ + CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} DTD= dtd.zip SGMLDIR= ${PREFIX}/share/sgml INSTDIR= ${SGMLDIR}/${PORTNAME}/${PORTVERSION} -MKCATALOG= ${PREFIX}/sbin/mkcatalog +DTDDIR= ${PORTNAME}/${PORTVERSION} +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports pre-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} @@ -35,9 +39,9 @@ ${INSTALL_DATA} ${WRKSRC}/*.ent ${INSTDIR} ${INSTALL_DATA} ${WRKSRC}/*.dec ${INSTDIR} ${INSTALL_DATA} ${WRKSRC}/teicatalog.xml ${INSTDIR} - ${SED} -e "s!&DTDpath;!${INSTDIR}/!" ${WRKSRC}/catalog.tei > ${INSTDIR}/catalog + ${SED} -e "s!&DTDpath;!!" ${WRKSRC}/catalog.tei > ${INSTDIR}/catalog post-install: - @${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION} + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/catalog .include Index: tei-p4/pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/tei-p4/pkg-plist,v retrieving revision 1.2 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.2 pkg-plist --- tei-p4/pkg-plist 14 Jan 2003 04:49:25 -0000 1.2 +++ tei-p4/pkg-plist 27 Jun 2003 09:54:27 -0000 @@ -1,4 +1,4 @@ -@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%% +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog share/sgml/tei/p4/dummy.dtd share/sgml/tei/p4/teicatalog.xml share/sgml/tei/p4/tei2.dtd @@ -53,6 +53,6 @@ share/sgml/tei/p4/teilite.dec share/sgml/tei/p4/teilitex.dec share/sgml/tei/p4/catalog -@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%% +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/p4/ @unexec rmdir %D/share/sgml/tei 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: