From c40b7bd8878b7f3d1dab2745618ca062832437a4 Mon Sep 17 00:00:00 2001
From: alek <alek@openbsd.org>
Date: Sun, 2 Jan 2005 20:27:16 +0000
Subject: [PATCH] - Fix WANTLIB - Better LIB_DEPENDS

---
 audio/xmms/Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 6249fc3ce13..8de0caf3ac0 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2005/01/02 20:11:01 robert Exp $
+# $OpenBSD: Makefile,v 1.37 2005/01/02 20:27:16 alek Exp $
 
 COMMENT=		"Multimedia player for the X Window System"
 COMMENT-esd=		"Esound output plugin for XMMS"
@@ -23,7 +23,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		GL ICE SM X11 Xext Xi Xxf86vm c glib gmodule m pthread z
+WANTLIB=		X11 Xext Xi glib gmodule m pthread
 
 V=			1.2.x
 MASTER_SITES=		${HOMEPAGE}/files/$V/ \
@@ -49,6 +49,10 @@ MULTI_PACKAGES+=	-mp3
 
 SUBPACKAGE?=
 
+.if empty(SUBPACKAGE)
+WANTLIB+=		GL ICE c Xxf86vm SM
+.endif
+
 MODULES=		devel/gettext
 RUN_DEPENDS=		:unzip-*:archivers/unzip
 LIB_DEPENDS=		gtk.1.2,gdk.1.2::x11/gtk+ \
@@ -67,26 +71,26 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 DOCS=			README NEWS FAQ
 
-
 .if defined(PACKAGING)
 . if ${SUBPACKAGE} == "-esd"
-LIB_DEPENDS=		esd.2::audio/esound
+LIB_DEPENDS+=		esd.2::audio/esound
 RUN_DEPENDS=		::audio/xmms
 WANTLIB+=		audiofile
 . endif
 . if ${SUBPACKAGE} == "-vorbis"
-LIB_DEPENDS=		vorbis.0,vorbisfile.1::audio/libvorbis
+LIB_DEPENDS+=		vorbis.0,vorbisfile.1::audio/libvorbis
 RUN_DEPENDS=		::audio/xmms
 WANTLIB+=		ogg
 . endif
 . if ${SUBPACKAGE} == "-mikmod"
-LIB_DEPENDS=		mikmod.0::audio/libmikmod
+LIB_DEPENDS+=		mikmod.0::audio/libmikmod
 RUN_DEPENDS=		::audio/xmms
 . endif
 . if ${SUBPACKAGE} == "-mp3"
 PERMIT_PACKAGE_CDROM=	"patent issues"
 PERMIT_DISTFILES_CDROM= "patent issues"
-RUN_DEPENDS=		::audio/xmms
+LIB_DEPENDS+=		xmms.4:xmms-$(VERSION)*:audio/xmms
+WANTLIB+=		z
 . endif
 .else
 . if ${MULTI_PACKAGES:M-esd}