From d29d0487b67433b776421bc0802e3ff2ee7b259d Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Tue, 25 Mar 2008 17:29:57 +0000
Subject: [PATCH] no need for lame's no_x11 flavor anymore.

---
 devel/gstreamer-plugins/Makefile |  6 +++---
 net/ices/Makefile                |  6 +++---
 x11/mplayer/Makefile             | 11 +++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/devel/gstreamer-plugins/Makefile b/devel/gstreamer-plugins/Makefile
index 03d9560b595..80260cbf9a0 100644
--- a/devel/gstreamer-plugins/Makefile
+++ b/devel/gstreamer-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2008/03/24 06:52:02 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.39 2008/03/25 17:29:57 fgsch Exp $
 
 COMMENT-main=		GStreamer Streaming-media framework plug-ins
 
@@ -84,7 +84,7 @@ PSEUDO_FLAVORS+=	no_${PLUGIN}
 .  if !${FLAVOR:L:Mno_${PLUGIN}} && !${FLAVOR:L:Mminimal}
 MULTI_PACKAGES+=	-${PLUGIN}
 # also check for individual overrides below
-PKGNAME-${PLUGIN}=	gstreamer-${PLUGIN}-${VERSION}p15
+PKGNAME-${PLUGIN}=	gstreamer-${PLUGIN}-${VERSION}p16
 BASENAME-${PLUGIN}=	gstreamer-${PLUGIN}
 .  endif
 .endfor
@@ -181,7 +181,7 @@ LIB_DEPENDS-jpeg=	jpeg::graphics/jpeg \
 COMMENT-lame=		GStreamer plugin for encoding mp3 files using LAME
 PERMIT_PACKAGE_CDROM-lame=	patent issues
 WANTLIB-lame=		${myWANTLIB}
-LIB_DEPENDS-lame=	mp3lame:lame-*:audio/lame,no_x11 \
+LIB_DEPENDS-lame=	mp3lame:lame-*:audio/lame \
 			${myLIB_DEPENDS}
 
 # mad
diff --git a/net/ices/Makefile b/net/ices/Makefile
index 132e07ea8b6..dfb238b5402 100644
--- a/net/ices/Makefile
+++ b/net/ices/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2007/10/22 14:47:58 steven Exp $
+# $OpenBSD: Makefile,v 1.14 2008/03/25 17:29:57 fgsch Exp $
 
 COMMENT=	icecast source for streaming MP3
 
 DISTNAME=	ices-0.4
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	net audio
 
 HOMEPAGE=	http://www.icecast.org/ices.php
@@ -27,7 +27,7 @@ CONFIGURE_ARGS=	--with-docdir=${LOCALBASE}/share/doc/ices \
 		--with-flac=${LOCALBASE}
 
 MODULES=	converters/libiconv
-LIB_DEPENDS=	mp3lame:lame-*:audio/lame,no_x11 \
+LIB_DEPENDS=	mp3lame:lame-*:audio/lame \
 		shout.>=3::net/libshout \
 		speex.>=4::audio/speex \
 		FLAC.>=5::audio/flac \
diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 2231d1a7eb8..5aa64a11035 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.128 2008/03/19 22:35:35 jasper Exp $
+# $OpenBSD: Makefile,v 1.129 2008/03/25 17:29:57 fgsch Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS=		amd64 i386 powerpc sparc64 arm
@@ -9,7 +9,7 @@ V=			1.0rc2
 N=			mplayer
 DISTNAME=		MPlayer-${V}
 DIST_SUBDIR=		${N}
-PKGNAME=		${N}-${V}p2
+PKGNAME=		${N}-${V}p3
 CATEGORIES=		x11 multimedia
 EXTRACT_SUFX=		.tar.bz2
 
@@ -50,7 +50,8 @@ LIB_DEPENDS=	png::graphics/png \
 		ogg.>=5::audio/libogg \
 		xvidcore::multimedia/xvidcore \
 		x264::multimedia/x264 \
-		faad::audio/faad
+		faad::audio/faad \
+		mp3lame:lame-*:audio/lame
 
 BUILD_DEPENDS=	::net/livemedia \
 		:rtunes->=0.7:audio/rtunes
@@ -139,14 +140,12 @@ CONFIGURE_ARGS+=--disable-gui \
 		--disable-x11 \
 		--disable-fontconfig \
 		--disable-freetype
-LIB_DEPENDS+=	mp3lame:lame-*:audio/lame,no_x11
 .  endif
 .else
 CONFIGURE_ARGS+=--enable-gui \
 		--enable-gl
 USE_X11=	Yes
-LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
-		mp3lame:lame-*:audio/lame
+LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 WANTLIB+=	GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 		Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86dga Xxf86vm \
 		atk-1.0 cairo expat fontconfig freetype glib-2.0 glitz \