From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 27 05:20:34 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 AD9F337B404 for ; Fri, 27 Jun 2003 05:20:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4F5944008 for ; Fri, 27 Jun 2003 05:20:13 -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 h5RCKDUp049044 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 h5RCKD2o049043; Fri, 27 Jun 2003 05:20:13 -0700 (PDT) Resent-Date: Fri, 27 Jun 2003 05:20:13 -0700 (PDT) Resent-Message-Id: <200306271220.h5RCKD2o049043@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 55CA137B401 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 02FC143FBF 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 16BC43B52 for ; Fri, 27 Jun 2003 21:16:14 +0900 (JST) Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10]) h5RCCkSI040788 for ; Fri, 27 Jun 2003 21:12:46 +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 h5RCCi5I003094 for ; Fri, 27 Jun 2003 21:12:45 +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 h5RCCi7P003093; Fri, 27 Jun 2003 21:12:44 +0900 (JST) Message-Id: <200306271212.h5RCCi7P003093@alph.allbsd.org> Date: Fri, 27 Jun 2003 21:12:44 +0900 (JST) From: Hiroki Sato To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53821: Switch to use xmlcatmgr: textproc/xhtml 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:35 -0000 >Number: 53821 >Category: ports >Synopsis: Switch to use xmlcatmgr: textproc/xhtml >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: xhtml/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/xhtml/Makefile,v retrieving revision 1.5 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.5 Makefile --- xhtml/Makefile 22 Feb 2003 07:48:50 -0000 1.5 +++ xhtml/Makefile 27 Jun 2003 11:05:08 -0000 @@ -7,6 +7,7 @@ PORTNAME= xhtml PORTVERSION= 1.0.20000126 +PORTREVISION= 1 CATEGORIES= textproc #MASTER_SITES= http://www.w3.org/TR/xhtml1/ MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -16,21 +17,28 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= W3C's XHTML DTD -BUILD_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog -RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog +RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr USE_ZIP= YES NO_MTREE= YES NO_BUILD= YES WRKSRC= ${WRKDIR}/xhtml1 +PLIST_SUB= XMLCATMGR=${XMLCATMGR} +PLIST_SUB+= DTDDIR=${DTDDIR} +PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} +PLIST_SUB+= CATALOG_PORTS_XML=${CATALOG_PORTS_XML} INSTDIR= ${PREFIX}/share/xml DTDDIR= ${INSTDIR}/dtd/xhtml DTDFILES= xhtml-lat1.ent xhtml-special.ent xhtml-symbol.ent \ xhtml.soc xhtml1-frameset.dtd xhtml1-strict.dtd \ - xhtml1-transitional.dtd xhtml1.dcl -MKCATALOG= ${PREFIX}/sbin/mkcatalog -PLIST_SUB= MKCATALOG=${MKCATALOG} + xhtml1-transitional.dtd xhtml1.dcl ${WRKSRC}/catalog.xml +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports +CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports + +post-patch: + ${SED} -e 's#@@DTDDIR@@#${DTDDIR}#' < ${FILESDIR}/catalog.xml > ${WRKSRC}/catalog.xml pre-install: @[ -d ${DTDDIR} ] || ${MKDIR} ${DTDDIR} @@ -39,6 +47,7 @@ @(cd ${WRKSRC}/DTD; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR}) post-install: - @${MKCATALOG} -c ${INSTDIR}/catalog -q install dtd/xhtml xhtml.soc + ${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DTDDIR}/xhtml.soc + ${XMLCATMGR} -c ${CATALOG_PORTS_XML} add nextCatalog ${DTDDIR}/catalog.xml .include Index: xhtml/pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/xhtml/pkg-plist,v retrieving revision 1.3 diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.3 pkg-plist --- xhtml/pkg-plist 10 Nov 2002 23:04:21 -0000 1.3 +++ xhtml/pkg-plist 27 Jun 2003 10:13:59 -0000 @@ -1,9 +1,12 @@ share/xml/dtd/xhtml/xhtml-lat1.ent share/xml/dtd/xhtml/xhtml-special.ent share/xml/dtd/xhtml/xhtml-symbol.ent -@unexec %%MKCATALOG%% -c %D/share/xml/catalog -q deinstall dtd/xhtml xhtml.soc +@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/xhtml.soc share/xml/dtd/xhtml/xhtml.soc -@exec %%MKCATALOG%% -c %D/share/xml/catalog -q install dtd/xhtml xhtml.soc +@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/xhtml.soc +@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DTDDIR%%/catalog.xml +share/xml/dtd/xhtml/catalog.xml +@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DTDDIR%%/catalog.xml share/xml/dtd/xhtml/xhtml1-frameset.dtd share/xml/dtd/xhtml/xhtml1-strict.dtd share/xml/dtd/xhtml/xhtml1-transitional.dtd Index: xhtml/files/catalog.xml =================================================================== RCS file: xhtml/files/catalog.xml diff -N xhtml/files/catalog.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xhtml/files/catalog.xml 27 Jun 2003 08:44:45 -0000 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + >Release-Note: >Audit-Trail: >Unformatted: