Bug 103433 - [MAINTAINER] graphics/gnash: fix OPTIONS handling
Summary: [MAINTAINER] graphics/gnash: fix OPTIONS handling
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ion-Mihai "IOnut" Tetcu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-09-20 16:40 UTC by Dmitry Marakasov
Modified: 2006-12-03 06:40 UTC (History)
0 users

See Also:

Attachments
gnash.patch1 (494 bytes, text/plain)
2006-09-20 16:40 UTC, Dmitry Marakasov 		no flags Details
file.diff (558 bytes, patch)
2006-09-20 16:40 UTC, Dmitry Marakasov 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Marakasov 2006-09-20 16:40:18 UTC 
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>
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-20 16:40:29 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->itetcu

itetcu@ wants to have OPTIONS PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103433 

Adding to audit trail from misfiled PR ports/103494:

Date: Fri, 22 Sep 2006 11:02:10 -0700
Comment 2 Dmitry Marakasov 2006-12-01 01:28:11 UTC 
* Dmitry Marakasov (amdmi3@mail.ru) wrote:

Why's so much delay? I've said in provate email that this patch
should be comitted:

> >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 ---

-- 
Best regards,
 Dmitry                          mailto:amdmi3@mail.ru
Comment 3 dfilter service freebsd_committer freebsd_triage 2006-12-03 06:31:47 UTC 
itetcu      2006-12-03 06:31:41 UTC

  FreeBSD ports repository

  Modified files:
    graphics/gnash       Makefile 
  Log:
  - set PLUGIN on on all archs
  
  PR:             ports/103433
  Submitted by:   Dmitry Marakasov (maintainer)
  
  Revision  Changes    Path
  1.11      +2 -6      ports/graphics/gnash/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-12-03 06:32:55 UTC 
State Changed
From-To: open->closed

Committed. Sorry for the delay.