[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share - only include supported opti...

[dillo <dillo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e35355934622
branches:  trunk
changeset: 495096:e35355934622
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Thu Jun 02 16:08:31 2005 +0000

description:
- only include supported options in PKG_SUGGESTED_OPTIONS
- don't include deprecated variables in BUILD_DEF
- no need to .undef .for loop variables

diffstat:

 multimedia/mplayer-share/options.mk |  21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diffs (44 lines):

diff -r 780334d3db61 -r e35355934622 multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Thu Jun 02 16:00:56 2005 +0000
+++ b/multimedia/mplayer-share/options.mk       Thu Jun 02 16:08:31 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/06/01 20:31:38 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/06/02 16:08:31 dillo Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -45,26 +45,23 @@
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-PKG_SUGGESTED_OPTIONS+=        cdparanoia dv dvdread gif jpeg mad mplayer-menu \
-                       oss png mplayer-real theora vorbis \
-                       mplayer-runtime-cpudetection mplayer-win32 \
-                       xvid
-.if !empty(PKGNAME:M*mplayer*)
-PKG_SUGGESTED_OPTIONS+=        arts esound nas sdl
-.elif !empty(PKGNAME:M*mencoder*)
-PKG_SUGGESTED_OPTIONS+=        lame
-.endif
+.for _o_ in arts cdparanoia dv dvdread esound gif jpeg \
+           lame mad mplayer-menu mplayer-real \
+           mplayer-runtime-cpudetection mplayer-win32 \
+           nas oss png sdl theora vorbis xvid 
+.  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
+PKG_SUGGESTED_OPTIONS+=        ${_o_}
+.  endif
+.endfor
 
 # -------------------------------------------------------------------------
 # Define PKG_SUGGESTED_OPTIONS based on deprecated variables.
 # -------------------------------------------------------------------------
 
-BUILD_DEFS+=           MPLAYER_DISABLE_DRIVERS
 .for d in ${MPLAYER_DISABLE_DRIVERS}
 PKG_SUGGESTED_OPTIONS+=        -${d:S/esd/esound/}
 _DEPRECATED_WARNING:=  ${_DEPRECATED_WARNING} "Deprecated variable MPLAYER_DISABLE_DRIVERS=${d} used; use PKG_DEFAULT_OPTIONS+=-${d:S/esd/esound/} instead."
 .endfor
-.undef d
 
 .if ${MACHINE_ARCH} == "i386"
 PKG_OPTIONS_LEGACY_VARS+=      \