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.

16 files changed, 32 insertions, 26 deletions

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index e5f3374be50..b1b15b072c0 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2005/09/07 10:15:39 adam Exp $
+# $NetBSD: Makefile,v 1.62 2005/12/11 09:40:38 wiz Exp $
 
+PKGREVISION=		1
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "Makefile.common"
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index a104c4ca16c..c8cc51a6393 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:01 rillig Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/12/11 09:40:38 wiz Exp $
 
 DISTNAME=	SDL-1.2.9
 CATEGORIES=	devel games
@@ -63,7 +63,7 @@ MAKE_ENV+=		AM_CFLAGS=${AM_CFLAGS:Q}
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .endif
-.include "../../graphics/aalib-x11/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 3505b3c3291..8e1c49025cf 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ PTHREAD_OPTS+=	require
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .endif
-.include "../../graphics/aalib-x11/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile
index c82fe69fcae..2fc61897ab3 100644
--- a/devel/SDL_gfx/Makefile
+++ b/devel/SDL_gfx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/11 09:40:38 wiz Exp $
 
 DISTNAME=	SDL_gfx-2.0.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/
 
diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk
index 8e3b463daf8..48c5c986a78 100644
--- a/devel/SDL_gfx/buildlink3.mk
+++ b/devel/SDL_gfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_GFX_BUILDLINK3_MK:=	${SDL_GFX_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_gfx
 
 .if !empty(SDL_GFX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.3nb2
+BUILDLINK_RECOMMENDED.SDL_gfx?=	SDL_gfx>=2.0.13nb2
 BUILDLINK_PKGSRCDIR.SDL_gfx?=	../../devel/SDL_gfx
 .endif	# SDL_GFX_BUILDLINK3_MK
 
diff --git a/devel/SDL_ttf/Makefile b/devel/SDL_ttf/Makefile
index 788728d37ea..1af6465b6b2 100644
--- a/devel/SDL_ttf/Makefile
+++ b/devel/SDL_ttf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/11 09:40:38 wiz Exp $
 
 DISTNAME=	SDL_ttf-2.0.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
 
diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk
index 3f9af3c3350..560b53075ab 100644
--- a/devel/SDL_ttf/buildlink3.mk
+++ b/devel/SDL_ttf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_TTF_BUILDLINK3_MK:=	${SDL_TTF_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_ttf
 
 .if !empty(SDL_TTF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.3nb3
+BUILDLINK_RECOMMENDED.SDL_ttf?=	SDL_ttf>=2.0.7nb2
 BUILDLINK_PKGSRCDIR.SDL_ttf?=	../../devel/SDL_ttf
 .endif	# SDL_TTF_BUILDLINK3_MK
 
diff --git a/devel/SDLmm/Makefile b/devel/SDLmm/Makefile
index 546406f5d82..a9702877328 100644
--- a/devel/SDLmm/Makefile
+++ b/devel/SDLmm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	SDLmm-0.1.8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdlmm/}
 
diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk
index 5c5ada11f1f..f7aaa47b778 100644
--- a/devel/SDLmm/buildlink3.mk
+++ b/devel/SDLmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDLMM_BUILDLINK3_MK:=	${SDLMM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	SDLmm
 
 .if !empty(SDLMM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDLmm+=	SDLmm>=0.1.8nb1
+BUILDLINK_RECOMMENDED.SDLmm?=	SDLmm>=0.1.8nb4
 BUILDLINK_PKGSRCDIR.SDLmm?=	../../devel/SDLmm
 .endif	# SDLMM_BUILDLINK3_MK
 
diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index ef92b25f397..5f1533f26d1 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	DevIL-1.6.6
 PKGNAME=	${DISTNAME:S/D/d/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openil/}
 
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index e96c0cfe40d..9c8bba81700 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/12/28 23:18:16 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	devIL
 
 .if !empty(DEVIL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.devIL+=	devIL>=1.6.6nb1
-BUILDLINK_RECOMMENDED.devIL+=	devIL>=1.6.6nb3
+BUILDLINK_RECOMMENDED.devIL+=	devIL>=1.6.6nb5
 BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .endif	# DEVIL_BUILDLINK3_MK
 
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 50053006e62..d17b93228fc 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	ogre-v0-12-1
 PKGNAME=	ogre-0.12.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogre/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index eb9cdef5459..38f84a8ebb7 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	ogre
 
 .if !empty(OGRE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ogre+=	ogre>=0.12.1nb1
-BUILDLINK_RECOMMENDED.ogre+=	ogre>=0.12.1nb3
+BUILDLINK_RECOMMENDED.ogre+=	ogre>=0.12.1nb5
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
 .endif	# OGRE_BUILDLINK3_MK
 
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 7e9f81bb0a5..eb7318a2933 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2005/08/06 06:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=	SDL_perl-1.19.2
 PKGNAME=	p5-SDL-1.19.2
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	devel perl5
 MASTER_SITES=	ftp://sdlperl.org/SDL_perl/
 
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index d56b66c1841..1b21dbe9f41 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/10/12 14:52:52 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=		pygame-1.7.1release
 PKGNAME=		${PYPKGPREFIX}-game-1.7.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://pygame.org/ftp/
 
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 3d93a641446..b3d5a3443a6 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/07/20 19:39:42 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/12/11 09:40:38 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GAME_BUILDLINK3_MK:=	${PY_GAME_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-game
 
 .if !empty(PY_GAME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
+BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.7.1nb1
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
 
 .include "../../audio/SDL_mixer/buildlink3.mk"