recursive bump from gettext-lib shlib bump.

76 files changed, 152 insertions, 121 deletions

diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile
index 7e0658f6b04..63ae6816a75 100644
--- a/mail/akonadi/Makefile
+++ b/mail/akonadi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2011/01/13 13:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/22 13:42:35 obache Exp $
 
 DISTNAME=	akonadi-1.4.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://download.akonadi-project.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/akonadi/buildlink3.mk b/mail/akonadi/buildlink3.mk
index ae79b96d014..63a35fdd78d 100644
--- a/mail/akonadi/buildlink3.mk
+++ b/mail/akonadi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2011/01/13 13:36:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2011/04/22 13:42:35 obache Exp $
 
 BUILDLINK_TREE+=	akonadi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	akonadi
 AKONADI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=0.82.0
-BUILDLINK_ABI_DEPENDS.akonadi?=	akonadi>=1.4.0nb2
+BUILDLINK_ABI_DEPENDS.akonadi?=	akonadi>=1.4.0nb3
 BUILDLINK_PKGSRCDIR.akonadi?=	../../mail/akonadi
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 733901eac8f..4d7abdccafa 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2011/01/13 13:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2011/04/22 13:44:00 obache Exp $
 
 DISTNAME=	balsa-2.4.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index 0b21bc692c2..302ff2d788b 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2011/03/19 14:52:08 gls Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/22 13:44:00 obache Exp $
 #
 
 DISTNAME=	archive-0.6.8
 PKGNAME=	claws-mail-archive-0.6.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index 2feff333baa..fcb62f0d873 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/03/19 14:52:08 gls Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/22 13:44:00 obache Exp $
 #
 
 DISTNAME=	attachwarner-0.2.20
 PKGNAME=	claws-mail-attachwarner-0.2.20
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 899bedd75cd..1c19408b36c 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/03/19 14:52:08 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:00 obache Exp $
 #
 
 DISTNAME=	att_remover-1.0.12
 PKGNAME=	claws-mail-att_remover-1.0.12
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index f75fc00ef47..a52beeb90e1 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2011/03/19 14:52:08 gls Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/22 13:45:18 obache Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	bogofilter
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 61cd52cf691..1a0ba97684f 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/03/19 14:52:08 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:00 obache Exp $
 #
 
 DISTNAME=	cachesaver-0.10.9
 PKGNAME=	claws-mail-cachesaver-0.10.9
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index cd1f978774b..889a3bdb590 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2011/03/19 14:52:09 gls Exp $
+# $NetBSD: Makefile,v 1.20 2011/04/22 13:44:00 obache Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	dillo_viewer
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index d3e5ba2e05a..5a5ef65fb08 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/03/19 14:52:09 gls Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/22 13:44:00 obache Exp $
 #
 
 DISTNAME=	fetchinfo-plugin-0.4.24
 PKGNAME=	claws-mail-fetchinfo-plugin-0.4.24
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 3287468e47c..9ed0d84e54b 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2011/03/19 14:52:09 gls Exp $
+# $NetBSD: Makefile,v 1.29 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	gtkhtml2_viewer-0.29
 PKGNAME=	claws-mail-gtkhtml2_viewer-0.29
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 1878bc30d9b..bbae4071f75 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/03/19 14:52:09 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	mailmbox-1.14.5
 PKGNAME=	claws-mail-mailmbox-1.14.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index ea39e70b365..1b3fc7801cd 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2011/03/19 15:03:50 gls Exp $
+# $NetBSD: Makefile,v 1.23 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	newmail-0.0.15
 PKGNAME=	claws-mail-newmail-0.0.15
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index e1320290c1d..a2a310d3e12 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2011/03/19 14:52:10 gls Exp $
+# $NetBSD: Makefile,v 1.23 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	notification_plugin-0.26
 PKGNAME=	claws-mail-notification-0.26
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index 07ede7568e5..8a5321ca1dd 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2011/03/19 14:52:10 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:42:47 obache Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpcore
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk
index a66f3eaab6c..d0aaf607d82 100644
--- a/mail/claws-mail-pgpcore/buildlink3.mk
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2011/01/13 13:36:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2011/04/22 13:42:47 obache Exp $
 
 BUILDLINK_TREE+=	claws-mail-pgpcore
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	claws-mail-pgpcore
 CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.7.0
