From owner-cvs-all@FreeBSD.ORG Sun Sep 10 03:26:52 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC34A16A47C; Sun, 10 Sep 2006 03:26:52 +0000 (UTC) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D18743D46; Sun, 10 Sep 2006 03:26:52 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1]) by dragon.NUXI.org (8.13.7/8.13.7) with ESMTP id k8A3QpbR011206; Sat, 9 Sep 2006 20:26:51 -0700 (PDT) (envelope-from obrien@dragon.NUXI.org) Received: (from obrien@localhost) by dragon.NUXI.org (8.13.7/8.13.7/Submit) id k8A3QpTQ011205; Sat, 9 Sep 2006 20:26:51 -0700 (PDT) (envelope-from obrien) Date: Sat, 9 Sep 2006 20:26:51 -0700 From: "David O'Brien" To: Kris Kennaway Message-ID: <20060910032651.GA10764@dragon.NUXI.org> References: <200609100011.k8A0BR7d030211@repoman.freebsd.org> <20060910025830.GA74704@xor.obsecurity.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060910025830.GA74704@xor.obsecurity.org> X-Operating-System: FreeBSD 7.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.11 Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gnash Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Sep 2006 03:26:52 -0000 On Sat, Sep 09, 2006 at 10:58:30PM -0400, Kris Kennaway wrote: > On Sun, Sep 10, 2006 at 12:11:27AM +0000, David E. O'Brien wrote: > > obrien 2006-09-10 00:11:27 UTC > > > > FreeBSD ports repository > > > > Modified files: > > graphics/gnash Makefile > > Log: > > Enable plug-in by default on AMD64 as www/flashplugin* are i386-only. > > > | +.if ${MACHINE_ARCH:L} == "amd64" > > | +OPTIONS= PLUGIN "Enable firefox plugin" on > > | +.else > > | OPTIONS= PLUGIN "Enable firefox plugin" off > > | +.endif > > This should be ARCH instead of MACHINE_ARCH (make sure to include > bsd.port.pre.mk first). I think some of our ports are confused (and me too). A bunch do: .if ${ARCH} == "amd64" and at least these hugs/Makefile:.if ${MACHINE_ARCH:L} == "amd64" lua/Makefile:.if ${MACHINE_ARCH:L} == "amd64" lua4/Makefile:.if ${MACHINE_ARCH:L} == "amd64" lua50/Makefile:.if ${MACHINE_ARCH:L} == "amd64" have that form - that's where I got the mistaken idea this is the new spelling. Is this the correct change? Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/gnash/Makefile,v retrieving revision 1.8 diff -u -p -u -3 -r1.8 Makefile --- Makefile 10 Sep 2006 00:11:27 -0000 1.8 +++ Makefile 10 Sep 2006 03:26:14 -0000 @@ -34,14 +34,14 @@ CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -Wl,- CONFIGURE_ARGS= --libdir="${PREFIX}/lib/gnash" \ --with-plugindir=${PLUGIN_DIR} -.if ${MACHINE_ARCH:L} == "amd64" +.include + +.if ${ARCH} == "amd64" OPTIONS= PLUGIN "Enable firefox plugin" on .else OPTIONS= PLUGIN "Enable firefox plugin" off .endif -.include - .if !defined(WITH_PLUGIN) CONFIGURE_ARGS+= --disable-plugin PLIST_SUB+= PLUGIN="@comment " -- -- David (obrien@FreeBSD.org)