diff --git a/aamath/Makefile b/aamath/Makefile
index 287c0282ae..7c651f673a 100644
--- a/aamath/Makefile
+++ b/aamath/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/04/29 11:05:14 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:39 thomasklausner Exp $
 #
 
 DISTNAME=	aamath-0.3
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://fuse.superglue.se/aamath/
 
diff --git a/afflib/Makefile b/afflib/Makefile
index 4c1c096bb6..eff22e6d13 100644
--- a/afflib/Makefile
+++ b/afflib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/03/01 13:54:43 asau Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=		afflib-1.6.31
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://www.afflib.org/downloads/
 
diff --git a/alex/Makefile b/alex/Makefile
index 39623df363..48088dfae6 100644
--- a/alex/Makefile
+++ b/alex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/04/23 15:29:37 emil_s Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	alex-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.haskell.org/alex/dist/${VERSION}/
 DISTFILES=	${DISTNAME}.tar.gz
diff --git a/asymptote/Makefile b/asymptote/Makefile
index 0cf550b66a..a52bc69b2b 100644
--- a/asymptote/Makefile
+++ b/asymptote/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/26 21:49:26 fulviociriaco Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	asymptote-1.56
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=asymptote/}
 EXTRACT_SUFX=	.tgz
diff --git a/atftp/Makefile b/atftp/Makefile
index 33c08090c6..3ff7515f6c 100644
--- a/atftp/Makefile
+++ b/atftp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/05/29 17:44:15 tnn2 Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=		atftp-0.7
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.mamalinux.com/pub/atftp/ \
 			http://osmirrors.cerias.purdue.edu/pub/gentoo/distfiles/
diff --git a/bastard/Makefile b/bastard/Makefile
index b9ac16d052..618618bfca 100644
--- a/bastard/Makefile
+++ b/bastard/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/08/13 23:33:25 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=		bastard-0.17-pre
 PKGNAME=		bastard-0.17
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bastard/}
 EXTRACT_SUFX=		.tgz
diff --git a/beast/Makefile b/beast/Makefile
index 8fdda3d963..414bcea466 100644
--- a/beast/Makefile
+++ b/beast/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/09/21 13:06:50 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	beast-0.5.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://beast.gtk.org/beast-ftp/v0.5/
 
diff --git a/c2hs/Makefile b/c2hs/Makefile
index 270c026eef..7caf1a8d05 100644
--- a/c2hs/Makefile
+++ b/c2hs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/04/27 14:21:44 emil_s Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	c2hs-0.14.5
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
 
diff --git a/callweaver-current/Makefile b/callweaver-current/Makefile
index 604af6d34f..d73bf8d02a 100644
--- a/callweaver-current/Makefile
+++ b/callweaver-current/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/05/14 08:55:02 x400 Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/20 00:58:40 thomasklausner Exp $
 
 DISTNAME=       callweaver-RC-1.1.99.20090513
+PKGREVISION=     1
 CATEGORIES=     comms
 MASTER_SITES=   http://devs.callweaver.org/1.2_snapshots/
 EXTRACT_SUFX=   .tar.gz
diff --git a/callweaver/Makefile b/callweaver/Makefile
index 3be5cd411c..7a05673574 100644
--- a/callweaver/Makefile
+++ b/callweaver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/12/18 09:11:19 x400 Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:40 thomasklausner Exp $
 
 DISTNAME=	callweaver-1.2.0.1
+PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://devs.callweaver.org/release/
 EXTRACT_SUFX=	.tgz
diff --git a/clisp/Makefile b/clisp/Makefile
index 75feff105f..b4fc7b9ab6 100644
--- a/clisp/Makefile
+++ b/clisp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2009/01/17 09:19:24 asau Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=		clisp-2.47
 PKGNAME=		clisp-2.47.99 # needed because of cvs-package.mk
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clisp/}
 
diff --git a/elinks-libmm/Makefile b/elinks-libmm/Makefile
index 9e3faaff4f..f2e7c9b7fa 100644
--- a/elinks-libmm/Makefile
+++ b/elinks-libmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2008/02/17 03:30:10 bsadewitz Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:40 thomasklausner Exp $
 
 DISTNAME=		elinks-current-0.13
 PKGNAME=		elinks-0.13
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/elinks-snapshot/Makefile b/elinks-snapshot/Makefile
index 66fd72a494..6af3da2c3a 100644
--- a/elinks-snapshot/Makefile
+++ b/elinks-snapshot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/01/18 04:30:12 tnn2 Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	elinks-current-unstable
 PKGNAME=	elinks-snap-${ELINKS_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://elinks.or.cz/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/firebird/Makefile b/firebird/Makefile
index 80ea82a3c4..d5b94abec1 100644
--- a/firebird/Makefile
+++ b/firebird/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2008/08/29 22:41:04 hoka_adam Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=		Firebird-2.1.1.17910-0
 PKGNAME=		firebird-2.1.1
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=firebird/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/fuse-smbfs/Makefile b/fuse-smbfs/Makefile
index 49053def42..5217993386 100644
--- a/fuse-smbfs/Makefile
+++ b/fuse-smbfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2007/04/12 10:36:38 koifren Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:40 thomasklausner Exp $
 
 DISTNAME=	fusesmb-${FUSESMB_VER}
 PKGNAME=	fuse-smb-${FUSESMB_VER}
+PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/
 
diff --git a/grass/Makefile b/grass/Makefile
index b21d39d97d..fa9e455e62 100644
--- a/grass/Makefile
+++ b/grass/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2009/05/18 16:08:47 brook1 Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=		grass-${GRASS_VERSION}
+PKGREVISION=		1
 CATEGORIES=		geography
 MASTER_SITES=		http://grass.itc.it/grass63/source/
 
diff --git a/gretl/Makefile b/gretl/Makefile
index c7ccc08be5..0a0767dfd2 100644
--- a/gretl/Makefile
+++ b/gretl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/05/06 18:17:01 asau Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	gretl-1.7.4
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gretl/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/gtk-qt-engine/Makefile b/gtk-qt-engine/Makefile
index 612696576f..aa9249e535 100644
--- a/gtk-qt-engine/Makefile
+++ b/gtk-qt-engine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/03/06 14:54:09 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:40 thomasklausner Exp $
 #
 
 DISTNAME=	gtk-qt-engine-0.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://gtk-qt.ecs.soton.ac.uk/files/0.7/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/gtk2hs/Makefile b/gtk2hs/Makefile
index 62e10a496d..3f441c240e 100644
--- a/gtk2hs/Makefile
+++ b/gtk2hs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/22 05:18:49 phonohawk Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	gtk2hs-0.9.13
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk2hs/}
 
diff --git a/gtk2hs/buildlink3.mk b/gtk2hs/buildlink3.mk
index 441ce14fb4..026c9cba0f 100644
--- a/gtk2hs/buildlink3.mk
+++ b/gtk2hs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:41 jsonn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	gtk2hs
 
@@ -7,6 +7,7 @@ GTK2HS_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.gtk2hs?=	build
 BUILDLINK_API_DEPENDS.gtk2hs+=	gtk2hs>=0.9.13
+BUILDLINK_ABI_DEPENDS.gtk2hs?=	gtk2hs>=0.9.13nb1
 BUILDLINK_PKGSRCDIR.gtk2hs?=	../../wip/gtk2hs
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/guile-scsh/Makefile b/guile-scsh/Makefile
index 71bb39263c..b72d5230a8 100644
--- a/guile-scsh/Makefile
+++ b/guile-scsh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/12/15 14:34:40 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=		guile-scsh-2.0.1
+PKGREVISION=		1
 CATEGORIES=		shells
 MASTER_SITES=		http://arglist.com/guile/${DISTNAME}/
 
diff --git a/guilerxspencer/Makefile b/guilerxspencer/Makefile
index 99cb923234..a896fc4213 100644
--- a/guilerxspencer/Makefile
+++ b/guilerxspencer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/12/15 14:34:40 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=		guilerxspencer-1.2
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://arglist.com/guile/${DISTNAME}/
 
diff --git a/guilerxspencer/buildlink3.mk b/guilerxspencer/buildlink3.mk
index 03fd05cb32..9414fb65c0 100644
--- a/guilerxspencer/buildlink3.mk
+++ b/guilerxspencer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/05/06 09:57:45 cheusov Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	guilerxspencer
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	guilerxspencer
 GUILERXSPENCER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.guilerxspencer+=	guilerxspencer>=1.2
