Convert aalib to options framework, adding an 'x11' option, and remove

aalib-x11 and aview-x11.
SDL dependencies change, so bump PKGREVISION (and BUILDLINK_RECOMMENDED)
for affected packages.

Addresses PR 32046 by Leonard Schmidt.

29 files changed, 58 insertions, 50 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 4f19cc828df..676fa7021c4 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=	avidemux-2.0.40
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/
 
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index e50b4b0f515..a89b22c3d5d 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=	dumpmpeg-0.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dumpmpeg/}
 
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 980ebc96063..26f0f8af030 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=	Video-DVDRip-0.50.18
 PKGNAME=	${DISTNAME:C|Video-DVDRip|dvdrip|}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia x11 sysutils
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Video/}
 
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 9648ff2fa44..9ae8bc08155 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/08/15 02:15:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=		gopchop-1.1.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gopchop/} \
 			http://outflux.net/unix/software/GOPchop/download/
diff --git a/multimedia/gst-plugins-mpeg2dec/Makefile b/multimedia/gst-plugins-mpeg2dec/Makefile
index 5d67433618d..1762e968709 100644
--- a/multimedia/gst-plugins-mpeg2dec/Makefile
+++ b/multimedia/gst-plugins-mpeg2dec/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/05/25 21:07:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/11 09:40:45 wiz Exp $
 #
 
 GST_PLUGINS_NAME=	mpeg2dec
 GST_PLUGINS_DIR=	ext/mpeg2dec
+PKGREVISION=		1
 
 .include "../../multimedia/gst-plugins/Makefile.common"
 
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index fab601a053d..3017f799546 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/10/19 13:26:01 adam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	gxine-0.4.9
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 1c9dacc7d84..f6e64ab388f 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index 630b571e219..25874f24346 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/06/03 22:58:54 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/11 09:40:45 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	kdemultimedia
 
 .if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.2.2
-BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.4.0
+BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.4.3nb1
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index a65091971aa..74751fac5b5 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=	kmplayer-0.9.1
+PKGREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 52698b1df74..acf7349575d 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/08/20 11:44:09 grant Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	mpeg2dec-0.4.0b
 PKGNAME=	libmpeg2-0.4.0b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 
diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk
index 9f7704e23a6..941e8208d48 100644
--- a/multimedia/libmpeg2/buildlink3.mk
+++ b/multimedia/libmpeg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:45 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMPEG2_BUILDLINK3_MK:=	${LIBMPEG2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libmpeg2
 
 .if !empty(LIBMPEG2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
-BUILDLINK_RECOMMENDED.libmpeg2+=	libmpeg2>=0.4.0nb1
+BUILDLINK_RECOMMENDED.libmpeg2+=	libmpeg2>=0.4.0bnb2
 BUILDLINK_PKGSRCDIR.libmpeg2?=	../../multimedia/libmpeg2
 .endif	# LIBMPEG2_BUILDLINK3_MK
 
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index aef88cea225..cd66a894dbc 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/06/15 22:42:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:46 wiz Exp $
 
 DISTNAME=	mjpegtools-1.6.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index 14a57350c53..16b3470268c 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/12/11 09:40:46 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mjpegtools
 
 .if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.6.1.90nb3
-BUILDLINK_RECOMMENDED.mjpegtools+=	mjpegtools>=1.6.2nb2
+BUILDLINK_RECOMMENDED.mjpegtools+=	mjpegtools>=1.6.2nb6
 BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
 .endif	# MJPEGTOOLS_BUILDLINK3_MK
 
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 11304644964..f8ad1760c84 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2005/12/09 17:54:25 salo Exp $
+# $NetBSD: options.mk,v 1.14 2005/12/11 09:40:46 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -67,7 +67,7 @@ PKG_SUGGESTED_OPTIONS+=	${_o_}
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Maalib)
-.  include "../../graphics/aalib-x11/buildlink3.mk"
+.  include "../../graphics/aalib/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Marts)
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 0ad96448f43..e73dd14b510 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/12/10 23:34:41 salo Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/11 09:40:46 wiz Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 
 COMMENT=	Software-only MPEG-1/2/4 video decoder
 
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index a2af77c4b06..eaaab1f5f80 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:22 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=	smpeg-xmms-0.3.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
 
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 668947d55d4..f140040e193 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/09/04 05:20:05 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	devel multimedia
 MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
 		ftp://ftp.linuxgames.com/loki/open-source/smpeg/
diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
index 2c4f2632ac0..3baf49f316d 100644
--- a/multimedia/smpeg/buildlink3.mk
+++ b/multimedia/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/07 16:36:47 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/12/11 09:40:46 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	smpeg
 
 .if !empty(SPMEG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
-BUILDLINK_RECOMMENDED.smpeg+=	smpeg>=0.4.4nb8
+BUILDLINK_RECOMMENDED.smpeg+=	smpeg>=0.4.4nb11
 BUILDLINK_PKGSRCDIR.smpeg?=	../../multimedia/smpeg
 .endif	# SMPEG_BUILDLINK3_MK
 
diff --git a/multimedia/swfdec-gtk2/Makefile b/multimedia/swfdec-gtk2/Makefile
index 253845524e2..3b0172204d7 100644
--- a/multimedia/swfdec-gtk2/Makefile
+++ b/multimedia/swfdec-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:46 wiz Exp $
 #
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "../../multimedia/swfdec/Makefile.common"
 
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
index 9fd0f2846a8..15bee0ae69c 100644
--- a/multimedia/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:46 wiz Exp $
 #
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 .include "Makefile.common"
 
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 870594b27d2..961c48c1905 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/06/05 17:50:51 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:46 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	swfdec
 
 .if !empty(SWFDEC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.2
-BUILDLINK_RECOMMENDED.swfdec+=	swfdec>=0.2.2nb1
+BUILDLINK_RECOMMENDED.swfdec+=	swfdec>=0.2.2nb3
 BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
 .endif	# SWFDEC_BUILDLINK3_MK
 
diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
index 99b252e83e5..c994ced6639 100644
--- a/multimedia/totem-xine/Makefile
+++ b/multimedia/totem-xine/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2005/11/25 21:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:46 wiz Exp $
 #
 
 .include "../../multimedia/totem/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-xine-/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(using Xine)
 
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index fddf5825ca2..f955dc4554f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/11 09:40:46 wiz Exp $
 
 DISTNAME=	transcode-0.6.12
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.fkb.wormulon.net/transcode/ \
 		http://dl.kel.wormulon.net/transcode/
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c72281f70a0..138df1faa1b 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/11/11 23:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index c8e91355562..c9ee4661519 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/06/20 18:43:26 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/11 09:40:46 wiz Exp $
 #
 # This Makefile fragment is included by packages that use vlc.
 #
@@ -15,6 +15,7 @@ BUILDLINK_DEPENDS+=	vlc
 .if !empty(VLC_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		vlc
 BUILDLINK_DEPENDS.vlc?=		vlc>=0.7.1
+BUILDLINK_RECOMMENDED.vlc?=	vlc>=0.7.2nb7
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 .endif # VLC_BUILDLINK3_MK
 
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index 3a30e3c39ef..e938568f23c 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/19 04:48:28 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=		xfmedia-0.9.1
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		http://spuriousinterrupt.org/projects/xfmedia/files/
 EXTRACT_SUFX=           .tar.bz2
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 2386fc200ad..e2f50bee271 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/11/01 06:20:42 reed Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:46 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Multimedia player library
 
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index dab8d21aaee..a384b2d529c 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/10/13 10:48:01 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/12/11 09:40:46 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	xine-lib
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3c
 BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0.3a
+BUILDLINK_RECOMMENDED.xine-lib?=	xine-lib>=1.0.3anb2
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 .endif	# XINE_LIB_BUILDLINK3_MK
 
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 3251f5e478d..ed695a9edea 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:43 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=		xine-ui-0.99.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}