summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/mplayer-share/Makefile.common5
-rw-r--r--graphics/mplayer-share/Makefile.depends5
-rw-r--r--mk/bsd.pkg.defaults.mk4
3 files changed, 7 insertions, 7 deletions
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 5de0291c4d8..3126004a239 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2003/07/27 20:01:36 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.37 2003/08/04 11:43:48 jmmv Exp $
#
MPLAYER_DIST_VERSION= 0.90
@@ -67,12 +67,11 @@ CONFIGURE_ARGS+= --disable-mlib
# 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
+MPLAYER_DISABLE_DRIVERS=arts esd nas sdl
.else
BUILD_DEFS+= MPLAYER_DISABLE_DRIVERS
.endif
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 62934c8a79e..b24db418417 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.16 2003/07/27 20:01:36 jmmv Exp $
+# $NetBSD: Makefile.depends,v 1.17 2003/08/04 11:43:48 jmmv Exp $
#
DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
@@ -27,7 +27,8 @@ USE_X11= YES
. endif
.endfor
-.include "../../audio/libmad/buildlink2.mk"
+.include "../../audio/faad2/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
.include "../../audio/libvorbis/buildlink2.mk"
.include "../../converters/libiconv/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 7caf6376db1..a2a70b17a95 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.168 2003/08/04 11:14:07 jmmv Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.169 2003/08/04 11:43:47 jmmv Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -1193,7 +1193,7 @@ MOZILLA_USE_XFT?= NO
MPLAYER_DISABLE_DRIVERS?=
# Whitespace separated list of output drivers that are not wanted in
# mplayer/gmplayer's binary.
-# Possible: arts esd faad nas sdl
+# Possible: arts esd nas sdl
# Default: empty
MPLAYER_ENABLE_RUNTIME_CPU_DETECTION?= YES