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.

17 files changed, 34 insertions, 29 deletions

diff --git a/audio/SDL-arts/Makefile b/audio/SDL-arts/Makefile
index 684399a11a5..75e932d6d0f 100644
--- a/audio/SDL-arts/Makefile
+++ b/audio/SDL-arts/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/09/07 10:16:16 adam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:37 wiz Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-arts/}
+PKGREVISION=	1
 
 CATEGORIES+=	audio kde
 
diff --git a/audio/SDL-esound/Makefile b/audio/SDL-esound/Makefile
index 1afe49cdefe..6b793f2cf17 100644
--- a/audio/SDL-esound/Makefile
+++ b/audio/SDL-esound/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/09/07 10:16:40 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/11 09:40:37 wiz Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-esound/}
+PKGREVISION=	1
 
 CATEGORIES+=	audio gnome
 
diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index fac10f1ab2d..a0497bd1c01 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:37 wiz Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-nas/}
+PKGREVISION=	1
 
 CATEGORIES+=	audio
 
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index 3b015e2607e..527088401ca 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/10/23 18:30:52 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/11 09:40:37 wiz Exp $
 
 DISTNAME=	SDL_mixer-1.2.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index 48ad99010c2..bf5345dd606 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/10/20 10:55:46 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/12/11 09:40:37 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_mixer
 
 .if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
-BUILDLINK_RECOMMENDED.SDL_mixer+=	SDL_mixer>=1.2.5nb4
+BUILDLINK_RECOMMENDED.SDL_mixer+=	SDL_mixer>=1.2.6nb3
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 .endif	# SDL_MIXER_BUILDLINK3_MK
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
index 25b8db95122..6a802781e15 100644
--- a/audio/SDL_sound/Makefile
+++ b/audio/SDL_sound/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:37 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:37 wiz Exp $
 #
 
 DISTNAME=		SDL_sound-1.0.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		http://icculus.org/SDL_sound/downloads/
 
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index f10ba1c0b5a..ed74eed6ae8 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/12/11 09:40:37 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_SOUND_BUILDLINK3_MK:=	${SDL_SOUND_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_sound
 
 .if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
-BUILDLINK_RECOMMENDED.SDL_sound+=	SDL_sound>=1.0.1nb1
+BUILDLINK_RECOMMENDED.SDL_sound+=	SDL_sound>=1.0.1nb3
 BUILDLINK_PKGSRCDIR.SDL_sound?=	../../audio/SDL_sound
 .endif	# SDL_SOUND_BUILDLINK3_MK
 
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index a370febe024..f363da372b6 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/11/17 16:45:52 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/11 09:40:37 wiz Exp $
 
 DISTNAME=		amarok-1.3.6
+PKGREVISION=		1
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
index 6017a1360fe..c637947d062 100644
--- a/audio/libvisual-bmp/Makefile
+++ b/audio/libvisual-bmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=		libvisual-bmp-0.2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual-xmms/Makefile b/audio/libvisual-xmms/Makefile
index dbb86c75a73..968ff4a077c 100644
--- a/audio/libvisual-xmms/Makefile
+++ b/audio/libvisual-xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=		libvisual-xmms-0.2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index 667acacbab2..947409eea7c 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/20 08:45:09 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=		tcd-2.2.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://savannah.gnu.org/download/tcd/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
index 6a0733530dd..7e7b780a242 100644
--- a/audio/xmms-funtimedancer/Makefile
+++ b/audio/xmms-funtimedancer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	FunTimeDancer-0.1
 PKGNAME=	xmms-funtimedancer-0.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ftd/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} FunTimeDancer-packs-1.0.tar.gz
diff --git a/audio/xmms-infinity/Makefile b/audio/xmms-infinity/Makefile
index 327162fdd5b..d3618fe0757 100644
--- a/audio/xmms-infinity/Makefile
+++ b/audio/xmms-infinity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	infinity-0.2
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://julien.carme.free.fr/
 
diff --git a/audio/xmms-jess/Makefile b/audio/xmms-jess/Makefile
index 6fb83fb1937..68ca1b420f4 100644
--- a/audio/xmms-jess/Makefile
+++ b/audio/xmms-jess/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	JESS-2.9.1
 PKGNAME=	xmms-jess-2.9.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://arquier.free.fr/
 
diff --git a/audio/xmms-nebulus/Makefile b/audio/xmms-nebulus/Makefile
index fef1834b565..87c32742171 100644
--- a/audio/xmms-nebulus/Makefile
+++ b/audio/xmms-nebulus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	xmms-nebulus-0.6.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://nebulus.tuxfamily.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xmms-paranormal/Makefile b/audio/xmms-paranormal/Makefile
index f745fe4bcc2..8511cb78666 100644
--- a/audio/xmms-paranormal/Makefile
+++ b/audio/xmms-paranormal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	paranormal-0.2.0
 PKGNAME=	xmms-paranormal-0.2.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/paranormal/}
 
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
index d3f473ab03f..df1336d5bc5 100644
--- a/audio/xmms-tv-scope/Makefile
+++ b/audio/xmms-tv-scope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	tv_scope-0.0.2
 PKGNAME=	xmms-tv-scope-0.0.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://staff.xmms.org/zinx/xmms/