From owner-freebsd-ports@FreeBSD.ORG Mon Dec 29 10:46:22 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E862F16A4CE; Mon, 29 Dec 2003 10:46:21 -0800 (PST) Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id F01DC43D41; Mon, 29 Dec 2003 10:46:17 -0800 (PST) (envelope-from hrs@FreeBSD.org) Received: from delta.allbsd.org (p45245-adsao12honb4-acca.tokyo.ocn.ne.jp [219.114.52.245]) by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id C40F2BEC; Tue, 30 Dec 2003 03:46:16 +0900 (JST) Received: from localhost (alph.allbsd.org [192.168.0.10]) by delta.allbsd.org (8.12.9p2/8.12.9) with ESMTP id hBTIjrAB062191; Tue, 30 Dec 2003 03:45:54 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Tue, 30 Dec 2003 03:45:12 +0900 (JST) Message-Id: <20031230.034512.64801373.hrs@eos.ocn.ne.jp> To: sergei@FreeBSD.org From: Hiroki Sato In-Reply-To: <20031229174252.GC719@chetwood.ru> References: <200312291610.LAA13349885@shell.TheWorld.com> <20031230.013349.35008002.hrs@eos.ocn.ne.jp> <20031229174252.GC719@chetwood.ru> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Tue_Dec_30_03:45:12_2003_396)--" Content-Transfer-Encoding: 7bit cc: hrs@FreeBSD.org cc: kwc@TheWorld.com cc: kuriyama@FreeBSD.org cc: freebsd-ports@FreeBSD.org Subject: Re: xmlcatmgr & docproj broken? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Dec 2003 18:46:22 -0000 ----Security_Multipart(Tue_Dec_30_03:45:12_2003_396)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sergei Kolobov wrote in <20031229174252.GC719@chetwood.ru>: sergei> I have seen similar problems in the past (i.e. before my recent commit sergei> to upgrade xmlcatmgr to 1.2) where ${PREFIX}/share/xml/catalog existed, sergei> but it wasn't a true XML catalog (i.e. created in pre-xmlcatmgr era). sergei> In those cases, running portupgrade -fR docbook-* to force sergei> rebuilding/reinstalling docbook ports and all dependencies helped. sergei> YMMV, though. sergei> sergei> > I think the cause is that while "add CATALOG" in the post-install sergei> > target uses ${RELDIR}/catalog, in pkg-plist sergei> > ${PREFIX}/share/sgml/${RELDIR}(%%DTDDIR%%) is used. It is probably sergei> > a bug in the port skeleton, but removing a line sergei> > CATALOG "docbook/dsssl/modular/catalog" in sergei> > /usr/local/share/sgml/catalog.ports manually, you can avoid such a problem. sergei> sergei> I cannot see any problem in the port's skeleton. sergei> sergei> > Kuriyama-san, could you please fix %%DTDDIR%%? The pathnames sergei> > should be consistent. sergei> sergei> Please explain. This problem has nothing to do with xmlcatmgr itself. When you deinstall the port, the CATALOG line is not removed. This is because the port's Makefile adds 'CATALOG "${RELDIR}"' during the post-install target, but 'CATALOG "${PREFIX}/share/sgml/${RELDIR}"' when the port is deinstalled (in pkg-plist). This inconsistent behavior makes the installation just after deinstallation fail; adding 'CATALOG "${RELDIR}"' is rejected since the line already exists. BTW, when you use the package, the adding/removing CATALOG line always use 'CATALOG "${PREFIX}/share/sgml/${RELDIR}"', so the problem does not appear. Probably a fix, something like the attached patch, is needed. At least, I could reproduce the problem using "make install; make deinstall; make install" in textproc/dsssl-docbook-modular. -- | Hiroki SATO Index: Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/dsssl-docbook-modular/Makefile,v retrieving revision 1.53 diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.53 Makefile --- Makefile 13 Nov 2003 12:54:52 -0000 1.53 +++ Makefile 29 Dec 2003 18:21:11 -0000 @@ -27,7 +27,7 @@ INSTDIR= ${PREFIX}/share/sgml/${RELDIR} XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -PLIST_SUB= XMLCATMGR=${XMLCATMGR} DTDDIR=${INSTDIR} \ +PLIST_SUB= XMLCATMGR=${XMLCATMGR} DTDDIR=${RELDIR} \ CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} do-build: ----Security_Multipart(Tue_Dec_30_03:45:12_2003_396)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQA/8HY4TyzT2CeTzy0RAgwNAJ9r4U3pO16QBudCAW17jqAnQ+AW/ACgzi7U lhbwYTl021c7XLfvnDU6L+I= =Ofji -----END PGP SIGNATURE----- ----Security_Multipart(Tue_Dec_30_03:45:12_2003_396)----