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.
author: wiz <wiz@pkgsrc.org> 2005-12-11 09:40:37 +0000
committer: wiz <wiz@pkgsrc.org> 2005-12-11 09:40:37 +0000
commit: 4d147ec19bab7ad1628dfead37b782c7fa932941 (patch)
tree: 833777ff9c9882d5f6516d9f65a2944f5dd58aef
parent: 288eb75ae208e7d3fcae10c0a416a02496d1cd95 (diff)
download: pkgsrc-4d147ec19bab7ad1628dfead37b782c7fa932941.tar.gz
191 files changed, 480 insertions, 588 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/
 
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"
diff --git a/emulators/Cygne-SDL/Makefile b/emulators/Cygne-SDL/Makefile
index 0609af7e03e..7b8abca80a7 100644
--- a/emulators/Cygne-SDL/Makefile
+++ b/emulators/Cygne-SDL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/11/03 21:38:04 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:38 wiz Exp $
 #
 
 DISTNAME=		Cygne-SDL-0.1-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		http://sdlemu.ngemu.com/OpenProjects/
 
diff --git a/emulators/NeoPop-SDL/Makefile b/emulators/NeoPop-SDL/Makefile
index 0f085ab295f..d3e29cb0869 100644
--- a/emulators/NeoPop-SDL/Makefile
+++ b/emulators/NeoPop-SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		NeoPop-SDL-0.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.nih.at/NeoPop-SDL/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index 240a5ba5dfa..fe0196f9b52 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		aranym-0.8.9beta
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aranym/}
 
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index d12dcb610e1..bde1580b611 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		arnsrc27012002
 PKGNAME=		arnold-20020127
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		http://arnold.emuunlim.com/download/
 EXTRACT_SUFX=		.zip
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 5abe64523d9..64bcd065d9f 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/11 09:40:39 wiz Exp $
 
 DISTNAME=	atari800-1.3.6
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile
index 21faefd0732..57b9739e838 100644
--- a/emulators/dega/Makefile
+++ b/emulators/dega/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/10/23 14:34:41 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=	dega-1.07
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.emulinks.de/emus/
 
diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile
index 02895381677..25d87ad19ec 100644
--- a/emulators/dgen/Makefile
+++ b/emulators/dgen/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=	dgen-sdl-1.23
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.pknet.com/~joe/
 
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index a24341f52dd..d7e2c30ccd8 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:11 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:39 wiz Exp $
 
 DISTNAME=	dosbox-0.63
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dosbox/}
 
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index ee5e589fbc2..351985b30fc 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/10/30 11:47:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		fceu-0.98.13.src
 PKGNAME=		${DISTNAME:S/.src//}
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		http://pdaxrom.theinternet.nl/fceu/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
index 43c5cf291b6..d374168ff80 100644
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		gcube-v0.2-src
 PKGNAME=		gcube-0.2
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		http://gcube.exemu.net/downloads/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index b4979042136..2caaa000e45 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/10/02 22:06:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=	generator-0.35-cbiere-r2
 PKGNAME=	generator-cbiere-0.35r2
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ghostwhitecrab.de/generator/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 70638d25999..d09d72aae1d 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=	generator-0.35
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/
 
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index 0f98a1f424c..85a0f70b4ef 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:11 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		gens-rc3
 PKGNAME=		gens-2.12rc3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gens/}
 
diff --git a/emulators/gnuboy-sdl/Makefile b/emulators/gnuboy-sdl/Makefile
index d0a4ad0de86..2f88e569fda 100644
--- a/emulators/gnuboy-sdl/Makefile
+++ b/emulators/gnuboy-sdl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:39 wiz Exp $
 
 DISTNAME=	gnuboy-1.0.3
 PKGNAME=	${DISTNAME:S/-/-sdl-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://gnuboy.unix-fu.org/src/
 
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 885972ab786..a095f9e5c63 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/07/01 09:35:38 adam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/11 09:40:39 wiz Exp $
 
 DISTNAME=	hatari-0.70
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hatari/}
 
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 97545909c75..b56903d6010 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:11 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		openmsx-0.5.2
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=openmsx/}
 
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index b99eaed3247..77983e1c240 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		pearpc-0.3.1
-PKGREVISION=	1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pearpc/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 7f33c6db4f1..b989b7c68b3 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		qemu-0.7.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		http://fabrice.bellard.free.fr/qemu/
 
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 30d49c7e2ce..f0e98d116e3 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/11/04 21:10:42 dbj Exp $
+$NetBSD: distinfo,v 1.15 2005/12/11 09:40:39 wiz Exp $
 
 SHA1 (qemu-0.7.2.tar.gz) = 4daeccb57448eacc444152f30b5d84dfcca89dfe
 RMD160 (qemu-0.7.2.tar.gz) = 1d2dcc8f43ff4b4b9aa045c64e38c9a10140b13e
@@ -6,7 +6,7 @@ Size (qemu-0.7.2.tar.gz) = 1341993 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ac) = fa190b38658ad487a6ddf6d78cc3cbb262c67702
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
-SHA1 (patch-ag) = 4bb7ae18fd0f0c5ecfa2ab2594d1de5b33660495
+SHA1 (patch-ag) = 86df0bb94e71d87cf61d19404b53e3572384874e
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
 SHA1 (patch-aj) = d050b84489e74036994c19e982a363d74df797ab
diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag
index 6a0fd5ba2ad..dd55f0b3a45 100644
--- a/emulators/qemu/patches/patch-ag
+++ b/emulators/qemu/patches/patch-ag
@@ -1,17 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $
+$NetBSD: patch-ag,v 1.4 2005/12/11 09:40:39 wiz Exp $
 
---- configure.orig	Sun Nov 14 15:51:33 2004
+--- configure.orig	2005-09-04 17:11:31.000000000 +0000
 +++ configure
