diff options
| author | dillo <dillo@pkgsrc.org> | 2005-06-02 16:08:31 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2005-06-02 16:08:31 +0000 |
| commit | d26beb2a29d8f66170da3e60f61d9d1860838f0b (patch) | |
| tree | b5e9d1a1405010acd57ba787a1d7a6e68094eb3e | |
| parent | ecb0f25eec9fc89abf0fddb17b71cf2f8b795713 (diff) | |
| download | pkgsrc-d26beb2a29d8f66170da3e60f61d9d1860838f0b.tar.gz | |
- only include supported options in PKG_SUGGESTED_OPTIONS
- don't include deprecated variables in BUILD_DEF
- no need to .undef .for loop variables
| -rw-r--r-- | multimedia/mplayer-share/options.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk index 6ff2bbe4fd5..f76da51d915 100644 --- a/multimedia/mplayer-share/options.mk +++ b/multimedia/mplayer-share/options.mk @@ -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 @@ PKG_SUPPORTED_OPTIONS+= mplayer-real # 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+= \ |