Introduce the MPLAYER_DISABLE_DRIVERS variable, which holds a list of "drivers"

that are not wanted in the binary program.  It is empty by default, so that all
drivers are linked in to get a full featured binary package.  Packages using
this variable include mplayer and gmplayer.  While building mencoder, disable
all of these drivers, as they are not needed.  Bump PKGREVISION.

arts is now a enabled if not present in the variable.  This detail closes
PR pkg/21775 by Marc Recht.

(missed in previous commit...)

2 files changed, 29 insertions, 6 deletions

diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index b7ed247774b..5de0291c4d8 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2003/07/17 21:41:52 grant Exp $
+# $NetBSD: Makefile.common,v 1.36 2003/07/27 20:01:36 jmmv Exp $
 #
 
 MPLAYER_DIST_VERSION=	0.90
@@ -37,8 +37,6 @@ CONFIGURE_ARGS+=	--with-cdparanoiaincdir="${LOCALBASE}/include/cdparanoia"
 CONFIGURE_ARGS+=	--with-extralibdir="${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-extralibdir="${X11BASE}/lib"
 CONFIGURE_ARGS+=	--disable-mpdvdkit
-CONFIGURE_ARGS+=	--enable-faad
-CONFIGURE_ARGS+=	--disable-arts
 
 # The configure script attempts to test-execute compiled programs in /tmp,
 # but that directory may be mounted as noexec; work this around by setting
@@ -64,3 +62,24 @@ CONFIGURE_ARGS+=	--enable-mlib
 .else
 CONFIGURE_ARGS+=	--disable-mlib
 .endif
+
+# Keep this list in sync with the one in bsd.pkg.defaults.mk, where
+# MPLAYER_DISABLE_DRIVERS is explained.
+MPLAYER_DRIVERS=	arts		audio/arts \
+			esd		audio/esound \
+			faad		audio/faad2 \
+			nas		audio/nas \
+			sdl		devel/SDL
+
+.if defined(PKGNAME) && !empty(PKGNAME:M*encoder*)
+MPLAYER_DISABLE_DRIVERS=arts esd faad nas sdl
+.else
+BUILD_DEFS+=		MPLAYER_DISABLE_DRIVERS
+.endif
+.for drv pkg in ${MPLAYER_DRIVERS}
+.  if empty(MPLAYER_DISABLE_DRIVERS:M${drv})
+CONFIGURE_ARGS+=	--enable-${drv}
+.  else
+CONFIGURE_ARGS+=	--disable-${drv}
+.  endif
+.endfor
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index acc824c7fd0..62934c8a79e 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.15 2003/07/10 17:27:32 agc Exp $
+# $NetBSD: Makefile.depends,v 1.16 2003/07/27 20:01:36 jmmv Exp $
 #
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
@@ -21,11 +21,15 @@ DEPENDS+=	realplayer-codecs>=8nb2:../../graphics/realplayer-codecs
 
 USE_X11=	YES
 
+.for drv pkg in ${MPLAYER_DRIVERS}
+.  if empty(MPLAYER_DISABLE_DRIVERS:M${drv})
+.    include "../../${pkg}/buildlink2.mk"
+.  endif
+.endfor
+
 .include "../../audio/libmad/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
-.include "../../audio/faad2/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/SDL/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"