Date: Sun, 12 Nov 2006 02:54:30 +0800 From: Rong-En Fan <rafan@FreeBSD.org> To: Kris Kennaway <kris@obsecurity.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, Rong-En Fan <rafan@FreeBSD.org>, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/chinese/big5width Makefile Message-ID: <20061111185430.GG20014@svm.csie.ntu.edu.tw> In-Reply-To: <20061111184817.GA7300@xor.obsecurity.org> References: <200611111844.kABIiIUY022772@repoman.freebsd.org> <20061111184817.GA7300@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--KJY2Ze80yH5MUxol Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 11, 2006 at 01:48:17PM -0500, Kris Kennaway wrote: > On Sat, Nov 11, 2006 at 06:44:18PM +0000, Rong-En Fan wrote: > > rafan 2006-11-11 18:44:18 UTC > >=20 > > FreeBSD ports repository > >=20 > > Modified files: > > chinese/big5width Makefile=20 > > Log: > > - Try to fix build by not modifying base locale file. > > =20 > > Revision Changes Path > > 1.2 +2 -0 ports/chinese/big5width/Makefile > > http://cvsweb.FreeBSD.org/ports/chinese/big5width/Makefile.diff?r1=3D1.= 1&r2=3D1.2 > > | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > | RCS file: /usr/local/www/cvsroot/FreeBSD/ports/chinese/big5width/Make= file,v > > | retrieving revision 1.1 > > | retrieving revision 1.2 > > | diff -u -p -r1.1 -r1.2 > > | --- ports/chinese/big5width/Makefile 2006/11/10 20:13:09 1.1 > > | +++ ports/chinese/big5width/Makefile 2006/11/11 18:44:18 1.2 > > | @@ -2,7 +2,7 @@ > > | # Date created: Sep 20 2006 > > | # Whom: Rong-En Fan <rafan@FreeBSD.org> > > | # > > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/chinese/big5width/M= akefile,v 1.1 2006/11/10 20:13:09 rafan Exp $ > > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/chinese/big5width/M= akefile,v 1.2 2006/11/11 18:44:18 rafan Exp $ > > | # > > | =20 > > | 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. I thought the line in pkg-plist @unexec rm -f %%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE; mv -f %D/share/locale/%%= LANG%%/LC_CTYPE.old %%%BASELOCALEDIR%%/%%LANG%%/LC_CTYPE should do the trick. 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? Thanks, Rong-En fan >=20 > Kris --KJY2Ze80yH5MUxol Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFVhxm144QkYb9jGgRAtYMAJ97P1z0vczvxxAMCilu6VTalAkZSgCgj4Rb 604Sq5VGSQ212CmrkzI2qG4= =Eu9c -----END PGP SIGNATURE----- --KJY2Ze80yH5MUxol--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061111185430.GG20014>