cvs commit: ports/x11-wm/windowmaker Makefile ports/x11-wm/windowmaker/files patch-src_wmspec.c

[Florent Thoumie]

Doug Barton wrote:
> dougb       2005-08-11 07:52:18 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     x11-wm/windowmaker   Makefile 
>   Added files:
>     x11-wm/windowmaker/files patch-src_wmspec.c 
>   Log:
>   1. Move the include of bsd.port.pre.mk before OPTIONS based on a recent
>   post to -ports on this topic
>   2. Fix build on amd64 by not trying to inline asm code designed for i386
>   3. Add a patch to fix window positioning on amd64, from
>   http://article.gmane.org/gmane.compw.window-managers.windowmaker.devel/749
>   
>   2 and 3 provided/reminded by Dejan Lesjak <dejan.lesjak at ijs.si>
>   Fixes for 2 and 3 tested by Dejan, and A Dude <adudek16 at gmail.com>.
>   
>   Approved by:    portmgr (krion)
>   
>   Revision  Changes    Path
>   1.126     +5 -1      ports/x11-wm/windowmaker/Makefile
>   1.1       +84 -0     ports/x11-wm/windowmaker/files/patch-src_wmspec.c (new)

	Doesn't seem correct to me. I think you should have :

	OPTIONS= ...
	
	.include <bsd.port.pre.mk>
	
	.if ${ARCH} == "amd64"
	CONFIGURE_ARGS= ...
	.endif

	OPTIONS processing lives in bsd.port.pre.mk, so it must be
	included after OPTIONS is defined.

-- 
Florent Thoumie
flz at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20050811/366f2bbf/signature.bin