-BUILDLINK_ABI_DEPENDS.claws-mail-pgpcore?=	claws-mail-pgpcore>=3.7.7nb1
+BUILDLINK_ABI_DEPENDS.claws-mail-pgpcore?=	claws-mail-pgpcore>=3.7.8nb1
 BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?=	../../mail/claws-mail-pgpcore
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index ffebf44ba3d..45c9bea3511 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2011/03/19 14:52:10 gls Exp $
+# $NetBSD: Makefile,v 1.20 2011/04/22 13:44:01 obache Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpinline
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index c2f51f28959..d38eb2b47cd 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2011/03/19 14:52:10 gls Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/22 13:44:01 obache Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	pgpmime
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 41c661ae8cb..064a817700e 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2011/03/19 14:52:10 gls Exp $
+# $NetBSD: Makefile,v 1.25 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	rssyl-0.29
 PKGNAME=	claws-mail-rssyl-0.29
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index a168f9c9db8..9fb5dc1d314 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/03/19 14:52:11 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:01 obache Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	smime
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index 7ee94e503bb..2a9d66fccd9 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2011/03/19 14:52:11 gls Exp $
+# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:19 obache Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	spamassassin
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 1058538d97e..988dfb8d0fc 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2011/03/19 14:52:11 gls Exp $
+# $NetBSD: Makefile,v 1.24 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	spam_report-0.3.12
 PKGNAME=	claws-mail-spam_report-0.3.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 3e160e31d4f..42da274c0bd 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2011/03/19 14:52:11 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:01 obache Exp $
 #
 
 DISTNAME=	synce_plugin-0.7.5
 PKGNAME=	claws-mail-synce_plugin-0.7.5
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 0e369cf6def..7c26f70134d 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2011/03/19 14:52:11 gls Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/22 13:44:02 obache Exp $
 #
 
 DISTNAME=	tnef_parse-0.3.9
 PKGNAME=	claws-mail-tnef-0.3.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail-trayicon/Makefile b/mail/claws-mail-trayicon/Makefile
index 3684ba88120..c27cbc235c7 100644
--- a/mail/claws-mail-trayicon/Makefile
+++ b/mail/claws-mail-trayicon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2011/03/19 14:52:11 gls Exp $
+# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:19 obache Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLUGIN_NAME=	trayicon
+PKGREVISION=	1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 80192cadb59..91ed932f59e 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2011/03/19 14:52:12 gls Exp $
+# $NetBSD: Makefile,v 1.26 2011/04/22 13:44:02 obache Exp $
 #
 
 DISTNAME=	vcalendar-2.0.9
 PKGNAME=	claws-mail-vcalendar-2.0.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index b4b6eedba6f..f49024146ef 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2011/03/19 14:52:07 gls Exp $
+# $NetBSD: Makefile,v 1.35 2011/04/22 13:42:34 obache Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS+=	${EGDIR}
@@ -7,6 +7,7 @@ INSTALLATION_DIRS+=	share/claws-mail
 .include "Makefile.common"
 
 PKGNAME=	claws-mail-${CLAWS_VERSION}
+PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X based e-mail and netnews client
diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk
index 12407b7555a..c5ddc2698a6 100644
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/09/30 08:51:50 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2011/04/22 13:42:34 obache Exp $
 
 BUILDLINK_TREE+=	claws-mail
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	claws-mail
 CLAWS_MAIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0
+BUILDLINK_ABI_DEPENDS.claws-mail?=	claws-mail>=3.7.8nb1
 BUILDLINK_PKGSRCDIR.claws-mail?=	../../mail/claws-mail
 
 .include "../../textproc/enchant/buildlink3.mk"
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index d6209b9abc7..abbe9043efb 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2011/04/05 08:39:32 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=	clawsker-0.7.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/tools/
 
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 781693f30b7..9ee3e487f36 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/11/05 14:18:52 adam Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=	cone-0.84
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 30800d2963a..18add2ed342 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/09/30 10:49:11 obache Exp $
+# $NetBSD: Makefile,v 1.27 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=	dbmail-2.2.17
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
 
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index b22e1a90d6a..8f1f7aa59d6 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/04/15 13:36:01 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=	dovecot-2.0-pigeonhole-0.2.3
 PKGNAME=	${DISTNAME:S/-2.0-/-/}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rename-it.nl/dovecot/2.0/
 
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
index 6da8b879fd8..894b4a29fb4 100644
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2011/01/13 13:43:04 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2011/04/22 13:42:43 obache Exp $
 
 BUILDLINK_TREE+=	dovecot
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	dovecot
 DOVECOT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=2.0.6
+BUILDLINK_ABI_DEPENDS.dovecot?=		dovecot>=2.0.12nb1
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
 
 pkgbase:=	dovecot
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 62b9eab624f..3df259c268d 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/04/15 08:13:34 dholland Exp $
+# $NetBSD: Makefile,v 1.32 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/
 
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index dac5eed1923..af2d9004f5f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2010/04/15 06:50:46 dholland Exp $
+# $NetBSD: Makefile,v 1.46 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=		elm2.5.8
 PKGNAME=		elm-2.5.8
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		http://www.instinct.org/elm/files/tarballs/
 
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 551db71f6f5..3d2936c5193 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/17 12:02:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2011/04/22 13:44:02 obache Exp $
 #
 
 DISTNAME=		elmo-1.3.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=elmo/}
 
diff --git a/mail/etpan/Makefile b/mail/etpan/Makefile
index 9424ef57068..937e9f97d57 100644
--- a/mail/etpan/Makefile
+++ b/mail/etpan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/09/16 08:06:16 adam Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/22 13:44:02 obache Exp $
 
 DISTNAME=	etpan-ng-0.7.1
 PKGNAME=	${DISTNAME:S/-ng//}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index fec47eb1a5e..9ca8434ee2b 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2011/02/25 13:25:52 drochner Exp $
+# $NetBSD: Makefile,v 1.109 2011/04/22 13:42:33 obache Exp $
 
 DISTNAME=	evolution-data-server-2.32.2
+PKGREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.32/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index b5a6dce5c69..3d2570aa371 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2010/11/24 20:19:44 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2011/04/22 13:42:33 obache Exp $
 
 BUILDLINK_TREE+=	evolution-data-server
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	evolution-data-server
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.32.1
+BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.32.2nb1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 
 BDB_ACCEPTED?=		db4 db5
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 316abefc1be..cc5f8a4b956 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2011/03/15 14:09:01 drochner Exp $
+# $NetBSD: Makefile,v 1.53 2011/04/22 13:44:03 obache Exp $
 #
 
 DISTNAME=	evolution-exchange-2.32.2
 EE_VER=		2.32
+PKGREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-exchange/2.32/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 97c61a43a52..b162836e265 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/22 13:44:03 obache Exp $
 #
 
 DISTNAME=	evolution-sharp-0.20.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-sharp/0.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 24a91dbe9f2..eff708acbd1 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.171 2011/03/15 14:05:56 drochner Exp $
+# $NetBSD: Makefile,v 1.172 2011/04/22 13:42:33 obache Exp $
 
 DISTNAME=		evolution-2.32.2
+PKGREVISION=		1
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.32/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index e08f92a1917..9b1106f0ba7 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2011/01/13 13:36:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2011/04/22 13:42:33 obache Exp $
 
 BUILDLINK_TREE+=	evolution
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	evolution
 EVOLUTION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.8.0
-BUILDLINK_ABI_DEPENDS.evolution?=	evolution>=2.32.1nb1
+BUILDLINK_ABI_DEPENDS.evolution?=	evolution>=2.32.2nb1
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
 
 .include "../../devel/nspr/buildlink3.mk"
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 54f117be19e..0edd37d998e 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.174 2011/03/20 01:38:35 shattered Exp $
+# $NetBSD: Makefile,v 1.175 2011/04/22 13:44:03 obache Exp $
 
 # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
 DISTNAME=	fetchmail-6.3.17
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://download.berlios.de/fetchmail/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile
index a069f8de5f5..1fb50b42276 100644
--- a/mail/freepops/Makefile
+++ b/mail/freepops/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/17 12:02:24 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/22 13:44:03 obache Exp $
 #
 
 DISTNAME=		freepops-0.2.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=freepops/}
 
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 33409131f92..88566dffba7 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/09/08 12:07:18 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2011/04/22 13:42:17 obache Exp $
 #
 
 DISTNAME=	gmime-2.2.25
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.2/}
 
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index 30fe54b84bd..3ebca490950 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/09/08 11:53:04 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2011/04/22 13:42:17 obache Exp $
 
 BUILDLINK_TREE+=	gmime
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	gmime
 GMIME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.7
+BUILDLINK_ABI_DEPENDS.gmime?=	gmime>=2.2.25nb3
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index d3a268fb749..064a652356d 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2011/03/18 17:25:20 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/22 13:42:15 obache Exp $
 #
 
 DISTNAME=	gmime-2.4.23
 PKGNAME=	${DISTNAME:S/gmime/gmime24/}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.4/}
 
diff --git a/mail/gmime24/buildlink3.mk b/mail/gmime24/buildlink3.mk
index e647b0c441d..9e00ac18858 100644
--- a/mail/gmime24/buildlink3.mk
+++ b/mail/gmime24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2011/04/22 13:42:15 obache Exp $
 
 BUILDLINK_TREE+=	gmime24
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	gmime24
 GMIME24_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gmime24+=	gmime24>=2.4.3
+BUILDLINK_ABI_DEPENDS.gmime24?=	gmime24>=2.4.23nb1
 BUILDLINK_PKGSRCDIR.gmime24?=	../../mail/gmime24
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 26e53ea9e46..061de276ca3 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2011/01/13 13:38:38 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2011/04/22 13:44:03 obache Exp $
 
 DISTNAME=	kbiff-3.9
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kbiff/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 448bfa10b85..8d9dbf8b89e 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/09/16 08:06:16 adam Exp $
+# $NetBSD: Makefile,v 1.33 2011/04/22 13:42:10 obache Exp $
 
 DISTNAME=	libetpan-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 04308be7577..6715c2f313a 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2010/06/02 12:58:58 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2011/04/22 13:42:10 obache Exp $
 
 BUILDLINK_TREE+=	libetpan
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libetpan
 LIBETPAN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=1.0
-BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=1.0
+BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=1.0nb3
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 
 BDB_ACCEPTED?=	db4 db5
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
index 22793232af2..133ce118ef4 100644
--- a/mail/libspf-alt/Makefile
+++ b/mail/libspf-alt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2011/02/27 13:06:12 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/04/22 13:41:56 obache Exp $
 
 DISTNAME=	libspf_alt-0.4.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://libspf2.org/spf/
 
diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk
index 104490b7471..42a8c68c024 100644
--- a/mail/libspf-alt/buildlink3.mk
+++ b/mail/libspf-alt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2011/04/22 13:41:56 obache Exp $
 
 BUILDLINK_TREE+=	libspf_alt
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libspf_alt
 LIBSPF_ALT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb1
-BUILDLINK_ABI_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb3
+BUILDLINK_ABI_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb5
 BUILDLINK_PKGSRCDIR.libspf_alt?=	../../mail/libspf-alt
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/mail/libsylph/Makefile b/mail/libsylph/Makefile
index d631bf439eb..7282c4a0ab2 100644
--- a/mail/libsylph/Makefile
+++ b/mail/libsylph/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:24 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/22 13:42:02 obache Exp $
 #
 
 DISTNAME=	libsylph-0.3.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/libsylph/alpha/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/libsylph/buildlink3.mk b/mail/libsylph/buildlink3.mk