-@@ -259,7 +259,7 @@ aa="no"
- `$sdl_config --static-libs | grep \\\-laa > /dev/null` && aa="yes"
- sdl_static_libs=`$sdl_config --static-libs`
- if [ "$aa" = "yes" ] ; then
--  sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
-+  sdl_static_libs="$sdl_static_libs `aalib-x11-config --static-libs`"
- fi
- 
- if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
-@@ -314,7 +314,7 @@ else
+@@ -366,7 +366,7 @@ else
  if test -z "$prefix" ; then
      prefix="/usr/local"
  fi
@@ -20,7 +11,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $
  datadir="$prefix/share/qemu"
  docdir="$prefix/share/doc/qemu"
  bindir="$prefix/bin"
-@@ -423,6 +423,8 @@ if test "$mingw32" = "yes" ; then
+@@ -539,6 +539,8 @@ if test "$mingw32" = "yes" ; then
    echo "#define CONFIG_WIN32 1" >> $config_h
  elif test -f "/usr/include/byteswap.h" ; then
    echo "#define HAVE_BYTESWAP_H 1" >> $config_h
@@ -29,12 +20,3 @@ $NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $
  fi
  if test "$darwin" = "yes" ; then
    echo "CONFIG_DARWIN=yes" >> $config_mak
-@@ -566,7 +568,7 @@ if test "$target_user_only" = "no"; then
-         fi
-         echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
-         if [ "${aa}" = "yes" ] ; then
--            echo -n " `aalib-config --cflags`" >> $config_mak ;
-+            echo -n " `aalib-x11-config --cflags`" >> $config_mak ;
-         fi
-         echo "" >> $config_mak
-     fi
diff --git a/emulators/sms_sdl/Makefile b/emulators/sms_sdl/Makefile
index ca9bfdc8d13..3be23551c54 100644
--- a/emulators/sms_sdl/Makefile
+++ b/emulators/sms_sdl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/11/03 21:42:46 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:39 wiz Exp $
 #
 
 DISTNAME=		sms_sdl-0.9.4a-r7.1-src
 PKGNAME=		sms_sdl-0.9.4a.7.1
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		http://membres.lycos.fr/cyxdown/smssdl/
 EXTRACT_SUFX=		.zip
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 5fc99ef247e..da96cb4c5a6 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:12 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/11 09:40:40 wiz Exp $
 
 STELLA_VERSION=	1.4.1
 DISTNAME=	stella-${STELLA_VERSION}-src
 PKGNAME=	stella-${STELLA_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
 
diff --git a/emulators/z26/Makefile b/emulators/z26/Makefile
index f342aa0fb7a..4ac8b073780 100644
--- a/emulators/z26/Makefile
+++ b/emulators/z26/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:13 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		z26v213
 PKGNAME=		z26-2.13
+PKGREVISION=		1
 CATEGORIES=		emulators games
 MASTER_SITES=		http://www.whimsey.com/z26/
 
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 65bf35fe037..c0dd5666d63 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:48 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		zsnes142src
 PKGNAME=		zsnes-1.42
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
 
diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile
index 9ea092e305d..1812c347ab0 100644
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 07:10:12 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		4stAttack-2.1.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=forcedattack/}
 
diff --git a/games/InterLOGIC/Makefile b/games/InterLOGIC/Makefile
index 91f511a1b59..f287d059042 100644
--- a/games/InterLOGIC/Makefile
+++ b/games/InterLOGIC/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/17 08:08:43 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		interLOGIC-src-0.30
 # authors' preferred casing
 PKGNAME=		InterLOGIC-0.30
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=interlogic/}
 
diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile
index e8a0220e8e1..746b71bcab2 100644
--- a/games/KoboDeluxe/Makefile
+++ b/games/KoboDeluxe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:40 wiz Exp $
 
 DISTNAME=	KoboDeluxe-0.4pre8
 PKGNAME=	${DISTNAME:S/pre/rc/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://olofson.net/kobodl/download/
 
diff --git a/games/REminiscence/Makefile b/games/REminiscence/Makefile
index f3016623570..d88cfb03b55 100644
--- a/games/REminiscence/Makefile
+++ b/games/REminiscence/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:15 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		REminiscence-0.1.6
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://membres.lycos.fr/cyxdown/reminiscence/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/anise/Makefile b/games/anise/Makefile
index 44e5f8627f3..cefe1cb82a6 100644
--- a/games/anise/Makefile
+++ b/games/anise/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=	anise-beta10-20040307-linux
 PKGNAME=	anise-0beta10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://kldp.net/download.php/1051/
 
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 1e1bcd6a0ab..8d58273e191 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:16 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:40 wiz Exp $
 
 DISTNAME=	asc-source+music-1.16.1.0
 PKGNAME=	${DISTNAME:S/-source+music//}
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/blindmine/Makefile b/games/blindmine/Makefile
index d48c14af267..f8429d5f03b 100644
--- a/games/blindmine/Makefile
+++ b/games/blindmine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/20 21:23:52 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=	    blindmine-0.01
+PKGREVISION=	    1
 CATEGORIES=	    games python
 MASTER_SITES=	    http://kldp.net/frs/download.php/1378/
 EXTRACT_SUFX=	    .zip
diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 06d30924002..e2f74c76e47 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/03 21:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		blobwars-1.04-1
 PKGNAME=		blobwars-1.04.1
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		# real site produces wrong filename, use default
 # http://www.parallelrealities.co.uk/download.php?type=zip&file=
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 3d41e9d2fb2..e13d6f0854c 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:40 wiz Exp $
 
 DISTNAME=		bomberclone-0.11.6
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bomberclone/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 5239799f31f..19b8545b19f 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		boson-all-0.8
 PKGNAME=		${DISTNAME:S/-all//}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boson/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index efb2ba78d31..41b68b1cace 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/10/10 17:10:49 hira Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/11 09:40:40 wiz Exp $
 
 DISTNAME=	bzflag-2.0.2.20050318
 PKGNAME=	${DISTNAME:S/.20050318//}
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=bzflag/}
 
diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index a9f68b2cd1d..3d943e10fc6 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		circuslinux-1.0.3
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/src/
 
diff --git a/games/crimsonfields/Makefile b/games/crimsonfields/Makefile
index f3da2307b1c..cb21065164f 100644
--- a/games/crimsonfields/Makefile
+++ b/games/crimsonfields/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2005/10/20 00:41:08 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=		crimson-0.4.9
 PKGNAME=		${DISTNAME:S/crimson/crimsonfields/}
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://crimson.seul.org/files/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index e143c354eb0..ea82a698245 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=	CriticalMass-0.9.10
 PKGNAME=	${DISTNAME:S/CM/cm/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=criticalmass/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 918ab428604..a123a13caa1 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:40 wiz Exp $
 
 DISTNAME=	cube_2004_05_22
 PKGNAME=	cube-20040522
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cube/}
 
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index ab61e272422..ce24146dab8 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/11 09:40:40 wiz Exp $
 #
 
 DISTNAME=	d2x-0.2.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games x11
 MASTER_SITES=	http://icculus.org/d2x/src/
 
diff --git a/games/dd2/Makefile b/games/dd2/Makefile
index c9fcca13184..6fa1f7d1b7d 100644
--- a/games/dd2/Makefile
+++ b/games/dd2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		dd2-0.2.1
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://www.usebox.net/jjm/dd2/releases/
 
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 2b8132076ea..e88e7a5f719 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:41 wiz Exp $
 
 DISTNAME=	defendguin-0.0.10
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.nbswebfx.com/downloads/
 
diff --git a/games/digger/Makefile b/games/digger/Makefile
index 45bdee894d6..c9b181f1e8d 100644
--- a/games/digger/Makefile
+++ b/games/digger/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		digger-20020314
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://www.digger.org/
 
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 37f88495201..99e97930c25 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/08/22 15:35:37 adam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:41 wiz Exp $
 
 DISTNAME=	enigma-0.92
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://savannah.nongnu.org/download/enigma/
 
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 541dcc31dcf..536c8ffd7d5 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		exult-1.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=exult/}
 
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 05b84170c30..7ac2ddd2976 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2005/07/18 02:33:27 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
 PKGNAME=		falcons-eye-1.9.3
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=falconseye/}
 EXTRACT_SUFX=		.zip
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 478aa354f3c..f17b44ca479 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:15 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	fillets-ng-0.6.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fillets/}
 
diff --git a/games/fire/Makefile b/games/fire/Makefile
index fa710019a1f..6250afd57a0 100644
--- a/games/fire/Makefile
+++ b/games/fire/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	fire-1.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.libsdl.org/projects/fire/src/
 
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 2ffc5a33b1d..752772aa9e7 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	foobillard-3.0a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://foobillard.sunsite.dk/dnl/
 
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 4a0bfd1b130..ba82f3fb33c 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		freedroid-1.0.2
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=freedroid/}
 
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index e567e1d081d..fef33306dd9 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		freesci-0.3.4c
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://www-plan.cs.colorado.edu/reichenb/freesci/ \
 			http://teksolv.de/~jameson/
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index d04a0004de0..81b1f934aea 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:16 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	frozen-bubble-1.0.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://zarb.org/~gc/fb/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index dbfaa220660..cc177e5e22b 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	gemdropx-0.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/src/
 
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 8c5b8f2f09a..afd5f780cd5 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:16 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	glaxium_0.5
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 814f12d7c56..0e5c030f458 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 09:27:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	gltron-0.70-source
 PKGNAME=	${DISTNAME:S/-source$//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gltron/}
 
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index a2d162a66a0..2515f1faca1 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:17 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		Magnetic22Src
 PKGNAME=		gtkmagnetic-2.2
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://www.ifarchive.org/if-archive/magnetic-scrolls/interpreters/magnetic/
 EXTRACT_SUFX=		.zip
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index b63e55900b5..0498420af6b 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:16 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=	icebreaker-1.9.7
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	http://www.mattdm.org/icebreaker/1.9.x/
 EXTRACT_SUFX=	.tgz
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index c3f03c8e6e8..f108046fd27 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:41 wiz Exp $
 #
 
 DISTNAME=		ivan-0.50
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ivan/}
 
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index 8da89b3f049..76ef3c935e3 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=		kajaani-kombat-0.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		http://kombat.kajaani.net/dl/
 
diff --git a/games/kapooka/Makefile b/games/kapooka/Makefile
index 6b94c7b7011..5d5a571c425 100644
--- a/games/kapooka/Makefile
+++ b/games/kapooka/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=		kapooka_0.2
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kapooka/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index f53d6457ff5..ec520ddf111 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=	ketm-0.0.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://home.t-online.de/home/haslbeck/ketm/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 4115b9073d7..bbed99c83cd 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:16 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/11 09:40:42 wiz Exp $
 
 DISTNAME=	lbreakout-010315
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 2569983d496..bd04f9191ab 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/09/23 20:06:25 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/11 09:40:42 wiz Exp $
 
 DISTNAME=	lbreakout2-2.5.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index 3a5f9cdc8df..6f6f2bb7742 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=	lgeneral-1.1.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgeneral/}
 
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index 64ea9df4e0b..e2754a4d625 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/09/23 20:06:26 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/11 09:40:42 wiz Exp $
 
 DISTNAME=	lmarbles-1.0.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index f754f745173..c5eec145659 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/09/23 20:06:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:42 wiz Exp $
 
 DISTNAME=	lpairs-1.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index de765c198d8..db52b5e6d2f 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/09/23 20:06:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/11 09:40:42 wiz Exp $
 
 DISTNAME=	ltris-1.0.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index b4f5d91b806..194a7c7f6a0 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=	Maelstrom-3.0.5
 PKGNAME=	maelstrom-sdl-3.0.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.devolution.com/~slouken/Maelstrom/src/
 
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index 6c9b3bfca8f..e6ce6830cf8 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
 PKGNAME=		${DISTNAME:S/-/-sdl-/}
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/mirrormagic/
 
