From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 20 15:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8D3E16A40F for ; Wed, 20 Sep 2006 15:40:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14C9943D45 for ; Wed, 20 Sep 2006 15:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8KFeItE054104 for ; Wed, 20 Sep 2006 15:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8KFeIhg054103; Wed, 20 Sep 2006 15:40:18 GMT (envelope-from gnats) Resent-Date: Wed, 20 Sep 2006 15:40:18 GMT Resent-Message-Id: <200609201540.k8KFeIhg054103@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B8B716A407; Wed, 20 Sep 2006 15:39:13 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx1.mail.ru (mx1.mail.ru [194.67.23.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9169043D69; Wed, 20 Sep 2006 15:39:12 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=1350 helo=nexii.panopticon) by mx1.mail.ru with esmtp id 1GQ4AI-000D05-00; Wed, 20 Sep 2006 19:39:10 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id 3C0B51703E; Wed, 20 Sep 2006 19:38:55 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id 4639C4302; Wed, 20 Sep 2006 19:39:26 +0400 (MSD) Message-Id: <20060920153926.4639C4302@hades.panopticon> Date: Wed, 20 Sep 2006 19:39:26 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103433: [MAINTAINER] graphics/gnash: fix OPTIONS handling X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2006 15:40:23 -0000 >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 >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 - -.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 --- 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 - -.if ${ARCH} == "amd64" +.if ${MACHINE_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 --- gnash.patch2 ends here --- >Release-Note: >Audit-Trail: >Unformatted: