From owner-cvs-all@FreeBSD.ORG Sat Nov 11 19:41:21 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC14F16A412; Sat, 11 Nov 2006 19:41:21 +0000 (UTC) (envelope-from kris@obsecurity.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC7AA43D8F; Sat, 11 Nov 2006 19:41:16 +0000 (GMT) (envelope-from kris@obsecurity.org) Received: from obsecurity.dyndns.org (elvis.mu.org [192.203.228.196]) by elvis.mu.org (Postfix) with ESMTP id 99E4A1A3C19; Sat, 11 Nov 2006 11:41:16 -0800 (PST) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id D550C51350; Sat, 11 Nov 2006 14:41:06 -0500 (EST) Date: Sat, 11 Nov 2006 14:41:06 -0500 From: Kris Kennaway To: Rong-En Fan Message-ID: <20061111194106.GA8467@xor.obsecurity.org> References: <200611111844.kABIiIUY022772@repoman.freebsd.org> <20061111184817.GA7300@xor.obsecurity.org> <20061111185430.GG20014@svm.csie.ntu.edu.tw> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="AhhlLboLdkugWU4S" Content-Disposition: inline In-Reply-To: <20061111185430.GG20014@svm.csie.ntu.edu.tw> User-Agent: Mutt/1.4.2.2i Cc: cvs-ports@FreeBSD.org, ports-committers@FreeBSD.org, cvs-all@FreeBSD.org, Kris Kennaway Subject: Re: cvs commit: ports/chinese/big5width Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Nov 2006 19:41:22 -0000 --AhhlLboLdkugWU4S Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 12, 2006 at 02:54:30AM +0800, Rong-En Fan wrote: > > > | PORTNAME=3D big5width > > > | @@ -48,8 +48,10 @@ do-install: > > > | ${INSTALL_DATA} ${WRKSRC}/LC_CTYPE ${LOCALEDIR}/${LANG} > > > | ${CP} -p ${BASELOCALEDIR}/${LANG}/LC_CTYPE \ > > > | ${LOCALEDIR}/${LANG}/LC_CTYPE.old > > > | +.if !defined(PACKAGE_BUILDING) # don't modify building environment > > > | ${LN} -sf ${LOCALEDIR}/${LANG}/LC_CTYPE \ > > > | ${BASELOCALEDIR}/${LANG}/LC_CTYPE > > > | +.endif > >=20 > > I'd prefer not to hack around the issue by just hiding it from view. > > The package should put things back the way they were when > > deinstalling, to not leave the user system in a dirty state. >=20 > I thought the line in pkg-plist >=20 > @unexec rm -f %%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE; mv -f %D/share/locale/= %%LANG%%/LC_CTYPE.old %%%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE >=20 > should do the trick. >=20 > The build error is due to /usr/share/locale/zh_TW.UTF-8/LC_CTYPE is a > link, when mtree expects to see a file. OK, I can make it a file, and > put back the old one when deinstall. Does this approach sound ok for > you? Actually the other way around: it used to be a link (so it expects it to still be a link), and now it's a file. This is what I mean by putting things back the way they were. Kris --AhhlLboLdkugWU4S Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFVidSWry0BWjoQKURAmIXAKDvgMpy/unsu385sOfC27ADhQh86QCgv6DL eG2iUvw3siBTT18cmdojiJM= =6UHy -----END PGP SIGNATURE----- --AhhlLboLdkugWU4S--