diff --git a/games/nagi/Makefile b/games/nagi/Makefile
index 85db69abf42..50b0d811e23 100644
--- a/games/nagi/Makefile
+++ b/games/nagi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=		nagi_src_-_2002-11-14
 PKGNAME=		nagi-20021114
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://www.agidev.com/dl_files/nagi/
 
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index aa0a4eb1181..cfba2a50b92 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=	neverball-1.2.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.icculus.org/neverball/
 
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 2458483a7f6..3c7ad319532 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=	newvox-1.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.libsdl.org/projects/newvox/src/
 
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 30ad25c35eb..06d06aaa834 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/09/17 20:28:53 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=	openmortal-0.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openmortal/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 343cea10ca1..bd87d3063df 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:42 wiz Exp $
 
 DISTNAME=	openttd-0.4.0.1-source
 PKGNAME=	openttd-0.4.0.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=openttd/}
 
diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index 66031f44282..e7196aec4d6 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/games/orbital_eunuchs_sniper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:42 wiz Exp $
 #
 
 DISTNAME=		orbital_eunuchs_sniper-1.29
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		http://filesingularity.timedoctor.org/
 
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index a37c580feea..0b897089f6f 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=	powermanga-0.79
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://linux.tlk.fr/games/Powermanga/download/
 
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 1bec486a0a7..d3bebb791c2 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/11 09:40:43 wiz Exp $
 
 DISTNAME=	prboom-2.2.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prboom/}
 
diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile
index 207b67fe664..0d01321aa80 100644
--- a/games/pytraffic/Makefile
+++ b/games/pytraffic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/10/12 14:56:13 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=		pytraffic-2.5
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=	http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/
 
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index b89ea470c38..dce91ef204e 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=	quake2-0.3
 PKGNAME=	${DISTNAME:S/quake2/quake2forge/}
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.quakeforge.net/files/quake2forge/
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index dd4fcf8dd4f..bc306f14568 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/11 09:40:43 wiz Exp $
 
 DISTNAME=		quakeforge-0.5.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=quake/}
 
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index f6075dfa36b..761cf4c7e26 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/11 09:40:43 wiz Exp $
 
 DISTNAME=	rocksndiamonds-3.1.1
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index a944d63fd79..9aba120e877 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=	sarien-0.7.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sarien/}
 
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index c8af6bd93ab..de520b46fb5 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/11 09:40:43 wiz Exp $
 
 DISTNAME=	scummvm-0.8.0
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 244e0cca996..6aca47d1697 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/09/28 14:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=	starfighter-1.1-1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/xtraeme/
 DISTFILES=	${DISTNAME}.tar.gz starfighter-1.0-1.music.zip
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index de02a027c3e..645c67f49a2 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/09/04 05:00:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=		stratagus-2.1-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=stratagus/}
 
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 7158826ee38..76c429f7cf0 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:18 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/11 09:40:43 wiz Exp $
 
 DISTNAME=	tworld-1.2.1
 PKGNAME=	${DISTNAME:S/^t/tile/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index ef1ce034e4c..f0b44cfa4f6 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/09/28 20:52:22 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=	tuxmath-2001.09.07-0102
 PKGNAME=	tuxmath-20010907
-PKGREVISION=			6
+PKGREVISION=	7
 CATEGORIES=	games math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxmath/}
 
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 5777766375e..5a65fea0bc2 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:18 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/11 09:40:43 wiz Exp $
 #
 
 DISTNAME=	tuxracer-0.61
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxracer/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 83a1670c1eb..e427f0a81d9 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/12/07 17:57:38 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/11 09:40:43 wiz Exp $
 
 DISTNAME=	wesnoth-1.0.2
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index e8cbd2196b1..f461c79a0c8 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/11 09:40:44 wiz Exp $
 #
 
 DISTNAME=	xrick-021212
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	http://www.bigorno.net/xrick/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
index 7862cba1cfa..de0b503ba7f 100644
--- a/graphics/3DKit/Makefile
+++ b/graphics/3DKit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:14:47 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/11 09:40:44 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
-PKGREVISION=	6
+PKGREVISION=	7
 
 DISTFILES=	DevManual.pdf
 
diff --git a/graphics/GUIlib/Makefile b/graphics/GUIlib/Makefile
index f7d41695feb..c8d41b6841b 100644
--- a/graphics/GUIlib/Makefile
+++ b/graphics/GUIlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:44 wiz Exp $
 #
 
 DISTNAME=	GUIlib-1.1.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/GUIlib/src/
 
diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk
index b357e506424..7dc7b197d7d 100644
--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILIB_BUILDLINK3_MK:=	${GUILIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	GUIlib
 
 .if !empty(GUILIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.GUIlib+=	GUIlib>=1.1.0nb2
-BUILDLINK_RECOMMENDED.GUIlib+=	GUIlib>=1.1.0nb3
+BUILDLINK_RECOMMENDED.GUIlib+=	GUIlib>=1.1.0nb5
 BUILDLINK_PKGSRCDIR.GUIlib?=	../../graphics/GUIlib
 .endif	# GUILIB_BUILDLINK3_MK
 
diff --git a/graphics/Makefile b/graphics/Makefile
index adc4c986dea..59e2c299f55 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.404 2005/12/09 15:49:34 gdt Exp $
+# $NetBSD: Makefile,v 1.405 2005/12/11 09:40:44 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -25,12 +25,10 @@ SUBDIR+=	SDLKit
 SUBDIR+=	SDL_image
 SUBDIR+=	TiffIO
 SUBDIR+=	aalib
-SUBDIR+=	aalib-x11
 SUBDIR+=	aqsis
 SUBDIR+=	artist
 SUBDIR+=	autotrace
 SUBDIR+=	aview
-SUBDIR+=	aview-x11
 SUBDIR+=	barcode
 SUBDIR+=	bktr2jpeg
 SUBDIR+=	blender
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index 2ab846c5cd4..85ed9f21f9d 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:44 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/SDLKit/}
-PKGREVISION=	10
+PKGREVISION=	11
 
 COMMENT=	3DKit SDL backend
 
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
index 05560ba03b9..3f4a0304379 100644
--- a/graphics/SDLKit/buildlink3.mk
+++ b/graphics/SDLKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/24 01:56:55 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDLKIT_BUILDLINK3_MK:=	${SDLKIT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDLKit
 
 .if !empty(SDLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDLKit+=	SDLKit>=0.3.1r2nb5
-BUILDLINK_RECOMMENDED.SDLKit?=	SDLKit>=0.3.1r2nb8
+BUILDLINK_RECOMMENDED.SDLKit?=	SDLKit>=0.3.1r2nb11
 BUILDLINK_PKGSRCDIR.SDLKit?=	../../graphics/SDLKit
 .endif	# SDLKIT_BUILDLINK3_MK
 
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile
index c1266bd41f2..56f9dc1144e 100644
--- a/graphics/SDL_image/Makefile
+++ b/graphics/SDL_image/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/11 09:40:44 wiz Exp $
 
 DISTNAME=	SDL_image-1.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index d2cc35b6f47..f61e5bebeef 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/12/28 23:18:20 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_image
 
 .if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_image+=	SDL_image>=1.2.3nb1
-BUILDLINK_RECOMMENDED.SDL_image+=	SDL_image>=1.2.3nb3
+BUILDLINK_RECOMMENDED.SDL_image+=	SDL_image>=1.2.4nb2
 BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 .endif	# SDL_IMAGE_BUILDLINK3_MK
diff --git a/graphics/aalib-x11/DESCR b/graphics/aalib-x11/DESCR
deleted file mode 100644
index 9844004c2d0..00000000000
--- a/graphics/aalib-x11/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AAlib is a portable ASCII Art library. From the AA project documentation:
-"There are many problems of various kinds with video cards, low frequency
-monitors, crashing graphical apps... AA-lib IS the solution. It works on a
-terminal of any kind, it is fast and portable, it gives to you standard API.
-It gives to your old hardware more power! "
diff --git a/graphics/aalib-x11/Makefile b/graphics/aalib-x11/Makefile
deleted file mode 100644
index 1d2e0b924b9..00000000000
--- a/graphics/aalib-x11/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:54 jlam Exp $
-
-PKGNAME=	aalib-x11-${BASE_VERS}
-CATEGORIES+=	x11
-
-COMMENT=	ASCII Art library with X11 support
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-
-BUILD_TARGET=		libaa-x11.la
-INSTALL_TARGET=		install-libLTLIBRARIES
-
-INSTALLATION_DIRS=	bin include lib
-
-# We need to correct the aalib-config script to return "-laa-x11" instead
-# of "-laa".
-#
-BUILDLINK_TRANSFORM+=	l:aa:aa-x11
-
-.include "../../mk/x11.buildlink3.mk"
-
-post-patch:
-	for file in ${WRKSRC}/src/Makefile.in; do			\
-		${SED}	-e "s,libaa\.la,libaa-x11.la,g"			\
-			-e "s,libaa_la,libaa_x11_la,g"			\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-	@for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do		\
-		${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch	\
-		&& ${MV} $$f.patch $$f;					\
-	done
-
-do-build:
-	cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV}				\
-		${MAKE_PROGRAM} -f ${MAKEFILE} ${BUILD_TARGET}
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/aalib-config ${PREFIX}/bin/aalib-x11-config
-	${INSTALL_DATA} ${WRKSRC}/src/aalib.h ${PREFIX}/include/aalib-x11.h
-	cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV}				\
-		${MAKE_PROGRAM} -f ${MAKEFILE} ${INSTALL_TARGET}
-
-.include "../../graphics/aalib/Makefile.common"
diff --git a/graphics/aalib-x11/PLIST b/graphics/aalib-x11/PLIST
deleted file mode 100644
index a1369ecca8c..00000000000
--- a/graphics/aalib-x11/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:32 jlam Exp $
-bin/aalib-x11-config
-include/aalib-x11.h
-lib/libaa-x11.la
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
deleted file mode 100644
index 067ceab5beb..00000000000
--- a/graphics/aalib-x11/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 20:50:19 rillig Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=		aalib-x11
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naalib-x11}
-BUILDLINK_PACKAGES+=	aalib-x11
-
-.if !empty(AALIB_X11_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aalib-x11+=	aalib-x11>=1.4.0.4nb1
-BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
-
-BUILDLINK_FILES.aalib-x11=	include/aalib-x11.h
-BUILDLINK_TRANSFORM.aalib-x11+=	-e "s|/aalib-x11.h|/aalib.h|g"
-BUILDLINK_TRANSFORM+=		l:aa:aa-x11
-
-AALIB_CONFIG=		${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config
-CONFIGURE_ENV+=		AALIB_CONFIG=${AALIB_CONFIG:Q}
-MAKE_ENV+=		AALIB_CONFIG=${AALIB_CONFIG:Q}
-.endif	# AALIB_X11_BUILDLINK3_MK
-
-.include "../../mk/x11.buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/DESCR b/graphics/aalib/DESCR
index 8281a07bded..21c2cb6dd9a 100644
--- a/graphics/aalib/DESCR
+++ b/graphics/aalib/DESCR
@@ -4,5 +4,3 @@ video cards, low frequency monitors, crashing graphical apps...
 AA-lib IS the solution. It works on a terminal of any kind, it is
 fast and portable, it gives to you standard API.  It gives to your
 old hardware more power! "
-
-This package is built without X11 support.
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 34decf8fce8..a9e41955c2b 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,12 +1,41 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:44 wiz Exp $
 
-PKGNAME=	aalib-${BASE_VERS}
-CONFLICTS+=	aalib-x11<=1.4.0.4
+DISTNAME=	aalib-1.4rc5
+PKGNAME=	${DISTNAME:S/rc5/.0.5/}
+PKGREVISION=	1
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
+MAINTAINER=	manu@NetBSD.org
+HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
 COMMENT=	ASCII Art library
 
-CONFIGURE_ARGS+=	--with-x11-driver=no
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/aalib-1.4.0
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+
+SUBST_CLASSES+=		malloc paths
+
+SUBST_STAGE.malloc=	pre-configure
+SUBST_FILES.malloc=	src/aalinux.c src/aax.c src/aaxkbd.c
+SUBST_FILES.malloc+=	src/aaxmouse.c src/aarec.c src/aalib.c
+SUBST_FILES.malloc+=	src/aaedit.c src/aaregist.c src/aakbdreg.c
+SUBST_FILES.malloc+=	src/aamoureg.c src/aados.c src/aadoskbd.c
+SUBST_SED.malloc=	-e 's|<malloc.h>|<stdlib.h>|g'
+
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	configure
+SUBST_SED.paths=	-e 's|BUILDLINK_SL|${BUILDLINK_PREFIX.libslang}|g'
+SUBST_SED.paths+=	-e 's|BUILDLINK_NC|${BUILDLINK_PREFIX.ncurses}|g'
 
 INFO_FILES=	aalib.info
 
-.include "Makefile.common"
+.include "options.mk"
+
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD+=		2.95.3
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common
deleted file mode 100644
index 5183fa832ce..00000000000
--- a/graphics/aalib/Makefile.common
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2005/03/29 14:28:05 wiz Exp $
-
-DISTNAME=	aalib-${DIST_VERS}
-CATEGORIES+=	graphics
-MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
-
-DIST_VERS=	1.4rc5
-BASE_VERS=	1.4.0.5
-
-MAINTAINER?=	manu@NetBSD.org
-HOMEPAGE=	http://aa-project.sourceforge.net/aalib/
-
-DISTINFO_FILE=		${.CURDIR}/../../graphics/aalib/distinfo
-PATCHDIR=		${.CURDIR}/../../graphics/aalib/patches
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-WRKSRC=			${WRKDIR}/aalib-1.4.0
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-CONFIGURE_ARGS+=	--with-curses-driver=no
-CONFIGURE_ARGS+=	--with-slang-driver=no
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-GCC_REQD+=		2.95.3
-.endif
-
-.if !target(post-patch)
-post-patch:
-	@for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do		\
-		${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch	\
-		&& ${MV} $$f.patch $$f;					\
-	done
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 0b939a9c741..3ff755cae72 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:14:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 09:40:44 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AALIB_BUILDLINK3_MK:=	${AALIB_BUILDLINK3_MK}+
@@ -16,4 +16,24 @@ BUILDLINK_RECOMMENDED.aalib+=	aalib>=1.4.0.4nb2
 BUILDLINK_PKGSRCDIR.aalib?=	../../graphics/aalib
 .endif	# AALIB_BUILDLINK3_MK
 
+.if !defined(PKG_BUILD_OPTIONS.aalib)
+PKG_BUILD_OPTIONS.aalib!=						\
+	cd ${BUILDLINK_PKGSRCDIR.aalib} &&				\
+	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.aalib=${PKG_BUILD_OPTIONS.aalib:Q}
+.endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.aalib
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.aalib:Mx11)
+.  include "../../mk/x11.buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo
index 3f1b0d6f4a2..201096fd728 100644
--- a/graphics/aalib/distinfo
+++ b/graphics/aalib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/04/27 08:58:17 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/12/11 09:40:44 wiz Exp $
 
 SHA1 (aalib-1.4rc5.tar.gz) = a23269e950a249d2ef93625837cace45ddbce03b
 RMD160 (aalib-1.4rc5.tar.gz) = a10bcab16d3aa0e60facca3e989f6a51846885f6
 Size (aalib-1.4rc5.tar.gz) = 391028 bytes
 SHA1 (patch-aa) = 927d69a8f499b99f0bd5f13cf220ce8cbb7ea591
 SHA1 (patch-ab) = 272f6f10dbe7a525c582a9b4c865f0ab9b2f9fba
+SHA1 (patch-ac) = 104d896182671e732efec445704140b361c34533
diff --git a/graphics/aalib/options.mk b/graphics/aalib/options.mk
new file mode 100644
index 00000000000..71890cb0482
--- /dev/null
+++ b/graphics/aalib/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2005/12/11 09:40:44 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.aalib
+PKG_SUPPORTED_OPTIONS=	ncurses slang x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curses-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-curses-driver=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-slang-driver=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+.  include "../../mk/x11.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x11-driver=yes
+.else
+CONFIGURE_ARGS+=	--with-x11-driver=no
+.endif
diff --git a/graphics/aalib/patches/patch-ac b/graphics/aalib/patches/patch-ac
new file mode 100644
index 00000000000..99ff087230b
--- /dev/null
+++ b/graphics/aalib/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.1 2005/12/11 09:40:44 wiz Exp $
+
+--- configure.orig	2001-04-26 14:44:54.000000000 +0000
++++ configure
+@@ -3145,7 +3145,7 @@ EOF
+   
+     if $search_slang
+     then
+-        if test -f /usr/local/include/slang.h
++        if test -f BUILDLINK_SL/include/slang.h
+ 	then
+ 	    LIBS1="$LIBS"
+  	    LIBS="$LIBS "
+@@ -3197,10 +3197,10 @@ else
+ fi
+ 
+             if test "x$ac_cv_lib_slang_SLsmg_init_smg" = xyes; then 
+-	      echo "$ac_t""Found slang on /usr/local/include/slang.h" 1>&6
++	      echo "$ac_t""Found slang on BUILDLINK_SL/include/slang.h" 1>&6
+ 	      AALIB_LIBS="$AALIB_LIBS  -lslang"
+  	      LIBS="$LIBS "
+-	      CFLAGS="$CFLAGS -I/usr/local/include/slang "
++	      CFLAGS="$CFLAGS -IBUILDLINK_SL/include/slang "
+               slang_driver=true
+ 	      search_slang=false
+ 	      cat >> confdefs.h <<\EOF
+@@ -3453,7 +3453,7 @@ EOF
+     
+     if $search_ncurses
+     then
+-        if test -f /usr/local/include/ncurses.h
++        if test -f BUILDLINK_NC/include/ncurses.h
+ 	then
+ 	    LIBS1="$LIBS"
+  	    LIBS="$LIBS "
+@@ -3505,13 +3505,13 @@ else
+ fi
+ 
+             if test "x$ac_cv_lib_ncurses_initscr" = xyes; then 
+-	      echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
++	      echo "$ac_t""Found ncurses on BUILDLINK_NC/include/ncurses.h" 1>&6
+ 	      AALIB_LIBS="$AALIB_LIBS  -lncurses"
+  	      LIBS="$LIBS "
+-	      CFLAGS="$CFLAGS -L/usr/local/lib"
++	      CFLAGS="$CFLAGS -LBUILDLINK_NC/lib"
+ 	      search_ncurses=false
+               curses_driver=true
+-	      screen_manager=-I/usr/local/include
++	      screen_manager=-IBUILDLINK_NC/include
+ 	      cat >> confdefs.h <<\EOF
+ #define USE_NCURSES 1
+ EOF
diff --git a/graphics/aview-x11/DESCR b/graphics/aview-x11/DESCR
deleted file mode 100644
index 9cf47d06714..00000000000
--- a/graphics/aview-x11/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-
-     dT8  8Tb       aview is a high quality ascii-art image (pnm) browser
-    dT 8  8 Tb      and animation (fli/flc) player which uses AAlib
-   dT  8  8  Tb     (a portable ASCII Art library, part of the AA-project).
-<PROJECT><PROJECT>
- dT    8  8    Tb
-dT     8  8     Tb  aview features:
-
- * High quality ascii art rendering
- * Portable
- * Save into many formats (html, text, ansi, more/less etc...)
- * Contrast, Bright, Gamma control
- * Image zooming/unzooming
- * Three dithering modes
- * Hidden "bonus" features :)
- * Inversion
- * Support for bright, dim, inverse attributes/extended character set
diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
deleted file mode 100644
index ee17d73fd73..00000000000
--- a/graphics/aview-x11/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:54 jlam Exp $
-#
-
-DISTNAME=	aview-1.3.0rc1
-PKGNAME=	aview-x11-1.3.0.1
-PKGREVISION=	3
-CATEGORIES=	graphics converters x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
-
-MAINTAINER=	salo@Xtrmntr.org
-HOMEPAGE=	http://aa-project.sourceforge.net/aview/
-COMMENT=	ASCII Art image viewer with X11 support
-
-CONFLICTS+=	aview-[0-9]*
-
-PLIST_SRC=	${WRKDIR}/PLIST
-
-WRKSRC=		${WRKDIR}/aview-1.3.0
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_PKGINSTALL=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${MACHINE_ARCH} == "i386")
-FILES_SUBST+= BIN_PROGRAMS="aview aaflip"
-.else
-FILES_SUBST+= BIN_PROGRAMS="aview"
-.endif
-
-pre-configure:
-	@${SED} ${FILES_SUBST_SED} ${WRKSRC}/Makefile.in > ${WRKDIR}/Makefile.in
-	@${MV} ${WRKDIR}/Makefile.in ${WRKSRC}/
-
-post-install:
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/aview/
-	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/aview/
-.if (${MACHINE_ARCH} == "i386")
-	${INSTALL_PROGRAM} ${WRKSRC}/aaflip ${PREFIX}/bin/
-	@${ECHO} bin/aaflip >>${PLIST_SRC}
-.endif
-
-.include "../../graphics/aalib-x11/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview-x11/PLIST b/graphics/aview-x11/PLIST
deleted file mode 100644
index a8a2ad702f3..00000000000
--- a/graphics/aview-x11/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
-bin/asciiview
-bin/aview
-man/man1/asciiview.1
-man/man1/aview.1
-share/doc/aview/AUTHORS
-share/doc/aview/COPYING
-share/doc/aview/ChangeLog
-share/doc/aview/NEWS
-share/doc/aview/README
-share/doc/aview/README.flip
-share/doc/aview/TODO
-@dirrm share/doc/aview
diff --git a/graphics/aview-x11/distinfo b/graphics/aview-x11/distinfo
deleted file mode 100644
index efdc52032c0..00000000000
--- a/graphics/aview-x11/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:03 agc Exp $
-
-SHA1 (aview-1.3.0rc1.tar.gz) = d757ff9f62e6ce4d926c03ae4f4096d9fcf353fc
-RMD160 (aview-1.3.0rc1.tar.gz) = f57808dfb9efc36af3b4107bfd48ae875d709cd0
-Size (aview-1.3.0rc1.tar.gz) = 54317 bytes
-SHA1 (patch-aa) = 4fb90e608e912839a3febef1b7086909eb93d42a
-SHA1 (patch-ab) = ed1d623e8ffe18e5cdb18727a2ccbb2cf8c50b1d
-SHA1 (patch-ac) = c9a66a3e6bf97dffe7335ccb9af666250d25f370
-SHA1 (patch-ad) = 690a8af07eee1e44611b9111678ab1aff52c7bfa
diff --git a/graphics/aview-x11/patches/patch-aa b/graphics/aview-x11/patches/patch-aa
deleted file mode 100644
index e5f910209dd..00000000000
--- a/graphics/aview-x11/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
-
---- Makefile.in.orig	Wed Apr 25 18:04:44 2001
-+++ Makefile.in
-@@ -65,7 +65,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
--bin_PROGRAMS = aview aaflip
-+bin_PROGRAMS = @BIN_PROGRAMS@
- aview_SOURCES = image.c main.c shrink.c ui.c
- aaflip_SOURCES = flip.c general.c
- bin_SCRIPTS = asciiview
diff --git a/graphics/aview-x11/patches/patch-ab b/graphics/aview-x11/patches/patch-ab
deleted file mode 100644
index de695930e2e..00000000000
--- a/graphics/aview-x11/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
-
---- asciiview.orig	Wed Apr 25 17:59:22 2001
-+++ asciiview
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # asciiview - an ascii art image browser script. Front end for aview/aaflip
- clear()
- {
diff --git a/graphics/aview-x11/patches/patch-ac b/graphics/aview-x11/patches/patch-ac
deleted file mode 100644
index eda2378d4af..00000000000
--- a/graphics/aview-x11/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/05/07 02:43:51 danw Exp $
-
---- image.c.orig	Thu May  6 22:36:27 2004
-+++ image.c
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <unistd.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "config.h"
- 
- int imgwidth, imgheight;
diff --git a/graphics/aview-x11/patches/patch-ad b/graphics/aview-x11/patches/patch-ad
deleted file mode 100644
index 6df1f9ab1e9..00000000000
--- a/graphics/aview-x11/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/05/07 02:43:51 danw Exp $
-
---- ui.c.orig	Thu May  6 22:36:30 2004
-+++ ui.c
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <aalib.h>
- #include "shrink.h"
diff --git a/graphics/aview/DESCR b/graphics/aview/DESCR
index 32c29d20cc9..9cf47d06714 100644
--- a/graphics/aview/DESCR
+++ b/graphics/aview/DESCR
@@ -15,5 +15,3 @@ dT     8  8     Tb  aview features:
  * Hidden "bonus" features :)
  * Inversion
  * Support for bright, dim, inverse attributes/extended character set
-
-This package is built without X11 support.
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index a1063760bd7..609a0ce6b1e 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:44 wiz Exp $
 #
 
 DISTNAME=	aview-1.3.0rc1
 PKGNAME=	aview-1.3.0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 5d2f8a34c40..c0e658b04d9 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/08/03 11:58:14 adam Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	blender-2.37a
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
 		http://download.blender.org/source/
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 9fbc36f0ca3..b504afe382f 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/11/02 06:56:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	kipi-plugins-0.1.0-rc1
 PKGNAME=	kipi-plugins-0.1.0rc1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 3af10e6c162..77ddd4ff7d2 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:22 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.14
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
 		ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index d5ea637afe2..29ce0ae5c54 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=		vp-1.5
-PKGREVISION=	3
+PKGREVISION=		4
 CATEGORIES=		graphics
 MASTER_SITES=		http://math.smsu.edu/~erik/files/
 
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index f90f3c25e7d..3557b7490e1 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2005/05/31 14:56:19 markd Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/11 09:40:45 wiz Exp $
 
 DISTNAME=	kdeaddons-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop
 
diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index 1da6e70030e..8018e49629c 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/07/27 16:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:45 wiz Exp $
 #
 
 DISTNAME=		stellarium-0.6.0
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		misc
 MASTER_SITES=		http://stellarium.free.fr/download/
 
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/}
 
