From owner-ports-jp@jp.freebsd.org  Fri Dec 22 13:13:42 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id NAA94639;
	Fri, 22 Dec 2000 13:13:42 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from psi.c.oka-pu.ac.jp (psi.c.oka-pu.ac.jp [163.225.213.86])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id NAA94630
	for <ports-jp@jp.freebsd.org>; Fri, 22 Dec 2000 13:13:37 +0900 (JST)
	(envelope-from kunishi@c.oka-pu.ac.jp)
Received: from localhost by psi.c.oka-pu.ac.jp (8.9.3+3.2W/3.7W:psi:2000041317) id NAA60735; Fri, 22 Dec 2000 13:12:17 +0900 (JST)
	(envelope-from kunishi@c.oka-pu.ac.jp)
Date: Fri, 22 Dec 2000 13:12:44 +0900 (JST)
Message-Id: <20001222.131244.32734671.kunishi@c.oka-pu.ac.jp>
To: ports-jp@jp.freebsd.org
From: KUNISHIMA Takeo <kunishi@c.oka-pu.ac.jp>
In-Reply-To: <20001222.112725.31767080.kunishi@c.oka-pu.ac.jp>
References: <20001222.100859.95519943.kunishi@c.oka-pu.ac.jp>
	<200012220148.eBM1mXc74462@kiri.pis>
	<20001222.112725.31767080.kunishi@c.oka-pu.ac.jp>
X-Mailer: Mew version 1.95b90 on Emacs 20.7 / Mule 4.1 (AOI)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Fri_Dec_22_13:12:44_2000_877)--"
Content-Transfer-Encoding: 7bit
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10542
Subject: [ports-jp 10542] docbook-xml fixes
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: kunishi@c.oka-pu.ac.jp

----Next_Part(Fri_Dec_22_13:12:44_2000_877)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

From: KUNISHIMA Takeo <kunishi@c.oka-pu.ac.jp>
Subject: [ports-jp 10541] Re: textproc/xt depends textproc/xsl-docbook?
Date: Fri, 22 Dec 2000 11:27:25 +0900 (JST)