index e62eb14e7d1..bc29a09d78f 100644
--- a/mail/libsylph/buildlink3.mk
+++ b/mail/libsylph/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/17 12:02:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2011/04/22 13:42:02 obache Exp $
 
 BUILDLINK_TREE+=	libsylph
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libsylph
 LIBSYLPH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsylph+=	libsylph>=0.3.0
-BUILDLINK_ABI_DEPENDS.libsylph?=	libsylph>=0.3.0nb2
+BUILDLINK_ABI_DEPENDS.libsylph?=	libsylph>=0.3.0nb3
 BUILDLINK_PKGSRCDIR.libsylph?=	../../mail/libsylph
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index cc2f4f5ca12..275a5af7b40 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2011/01/13 13:38:38 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2011/04/22 13:44:03 obache Exp $
 #
 
 DISTNAME=	mail-notification-5.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index cd08ddd03b1..31a275f74ab 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/04/16 01:53:22 obache Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/22 13:44:04 obache Exp $
 #
 
 DISTNAME=	milter-manager-1.6.8
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=milter-manager/}
 
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index aa2501e8888..b3017fea591 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/04/01 11:40:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/22 13:44:04 obache Exp $
 #
 
 DISTNAME=	mpop-1.0.23
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpop/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 974e65f444c..a4ab6710c21 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2011/02/02 11:18:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2011/04/22 13:44:04 obache Exp $
 
 DISTNAME=	msmtp-1.4.23
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=msmtp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index db8a1d020b9..e7ad7f57e33 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2011/02/03 14:11:50 tron Exp $
+# $NetBSD: Makefile,v 1.82 2011/04/22 13:44:04 obache Exp $
 
 DISTNAME=		mutt-1.5.21
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 87c782759f8..e247fc449cf 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.162 2010/11/23 10:21:25 tron Exp $
+# $NetBSD: Makefile,v 1.163 2011/04/22 13:44:04 obache Exp $
 
 DISTNAME=		mutt-1.4.2.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
diff --git a/mail/netbiff/Makefile b/mail/netbiff/Makefile
index 36666e215f4..1d43efa301d 100644
--- a/mail/netbiff/Makefile
+++ b/mail/netbiff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/01/13 13:38:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/22 13:44:04 obache Exp $
 #
 
 DISTNAME=		netbiff-0.9.18
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		mail
 MASTER_SITES=		http://www.cs.virginia.edu/~jrk3g/netbiff/
 
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 76f2ab8969e..a9ab1c1aedd 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/12/24 07:14:22 kefren Exp $
+# $NetBSD: Makefile,v 1.32 2011/04/22 13:44:04 obache Exp $
 
 DISTNAME=	Mail-ClamAV-0.29
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/perdition-bdb/Makefile b/mail/perdition-bdb/Makefile
index 292ba9c0370..df95c6d0e28 100644
--- a/mail/perdition-bdb/Makefile
+++ b/mail/perdition-bdb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2010/09/16 08:06:16 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/22 13:44:04 obache Exp $
 
-PKGREVISION=		1
+PKGREVISION=		2
 PERDITION_COMMENT=	Berkeley DB user database module
 PERDITION_PKGNAME=	bdb
 BUILD_DIRS=		makebdb perdition/db/bdb
diff --git a/mail/perdition-gdbm/Makefile b/mail/perdition-gdbm/Makefile
index e5d9f061f88..f6c73f15819 100644
--- a/mail/perdition-gdbm/Makefile
+++ b/mail/perdition-gdbm/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2010/06/02 12:50:04 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/22 13:44:04 obache Exp $
 
+PKGREVISION=		1
 PERDITION_COMMENT=	GDBM user database module
 PERDITION_PKGNAME=	gdbm
 BUILD_DIRS=		makegdbm perdition/db/gdbm
