Date: Sat, 9 Sep 2006 20:26:51 -0700 From: "David O'Brien" <obrien@FreeBSD.org> To: Kris Kennaway <kris@obsecurity.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gnash Makefile Message-ID: <20060910032651.GA10764@dragon.NUXI.org> In-Reply-To: <20060910025830.GA74704@xor.obsecurity.org> References: <200609100011.k8A0BR7d030211@repoman.freebsd.org> <20060910025830.GA74704@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
OPTIONS= PLUGIN "Enable firefox plugin" on
.else
OPTIONS= PLUGIN "Enable firefox plugin" off
.endif
-.include <bsd.port.pre.mk>
-
.if !defined(WITH_PLUGIN)
CONFIGURE_ARGS+= --disable-plugin
PLIST_SUB+= PLUGIN="@comment "
--
-- David (obrien@FreeBSD.org)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060910032651.GA10764>