> docbook-xml $B$N(B catalog $B$OE,Ev$K$G$C$A>e$2$F$$$k(B($B$G$b;H$C$F$J$$(B:-)$B$N$G(B
> $B$9$,!"(Bdocbook-xml $B$N%U%!%$%k%l%$%"%&%H$KLdBj$"$j!"$+$b$7$l$^$;$s!#(B
> $B$b$&$A$g$C$HD4$Y$F$_$^$9!#(B

docbook-xml $B$KBP$9$k%Q%C%A$r:n$C$F$_$^$7$?!#(B
$B8=>u$G$O(B *.ent $B%U%!%$%k$r(B ${PREFIX}/share/xml/entity/ $B$K%$%s%9%H!<%k$9$k(B
$B$h$&$K$J$C$F$$$^$9$,!"(Bdbcentx.mod $B$,(B ent/*.ent $B$H$7$F%$%s%9%H!<%k$5$l$F(B
$B$$$k$3$H$r2>Dj$7$F=q$+$l$F$$$k$?$a!"6q9g0-$$$G$9!#(B
DTD $B4X78$N%U%!%$%k$O(B($B5$J,$NLdBj$H$7$F(B)$B$"$^$j=q$-49$($?$/$J$$$N$G!"(B*.ent
$B$N%$%s%9%H!<%k@h$rJQ99$7$F$_$^$7$?!#(B

$B$^$?!"(Bcatalog $B%U%!%$%k$r(B ${PREFIX}/share/xml/dtd/docbook/catalog $B$H$7$F(B
$B%$%s%9%H!<%k$9$k$h$&$K$7$^$7$?!#(B
$B$3$l$O!"$b$H$b$H$N%G%#%9%H%j%S%e!<%7%g%s$KF~$C$F$$$k(B docbook.cat $B$+$i!"(B
textproc/iso8879 $B$H>WFM$9$k(B PUBLIC ID $B$r<h$j=|$$$?$b$N$G$9!#(B

$B9qEg>f@8(B
Internet: kunishi@c.oka-pu.ac.jp, NIFTY SERVE: QYG06054
Homepage: http://psi.c.oka-pu.ac.jp/~kunishi/

----Next_Part(Fri_Dec_22_13:12:44_2000_877)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="docbook-xml.diff"

diff -ruN -x CVS /usr/ports/textproc/docbook-xml/Makefile docbook-xml/Makefile
--- /usr/ports/textproc/docbook-xml/Makefile	Fri Oct  6 18:06:30 2000
+++ docbook-xml/Makefile	Fri Dec 22 12:53:00 2000
@@ -7,6 +7,7 @@
 
 PORTNAME=	docbook-xml
 PORTVERSION= 	4.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/xml/4.1.2/
 DISTNAME=	docbkx412
@@ -20,11 +21,11 @@
 
 INSTDIR=	${PREFIX}/share/xml
 DTDDIR=		${INSTDIR}/dtd/docbook
-ENTDIR=		${INSTDIR}/entity
+ENTDIR=		${INSTDIR}/dtd/docbook/ent
 MISCDIR=	${INSTDIR}/misc/docbook
 DTDFILES=	calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
 		dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES=	40chg.txt readme.txt
+MISCFILES=	40chg.txt 41chg.txt readme.txt
 
 pre-install:
 	@[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR}
@@ -36,5 +37,6 @@
 	@(cd ${WRKSRC};     ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
 	@(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
 	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${MISCDIR})
+	@${INSTALL_DATA} ${FILESDIR}/catalog ${DTDDIR}
 
 .include <bsd.port.mk>
diff -ruN -x CVS /usr/ports/textproc/docbook-xml/files/catalog docbook-xml/files/catalog
--- /usr/ports/textproc/docbook-xml/files/catalog	Thu Jan  1 09:00:00 1970
+++ docbook-xml/files/catalog	Fri Dec 22 12:48:07 2000
@@ -0,0 +1,19 @@
+  -- ...................................................................... --
+  -- Catalog data for DocBook XML V4.1.2 .................................... --
+  -- File docbook.cat ..................................................... --
+
+  -- ...................................................................... --
+  -- DocBook driver file .................................................. --
+
+PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
+
+  -- ...................................................................... --
+  -- DocBook modules ...................................................... --
+
+PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
diff -ruN -x CVS /usr/ports/textproc/docbook-xml/pkg-plist docbook-xml/pkg-plist
--- /usr/ports/textproc/docbook-xml/pkg-plist	Thu Oct  5 19:19:41 2000
+++ docbook-xml/pkg-plist	Fri Dec 22 12:52:23 2000
@@ -1,35 +1,37 @@
 share/xml/dtd/docbook/calstblx.dtd
+share/xml/dtd/docbook/catalog
 share/xml/dtd/docbook/dbcentx.mod
 share/xml/dtd/docbook/dbgenent.mod
 share/xml/dtd/docbook/dbhierx.mod
 share/xml/dtd/docbook/dbnotnx.mod
 share/xml/dtd/docbook/dbpoolx.mod
 share/xml/dtd/docbook/docbookx.dtd
+share/xml/dtd/docbook/ent/iso-amsa.ent
+share/xml/dtd/docbook/ent/iso-amsb.ent
+share/xml/dtd/docbook/ent/iso-amsc.ent
+share/xml/dtd/docbook/ent/iso-amsn.ent
+share/xml/dtd/docbook/ent/iso-amso.ent
+share/xml/dtd/docbook/ent/iso-amsr.ent
+share/xml/dtd/docbook/ent/iso-box.ent
+share/xml/dtd/docbook/ent/iso-cyr1.ent
+share/xml/dtd/docbook/ent/iso-cyr2.ent
+share/xml/dtd/docbook/ent/iso-dia.ent
+share/xml/dtd/docbook/ent/iso-grk1.ent
+share/xml/dtd/docbook/ent/iso-grk2.ent
+share/xml/dtd/docbook/ent/iso-grk3.ent
+share/xml/dtd/docbook/ent/iso-grk4.ent
+share/xml/dtd/docbook/ent/iso-lat1.ent
+share/xml/dtd/docbook/ent/iso-lat2.ent
+share/xml/dtd/docbook/ent/iso-num.ent
+share/xml/dtd/docbook/ent/iso-pub.ent
+share/xml/dtd/docbook/ent/iso-tech.ent
 share/xml/dtd/docbook/soextblx.dtd
-share/xml/entity/iso-amsa.ent
-share/xml/entity/iso-amsb.ent
-share/xml/entity/iso-amsc.ent
-share/xml/entity/iso-amsn.ent
-share/xml/entity/iso-amso.ent
-share/xml/entity/iso-amsr.ent
-share/xml/entity/iso-box.ent
-share/xml/entity/iso-cyr1.ent
-share/xml/entity/iso-cyr2.ent
-share/xml/entity/iso-dia.ent
-share/xml/entity/iso-grk1.ent
-share/xml/entity/iso-grk2.ent
-share/xml/entity/iso-grk3.ent
-share/xml/entity/iso-grk4.ent
-share/xml/entity/iso-lat1.ent
-share/xml/entity/iso-lat2.ent
-share/xml/entity/iso-num.ent
-share/xml/entity/iso-pub.ent
-share/xml/entity/iso-tech.ent
 share/xml/misc/docbook/40chg.txt
+share/xml/misc/docbook/41chg.txt
 share/xml/misc/docbook/readme.txt
+@dirrm share/xml/dtd/docbook/ent
 @dirrm share/xml/dtd/docbook
 @dirrm share/xml/misc/docbook
 @unexec rmdir %D/share/xml/dtd 2>/dev/null || true
 @unexec rmdir %D/share/xml/misc 2>/dev/null || true
-@unexec rmdir %D/share/xml/entity 2>/dev/null || true
 @unexec rmdir %D/share/xml 2>/dev/null || true

----Next_Part(Fri_Dec_22_13:12:44_2000_877)----