diff --git a/net/SDL_net/Makefile b/net/SDL_net/Makefile
index 8e3ec212988..8e5edff23d3 100644
--- a/net/SDL_net/Makefile
+++ b/net/SDL_net/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:44 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=	SDL_net-1.2.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_net/release/
 
diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk
index 751e147646e..7d7d8c972f5 100644
--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:17:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 09:40:46 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_NET_BUILDLINK3_MK:=	${SDL_NET_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_net
 
 .if !empty(SDL_NET_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
-BUILDLINK_RECOMMENDED.SDL_net+=	SDL_net>=1.2.5nb2
+BUILDLINK_RECOMMENDED.SDL_net+=	SDL_net>=1.2.5nb4
 BUILDLINK_PKGSRCDIR.SDL_net?=	../../net/SDL_net
 .endif	# SDL_NET_BUILDLINK3_MK
 
diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile
index 06a15d2b162..2e2c1f2737f 100644
--- a/x11/paragui/Makefile
+++ b/x11/paragui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/05/06 20:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:46 wiz Exp $
 #
 
 DISTNAME=		paragui-1.0.4
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		x11
 MASTER_SITES=		http://savannah.nongnu.org/download/paragui/
 
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 59d365921d5..b53091b213e 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/05/06 20:58:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/12/11 09:40:46 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARAGUI_BUILDLINK3_MK:=	${PARAGUI_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	paragui
 
 .if !empty(PARAGUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.paragui+=	paragui>=1.0.4nb3
-BUILDLINK_RECOMMENDED.paragui+=	paragui>=1.0.4nb6
+BUILDLINK_RECOMMENDED.paragui+=	paragui>=1.0.4nb8
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
 .endif	# PARAGUI_BUILDLINK3_MK
author	wiz <wiz@pkgsrc.org>	2005-12-11 09:40:37 +0000
committer	wiz <wiz@pkgsrc.org>	2005-12-11 09:40:37 +0000
commit	4d147ec19bab7ad1628dfead37b782c7fa932941 (patch)
tree	833777ff9c9882d5f6516d9f65a2944f5dd58aef
parent	288eb75ae208e7d3fcae10c0a416a02496d1cd95 (diff)
download	pkgsrc-4d147ec19bab7ad1628dfead37b782c7fa932941.tar.gz