+BUILDLINK_ABI_DEPENDS.guilerxspencer?=	guilerxspencer>=1.2nb1
 BUILDLINK_PKGSRCDIR.guilerxspencer?=	../../wip/guilerxspencer
 
 .include "../../lang/guile/buildlink3.mk"
diff --git a/haddock/Makefile b/haddock/Makefile
index eca0702c30..b945c731ff 100644
--- a/haddock/Makefile
+++ b/haddock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/10/17 13:35:10 emil_s Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=		haddock-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.haskell.org/haddock/
 DISTFILES=		haddock-${VERSION}-src.tar.gz
diff --git a/hs-cabal/Makefile b/hs-cabal/Makefile
index c1f3679129..a3766b4c62 100644
--- a/hs-cabal/Makefile
+++ b/hs-cabal/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/05/13 10:55:04 emil_s Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=		Cabal-1.6.0.2
 PKGNAME=		hs-cabal-1.6.0.2
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.haskell.org/cabal/release/${PKGNAME}/
 
diff --git a/hs-cabal/buildlink3.mk b/hs-cabal/buildlink3.mk
index 280375ea64..f7e61fdff3 100644
--- a/hs-cabal/buildlink3.mk
+++ b/hs-cabal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/05/13 11:06:57 emil_s Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	hs-cabal
 
@@ -7,6 +7,7 @@ HS_CABAL_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.hs-cabal?=		build
 BUILDLINK_API_DEPENDS.hs-cabal+=	hs-cabal>=1.6.0.2
+BUILDLINK_ABI_DEPENDS.hs-cabal?=		hs-cabal>=1.6.0.2nb1
 BUILDLINK_PKGSRCDIR.hs-cabal?=		../../wip/hs-cabal
 
 .include "../../lang/ghc/buildlink3.mk"
diff --git a/hs-digest/Makefile b/hs-digest/Makefile
index 024b232546..3814b9082e 100644
--- a/hs-digest/Makefile
+++ b/hs-digest/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/05/14 11:23:10 zecrazytux Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:41 thomasklausner Exp $
 
 DISTNAME=			digest-0.0.0.5
 PKGNAME=			hs-digest-0.0.0.5
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/digest/0.0.0.5/
 
diff --git a/hs-readline/Makefile b/hs-readline/Makefile
index 48040effe9..df3930657d 100644
--- a/hs-readline/Makefile
+++ b/hs-readline/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/22 05:56:11 phonohawk Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	readline-1.0.1.0
 PKGNAME=	hs-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	pho@cielonegro.org
diff --git a/hs-readline/buildlink3.mk b/hs-readline/buildlink3.mk
index a838feacb2..145070b38d 100644
--- a/hs-readline/buildlink3.mk
+++ b/hs-readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:42 jsonn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	hs-readline
 
@@ -7,6 +7,7 @@ HS_READLINE_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.hs-readline?=	build
 BUILDLINK_API_DEPENDS.hs-readline+=	hs-readline>=1.0.1.0
+BUILDLINK_ABI_DEPENDS.hs-readline?=	hs-readline>=1.0.1.0nb1
 BUILDLINK_PKGSRCDIR.hs-readline?=	../../wip/hs-readline
 
 .include "../../devel/readline/buildlink3.mk"
diff --git a/hs-x11-extras/Makefile b/hs-x11-extras/Makefile
index 8fd125296a..1e30bfbbfd 100644
--- a/hs-x11-extras/Makefile
+++ b/hs-x11-extras/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/06/08 17:47:45 zul_ Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	X11-extras-${VERSION}
 PKGNAME=	hs-x11-extras-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11-extras/${VERSION}/
 
diff --git a/hs-x11-extras/buildlink3.mk b/hs-x11-extras/buildlink3.mk
index 984ce8804c..727f5edcf5 100644
--- a/hs-x11-extras/buildlink3.mk
+++ b/hs-x11-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:43:43 jsonn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	hs-x11-extras
 
@@ -7,6 +7,7 @@ HS_X11_EXTRAS_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.hs-x11-extras?=	build
 BUILDLINK_API_DEPENDS.hs-x11-extras+=	hs-x11-extras>=0.4