diff --git a/mail/perdition-ldap/Makefile b/mail/perdition-ldap/Makefile
index a5a9c706152..dabb1e1c15f 100644
--- a/mail/perdition-ldap/Makefile
+++ b/mail/perdition-ldap/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2010/06/02 12:50:04 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/22 13:45:19 obache Exp $
 
+PKGREVISION=		1
 PERDITION_COMMENT=	LDAP user database module
 PERDITION_PKGNAME=	ldap
 
diff --git a/mail/perdition-mysql/Makefile b/mail/perdition-mysql/Makefile
index a8430c73212..1cc44b7ebe4 100644
--- a/mail/perdition-mysql/Makefile
+++ b/mail/perdition-mysql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/09/30 10:49:12 obache Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/22 13:45:19 obache Exp $
 
 PERDITION_COMMENT=	MySQL user database module
 PERDITION_PKGNAME=	mysql
-PKGREVISION=		1
+PKGREVISION=		2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/perdition-odbc/Makefile b/mail/perdition-odbc/Makefile
index a3eb2d60be6..d9fdd6dc058 100644
--- a/mail/perdition-odbc/Makefile
+++ b/mail/perdition-odbc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/06/02 12:50:04 adam Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/22 13:45:19 obache Exp $
 
 PERDITION_COMMENT=	UnixODBC user database module
 PERDITION_PKGNAME=	odbc
+PKGREVISION=		1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/perdition-postgresql/Makefile b/mail/perdition-postgresql/Makefile
index 9e410287e67..a833c0d1dda 100644
--- a/mail/perdition-postgresql/Makefile
+++ b/mail/perdition-postgresql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/06/02 12:50:04 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/22 13:45:19 obache Exp $
 
 PERDITION_COMMENT=	PostgreSQL user database module
 PERDITION_PKGNAME=	postgresql
 PERDITION_SKIP_DISABLE=	pg
+PKGREVISION=		1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index e5e51d7744f..7329efc598a 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/06/02 12:50:03 adam Exp $
+# $NetBSD: Makefile,v 1.13 2011/04/22 13:42:44 obache Exp $
 
 PERDITION_COMMENT=	main program
+PKGREVISION=		1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk
index a06ceb1a87c..8614d86f16a 100644
--- a/mail/perdition/buildlink3.mk
+++ b/mail/perdition/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/06/02 12:50:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2011/04/22 13:42:44 obache Exp $
 
 BUILDLINK_TREE+=	perdition
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	perdition
 PERDITION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.perdition+=	perdition>=1.17
-BUILDLINK_ABI_DEPENDS.perdition+=	perdition>=1.17nb1
+BUILDLINK_ABI_DEPENDS.perdition+=	perdition>=1.18nb1
 BUILDLINK_PKGSRCDIR.perdition?=	../../mail/perdition
 
 # The following are included in Makefile.common for "configure"'s sake.
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 866638b2630..18d3b24cdee 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2010/11/10 10:52:46 adam Exp $
+# $NetBSD: Makefile,v 1.68 2011/04/22 13:44:04 obache Exp $
 
 DISTNAME=	sqwebmail-5.4.3
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index dd4a82374aa..c4249353e72 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2011/01/13 13:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2011/04/22 13:44:05 obache Exp $
 
 DISTNAME=	sylpheed-3.0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail news x11
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v3.0/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/tnef/Makefile b/mail/tnef/Makefile
index ffd0c008828..0ef826c8aea 100644
--- a/mail/tnef/Makefile
+++ b/mail/tnef/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2008/06/20 01:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2011/04/22 13:44:05 obache Exp $
 #
 
 DISTNAME=	tnef-1.4.3
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tnef/}
 
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index f745c08eae8..fb7cddedd86 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2011/01/13 13:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2011/04/22 13:44:05 obache Exp $
 
 DISTNAME=	wmbiff-0.4.26
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	mail x11 windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wmbiff/}