Date: Wed, 20 Sep 2006 19:39:26 +0400 (MSD) From: Dmitry Marakasov <amdmi3@mail.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/103433: [MAINTAINER] graphics/gnash: fix OPTIONS handling Message-ID: <20060920153926.4639C4302@hades.panopticon> Resent-Message-ID: <200609201540.k8KFeIhg054103@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103433
>Category: ports
>Synopsis: [MAINTAINER] graphics/gnash: fix OPTIONS handling
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 20 15:40:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #0: Fri Sep 1 14:24:31 MSD 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
With rev 1.8 of port's Makefile, obrien@ introduced conditional OPTIONS handling, to enable PLUGIN options on amd64 by default (as there's no other flash plugin available on amd64). That was erroneous, because OPTIONS should be placed before including bsd.port.pre.mk, so now OPTIONS don't work correctly for this port.
I have two different fixes for this. First one simple removes conditional and makes PLUGIN disabled by default, when second uses MACHINE_ARCH instead of ARCH to determine architecture, thus enabling us to place OPTIONS before bsd.port.pre.mk.
I myself prefer patch1, as I don't think OPTIONS are meant for such handling.
Reported & patch2 by: Hatakeyama Motohiko <hatake[at]w9[dot]dion[dot]ne[dot]jp>
>How-To-Repeat:
>Fix:
--- gnash.patch1 begins here ---
diff -ruN gnash.orig/Makefile gnash/Makefile
--- gnash.orig/Makefile Wed Sep 20 19:24:31 2006
+++ gnash/Makefile Wed Sep 20 19:27:29 2006
@@ -34,13 +34,9 @@
CONFIGURE_ARGS= --libdir="${PREFIX}/lib/gnash" \
--with-plugindir=${PLUGIN_DIR}
-.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
--- gnash.patch1 ends here ---
--- gnash.patch2 begins here ---
diff -ruN gnash.orig/Makefile gnash/Makefile
--- gnash.orig/Makefile Wed Sep 20 19:24:31 2006
+++ gnash/Makefile Wed Sep 20 19:28:16 2006
@@ -34,13 +34,13 @@
CONFIGURE_ARGS= --libdir="${PREFIX}/lib/gnash" \
--with-plugindir=${PLUGIN_DIR}
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
+.if ${MACHINE_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
--- gnash.patch2 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060920153926.4639C4302>