pkg/42211: [PATCH] faad option for mplayer does not work

[rumcic%gmail.com@localhost]

>Number:         42211
>Category:       pkg
>Synopsis:       [PATCH] faad option for mplayer does not work
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Thu Oct 22 10:30:00 +0000 2009
>Originator:     Rumko
>Release:        /
>Organization:
>Environment:
DragonFly rumko.rumko.net 2.5.1-DEVELOPMENT DragonFly 
v2.5.1.84.g42ba1-DEVELOPMENT #24: Sun Oct 18 13:56:16 CEST 2009     
root%rumko.rumko.net@localhost:/usr/obj/usr/src/sys/MYPRECIOUS  i386
>Description:
Faad configure options have been changed a bit, so the included patch is needed 
to make mplayer&co. compile when faad is set in PKG_OPTIONS
>How-To-Repeat:

>Fix:
diff --git a/multimedia/mplayer-share/options.mk 
b/multimedia/mplayer-share/options.mk
index de31cb3..ce69488 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -157,12 +157,14 @@ CONFIGURE_ARGS+=  --disable-faac
 .endif

 .if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
-CONFIGURE_ARGS+=       --disable-faad-external
+CONFIGURE_ARGS+=       --disable-faad
 CONFIGURE_ARGS+=       --disable-faad-internal
 .elif !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+=       --enable-faad-external
+CONFIGURE_ARGS+=       --enable-faad
+CONFIGURE_ARGS+=       --disable-faad-internal
 .  include "../../audio/faad2/buildlink3.mk"
 .else
+CONFIGURE_ARGS+=       --enable-faad
 CONFIGURE_ARGS+=       --enable-faad-internal
 .endif