+BUILDLINK_ABI_DEPENDS.hs-x11-extras?=	hs-x11-extras>=0.4nb1
 BUILDLINK_PKGSRCDIR.hs-x11-extras?=	../../wip/hs-x11-extras
 
 .include "../../wip/hs-x11/buildlink3.mk"
diff --git a/hs-x11/Makefile b/hs-x11/Makefile
index 8acdd434ff..484edd7422 100644
--- a/hs-x11/Makefile
+++ b/hs-x11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/06/08 17:46:32 zul_ Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	X11-${VERSION}
 PKGNAME=	hs-x11-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${VERSION}/
 
diff --git a/hs-x11/buildlink3.mk b/hs-x11/buildlink3.mk
index dc45fb43e3..19a4a8ddd8 100644
--- a/hs-x11/buildlink3.mk
+++ b/hs-x11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:43:43 jsonn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	hs-x11
 
@@ -7,6 +7,7 @@ HS_X11_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.hs-x11?=	build
 BUILDLINK_API_DEPENDS.hs-x11+=	hs-x11>=1.4.1
+BUILDLINK_ABI_DEPENDS.hs-x11?=	hs-x11>=1.4.1nb1
 BUILDLINK_PKGSRCDIR.hs-x11?=	../../wip/hs-x11
 
 .include "../../lang/ghc/buildlink3.mk"
diff --git a/icecast/Makefile b/icecast/Makefile
index 244c5aafb3..3575d5e04d 100644
--- a/icecast/Makefile
+++ b/icecast/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 01:28:00 jlamwww Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	icecast-1.3.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icecast.org/files/
 
diff --git a/ion3/Makefile b/ion3/Makefile
index be739d847a..892e2e5aad 100644
--- a/ion3/Makefile
+++ b/ion3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2009/03/04 14:38:26 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	ion-3-20090110
 PKGNAME=	ion3-20090110
+PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://iki.fi/tuomov/dl/
 
diff --git a/kdeedu4/Makefile b/kdeedu4/Makefile
index 32e502a0ad..0503a42fdf 100644
--- a/kdeedu4/Makefile
+++ b/kdeedu4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/02/11 23:06:38 mwdavies Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/20 00:58:41 thomasklausner Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
diff --git a/kdeedu4/buildlink3.mk b/kdeedu4/buildlink3.mk
index 69dc4784b8..ee0463d602 100644
--- a/kdeedu4/buildlink3.mk
+++ b/kdeedu4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:44 jsonn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/05/20 00:58:41 thomasklausner Exp $
 
 BUILDLINK_TREE+=	kdeedu4
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	kdeedu4
 KDEEDU4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdeedu4+=	kdeedu4>=4.1.1
+BUILDLINK_ABI_DEPENDS.kdeedu4?=	kdeedu4>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.kdeedu4?=	../../wip/kdeedu4
 
 #.include "../../devel/libusb/buildlink3.mk"
diff --git a/kdepim4/Makefile b/kdepim4/Makefile
index fcfad5298a..399db23b73 100644
--- a/kdepim4/Makefile
+++ b/kdepim4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/05/11 11:27:03 mwdavies Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/20 00:58:41 thomasklausner Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/lhs2tex/Makefile b/lhs2tex/Makefile
index 74fe3ef709..d1f55b9363 100644
--- a/lhs2tex/Makefile
+++ b/lhs2tex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/04/23 16:07:00 emil_s Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=		lhs2tex-1.12
+PKGREVISION=		1
 CATEGORIES=		print devel
 MASTER_SITES=		http://www.iai.uni-bonn.de/~loeh/lhs2tex/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lincity-ng/Makefile b/lincity-ng/Makefile
index 6040352d98..6405f72646 100644
--- a/lincity-ng/Makefile
+++ b/lincity-ng/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/03/02 15:13:20 hoka_adam Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 VERSION=		1.1.2
 DISTNAME=		lincity-ng-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://download.berlios.de/lincity-ng/ \
 			http://download2.berlios.de/lincity-ng/
diff --git a/links-hacked/Makefile b/links-hacked/Makefile
index 21aa4df1c3..3e658e78fd 100644
--- a/links-hacked/Makefile
+++ b/links-hacked/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/03/07 19:35:14 tnn2 Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=	links-hacked-${VER}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://xray.sai.msu.ru/~karpov/links-hacked/downloads/
 EXTRACT_SUFX=	.tgz
diff --git a/linphone/Makefile b/linphone/Makefile
index d4e042010a..1efac15f24 100644
--- a/linphone/Makefile
+++ b/linphone/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2009/02/15 16:16:33 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/20 00:58:41 thomasklausner Exp $
 
 DISTNAME=	linphone-3.0.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.savannah.gnu.org/releases/linphone/stable/sources/
 
diff --git a/lua-pgsql/Makefile b/lua-pgsql/Makefile
index 7a16ee3981..77d33d264b 100644
--- a/lua-pgsql/Makefile
+++ b/lua-pgsql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/01/10 12:45:12 ghen Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:41 thomasklausner Exp $
 #
 
 DISTNAME=		luasql-2.0b
 PKGNAME=		lua-pgsql-2.0b
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		http://www.keplerproject.org/luasql/
 
diff --git a/luasocket/Makefile b/luasocket/Makefile
index 886ccdbf1c..8c979b7216 100644
--- a/luasocket/Makefile
+++ b/luasocket/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/09/09 02:49:33 obache Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=		luasocket-2.0.1
 PKGNAME=		lua-socket-2.0.1
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://luaforge.net/frs/download.php/1589/
 
diff --git a/marsyas/Makefile b/marsyas/Makefile
index e2050c9dde..fedb94085a 100644
--- a/marsyas/Makefile
+++ b/marsyas/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/10 20:23:06 bsadewitz Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	marsyas-0.2.16
+PKGREVISION=	1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=marsyas/}
 
diff --git a/mkcabal/Makefile b/mkcabal/Makefile
index da34eaa10f..99cfe4b815 100644
--- a/mkcabal/Makefile
+++ b/mkcabal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/01/22 06:13:18 phonohawk Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	mkcabal-0.4.1.1
+PKGREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	pho@cielonegro.org
diff --git a/mnogosearch/Makefile b/mnogosearch/Makefile
index 00054f37cf..4cc72efde6 100644
--- a/mnogosearch/Makefile
+++ b/mnogosearch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2008/12/01 20:53:48 cheusov Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/20 00:58:42 thomasklausner Exp $
 
 DISTNAME=	mnogosearch-3.1.21
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/
 
diff --git a/multisync-palm/Makefile b/multisync-palm/Makefile
index dab4a43395..b868e2d7bd 100644
--- a/multisync-palm/Makefile
+++ b/multisync-palm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/03/06 14:54:10 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 PKGNAME=		multisync-palm-0.82
-PKGREVISION=		2
+PKGREVISION=		3
 
 COMMENT=		Module for synchronization with Palm devices
 
diff --git a/mysql5-embedded/Makefile b/mysql5-embedded/Makefile
index a4b92b39e9..338b93f227 100644
--- a/mysql5-embedded/Makefile
+++ b/mysql5-embedded/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/02/02 03:22:13 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:42 thomasklausner Exp $
 
 PKGNAME=		${DISTNAME:S/-/-embedded-/}
+PKGREVISION=		1
 COMMENT=		MySQL 5, a free SQL database (embedded)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/netrik/Makefile b/netrik/Makefile
index 3c5cb3017d..2e3b551f92 100644
--- a/netrik/Makefile
+++ b/netrik/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/02/14 16:34:44 lkundrak Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:42 thomasklausner Exp $
 
 DISTNAME=		netrik-1.15.4
+PKGREVISION=		1
 CATEGORIES=		www net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netrik/}
 
diff --git a/nmzmail/Makefile b/nmzmail/Makefile
index a2da2e287e..958b0b81e7 100644
--- a/nmzmail/Makefile
+++ b/nmzmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/04/25 08:52:01 jh88 Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	nmzmail-1.1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
diff --git a/octave-nox11/Makefile b/octave-nox11/Makefile
index 36cd9b23cf..f07ad8d8ca 100644
--- a/octave-nox11/Makefile
+++ b/octave-nox11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2007/11/12 19:47:40 kheinz Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-nox11-${OCTAVE_VER}
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ \
diff --git a/or1ksim/Makefile b/or1ksim/Makefile
index db3752f26c..6093397241 100644
--- a/or1ksim/Makefile
+++ b/or1ksim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/10/30 22:45:31 shattered Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	or1ksim-0.2.0rc3
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.opencores.org/projects.cgi/web/or1k/
 
