cvs commit: ports/chinese/big5width Makefile

[Rong-En Fan]

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
> > 
> >   FreeBSD ports repository
> > 
> >   Modified files:
> >     chinese/big5width    Makefile 
> >   Log:
> >   - Try to fix build by not modifying base locale file.
> >   
> >   Revision  Changes    Path
> >   1.2       +2 -0      ports/chinese/big5width/Makefile
> > http://cvsweb.FreeBSD.org/ports/chinese/big5width/Makefile.diff?r1=1.1&r2=1.2
> > | ===================================================================
> > | RCS file: /usr/local/www/cvsroot/FreeBSD/ports/chinese/big5width/Makefile,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 at FreeBSD.org>
> > |  #
> > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/chinese/big5width/Makefile,v 1.1 2006/11/10 20:13:09 rafan Exp $
> > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/chinese/big5width/Makefile,v 1.2 2006/11/11 18:44:18 rafan Exp $
> > |  #
> > |  
> > |  PORTNAME=	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
> 
> 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

> 
> Kris


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20061111/66b5e87a/attachment.pgp