Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Aug 2005 10:02:09 +0200
From:      Florent Thoumie <flz@FreeBSD.org>
To:        Doug Barton <dougb@FreeBSD.org>
Cc:        cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject:   Re: cvs commit: ports/x11-wm/windowmaker Makefile ports/x11-wm/windowmaker/files patch-src_wmspec.c
Message-ID:  <42FB0601.7020508@FreeBSD.org>
In-Reply-To: <200508110752.j7B7qInx026109@repoman.freebsd.org>
References:  <200508110752.j7B7qInx026109@repoman.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig3C2AF8312B6130C045CC610C
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

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@ijs.si>
>   Fixes for 2 and 3 tested by Dejan, and A Dude <adudek16@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@FreeBSD.org
FreeBSD committer

--------------enig3C2AF8312B6130C045CC610C
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC+wYJMxEkbVFH3PQRAuDIAJ99LSTF2DDsjSZ91zsaSRVRKnSBFACgj0gU
RGE9hsyAmZM9YMbIh4A9eLg=
=GapS
-----END PGP SIGNATURE-----

--------------enig3C2AF8312B6130C045CC610C--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?42FB0601.7020508>