diff --git a/p5-JavaScript-SpiderMonkey/Makefile b/p5-JavaScript-SpiderMonkey/Makefile
index c661370b3b..cd84616019 100644
--- a/p5-JavaScript-SpiderMonkey/Makefile
+++ b/p5-JavaScript-SpiderMonkey/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/04/10 02:00:02 hitscan Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	JavaScript-SpiderMonkey-0.19
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=JavaScript/}
 
diff --git a/pal/Makefile b/pal/Makefile
index 4f1cfe74b8..07fad938be 100644
--- a/pal/Makefile
+++ b/pal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/08/20 10:00:23 emil_s Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=		pal-0.3.4
+PKGREVISION=		1
 CATEGORIES=		time
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=palcal/}
 EXTRACT_SUFX=		.tgz
diff --git a/pandoc/Makefile b/pandoc/Makefile
index 85b7adbf00..7ab6e670d5 100644
--- a/pandoc/Makefile
+++ b/pandoc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/04/15 22:13:00 zecrazytux Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:42 thomasklausner Exp $
 
 DISTNAME=					pandoc-1.2
+PKGREVISION=				1
 CATEGORIES=				textproc
 MASTER_SITES=			http://pandoc.googlecode.com/files/
 
diff --git a/parted/Makefile b/parted/Makefile
index c0bd14e735..b551b2459c 100644
--- a/parted/Makefile
+++ b/parted/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/04/30 17:22:50 shattered Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=		parted-1.6.23
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://ftp.gnu.org/gnu/parted/
 
diff --git a/premake/Makefile b/premake/Makefile
index 291447256d..29411c5fe7 100644
--- a/premake/Makefile
+++ b/premake/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/08/14 22:32:21 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=		premake-src-3.1
 PKGNAME=		premake-3.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=premake/}
 EXTRACT_SUFX=		.zip
diff --git a/qinx/Makefile b/qinx/Makefile
index 1f303c34ab..a602729886 100644
--- a/qinx/Makefile
+++ b/qinx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2008/01/18 04:30:17 tnn2 Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	qinx-1.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm kde
 MASTER_SITES=	http://www.usermode.org/code/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/radare/Makefile b/radare/Makefile
index 0137d9ea1c..c04e359d5b 100644
--- a/radare/Makefile
+++ b/radare/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 15:34:14 tnn2 Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	radare-0.8.6
+PKGREVISION=	1
 CATEGORIES=	wip sysutils
 MASTER_SITES=	http://radare.nopcode.org/get/
 
diff --git a/rosegarden-current/Makefile b/rosegarden-current/Makefile
index 7ece6f7c78..269f4b74cd 100644
--- a/rosegarden-current/Makefile
+++ b/rosegarden-current/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2008/01/18 04:30:17 tnn2 Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/20 00:58:42 thomasklausner Exp $
 #
 
 DISTNAME=	rosegarden-4-0.9.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rosegarden/}
 
diff --git a/scite/Makefile b/scite/Makefile
index 479f77e8df..855f8bcd8d 100644
--- a/scite/Makefile
+++ b/scite/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2008/12/03 20:43:54 shattered Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/20 00:58:42 thomasklausner Exp $
 
 DISTNAME=		scite177
 PKGNAME=		scite-1.77
 #PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scintilla/}
 EXTRACT_SUFX=		.tgz
diff --git a/scummvm-nightly/Makefile b/scummvm-nightly/Makefile
index d552cdd7e5..c587a6ff82 100644
--- a/scummvm-nightly/Makefile
+++ b/scummvm-nightly/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/03/10 11:41:37 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/20 00:58:43 thomasklausner Exp $
 
 DISTNAME=	scummvm-${SCM_VER}
+PKGREVISION=	1
 CATEGORIES=	games
 
 OWNER=		dillo@NetBSD.org
