From owner-cvs-ports@FreeBSD.ORG Thu Aug 11 08:02:37 2005 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B45C116A41F; Thu, 11 Aug 2005 08:02:37 +0000 (GMT) (envelope-from flz@FreeBSD.org) Received: from smtp.xbsd.org (xbsd.org [82.233.2.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2815743D45; Thu, 11 Aug 2005 08:02:37 +0000 (GMT) (envelope-from flz@FreeBSD.org) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by smtp.xbsd.org (Postfix) with ESMTP id 7213311DF7; Thu, 11 Aug 2005 10:08:42 +0200 (CEST) Received: from smtp.xbsd.org ([127.0.0.1]) by localhost (srv1.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 93224-08; Thu, 11 Aug 2005 10:08:36 +0200 (CEST) Received: from [192.168.20.108] (unknown [83.142.147.11]) by smtp.xbsd.org (Postfix) with ESMTP id 4F6FB1159A; Thu, 11 Aug 2005 10:08:34 +0200 (CEST) Message-ID: <42FB0601.7020508@FreeBSD.org> Date: Thu, 11 Aug 2005 10:02:09 +0200 From: Florent Thoumie User-Agent: Mozilla Thunderbird 1.0.6 (Macintosh/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Doug Barton References: <200508110752.j7B7qInx026109@repoman.freebsd.org> In-Reply-To: <200508110752.j7B7qInx026109@repoman.freebsd.org> X-Enigmail-Version: 0.92.0.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig3C2AF8312B6130C045CC610C" X-Virus-Scanned: amavisd-new at xbsd.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 X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Aug 2005 08:02:37 -0000 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 > Fixes for 2 and 3 tested by Dejan, and A Dude . > > 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 .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--