diff --git a/sj3-server/Makefile b/sj3-server/Makefile
index 9d4b6f0cc6..3851856370 100644
--- a/sj3-server/Makefile
+++ b/sj3-server/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/02/14 14:02:42 obache Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 .include "../../wip/sj3/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/sj3-/sj3-server-/}
+PKGREVISION=	1
 
 COMMENT=	SJ3 Japanese input method server
 
diff --git a/swami/Makefile b/swami/Makefile
index 8e5fdef5e1..54414f7705 100644
--- a/swami/Makefile
+++ b/swami/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/02/21 13:22:52 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=		swami-0.9.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swami/}
 
diff --git a/tclreadline/Makefile b/tclreadline/Makefile
index 960c1e8520..e1894b3d3b 100644
--- a/tclreadline/Makefile
+++ b/tclreadline/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/09 22:58:43 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=	tclreadline-2.1.0
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tclreadline/}
 
diff --git a/tftp-hpa/Makefile b/tftp-hpa/Makefile
index 7d74ae3506..2b368ae3f6 100644
--- a/tftp-hpa/Makefile
+++ b/tftp-hpa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/04/19 21:12:34 gschwarz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/20 00:58:43 thomasklausner Exp $
 
 DISTNAME=	tftp-hpa-5.0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.kernel.org/pub/software/network/tftp/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/tmw/Makefile b/tmw/Makefile
index e834857dc3..762f1112ce 100644
--- a/tmw/Makefile
+++ b/tmw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/01/18 04:30:17 tnn2 Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=	tmw-0.0.22.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=themanaworld/}
 
diff --git a/trackballs/Makefile b/trackballs/Makefile
index e50e596cf5..12d15b0630 100644
--- a/trackballs/Makefile
+++ b/trackballs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/01/23 00:39:31 netcap Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=	trackballs-1.1.2
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=trackballs/}
 
diff --git a/twinkle/Makefile b/twinkle/Makefile
index f6bca806ce..6a165feb75 100644
--- a/twinkle/Makefile
+++ b/twinkle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/05/10 23:49:14 othyro Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=		twinkle-1.4.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio chat net
 MASTER_SITES=		http://www.xs4all.nl/~mfnboer/twinkle/download/
 
diff --git a/xbsql/Makefile b/xbsql/Makefile
index 44b8ae9717..2650bc7664 100644
--- a/xbsql/Makefile
+++ b/xbsql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/03/08 01:31:25 uhabel Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=		xbsql-0.11
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		http://www.rekallrevealed.org/packages/
 EXTRACT_SUFX=		.tgz
diff --git a/xmonad-contrib/Makefile b/xmonad-contrib/Makefile
index 79afe154c1..6d4db6c8b3 100644
--- a/xmonad-contrib/Makefile
+++ b/xmonad-contrib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/06/08 23:53:55 zul_ Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=	xmonad-contrib-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad-contrib/${VERSION}/
 
diff --git a/xmonad/Makefile b/xmonad/Makefile
index 7c510ecdbc..7f3ad3e26d 100644
--- a/xmonad/Makefile
+++ b/xmonad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/06/08 23:42:41 zul_ Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 00:58:43 thomasklausner Exp $
 #
 
 DISTNAME=	xmonad-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${VERSION}/
 
diff --git a/xmonad/buildlink3.mk b/xmonad/buildlink3.mk
index 5e947f7cc9..06668618ea 100644
--- a/xmonad/buildlink3.mk
+++ b/xmonad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:57 jsonn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/05/20 00:58:43 thomasklausner Exp $
 
 BUILDLINK_TREE+=	xmonad
 
@@ -7,6 +7,7 @@ XMONAD_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.xmonad?=	build
 BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.7
+BUILDLINK_ABI_DEPENDS.xmonad?=	xmonad>=0.7nb1
 BUILDLINK_PKGSRCDIR.xmonad?=	../../wip/xmonad
 
 .include "../../lang/ghc/buildlink3.mk"
diff --git a/xmoto/Makefile b/xmoto/Makefile
index 868a941fba..395a226d6f 100644
--- a/xmoto/Makefile
+++ b/xmoto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/01/18 04:30:18 tnn2 Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/20 00:58:43 thomasklausner Exp $
 
 DISTNAME=		xmoto-0.2.2-src
 PKGNAME=		xmoto-0.2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xmoto/}